August 2022 - Wine-commits - list.winehq.org

Rémi Bernon : mf: Use the MFT_CATEGORY_VIDEO_PROCESSOR category for converters.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 6f72d64a6ebdff701c6445812d2974ac9f6e4dbb URL: https://gitlab.winehq.org/wine/wine/-/commit/6f72d64a6ebdff701c6445812d2974… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 1 14:56:51 2022 +0200 mf: Use the MFT_CATEGORY_VIDEO_PROCESSOR category for converters. This moves the todo to another test but that's because Wine is missing the mfplat transform registration for the MP3 decoder. --- dlls/mf/tests/mf.c | 6 +++--- dlls/mf/topology_loader.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4e928b13816..f5d110174b0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2257,7 +2257,7 @@ static void test_topology_loader(void) .input_type = &audio_mp3_44100, .output_type = &audio_pcm_44100, .sink_method = MF_CONNECT_ALLOW_CONVERTER, .source_method = -1, .current_input = &audio_mp3_44100, .expected_result = MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION, - .flags = LOADER_NEEDS_VIDEO_PROCESSOR, + .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_TODO, }, { /* MP3 -> PCM */ @@ -2271,13 +2271,13 @@ static void test_topology_loader(void) /* I420 -> RGB32, Color Convert media type */ .input_type = &video_i420_1280, .output_type = &video_color_convert_1280_rgb32, .sink_method = -1, .source_method = -1, .expected_result = MF_E_TOPO_CODEC_NOT_FOUND, - .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER, }, { /* I420 -> RGB32, Video Processor media type */ .input_type = &video_i420_1280, .output_type = &video_video_processor_1280_rgb32, .sink_method = -1, .source_method = -1, .expected_result = S_OK, - .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER, }, { /* I420 -> RGB32, Video Processor media type without frame size */ diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 68ac7121a97..f7d1007971d 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -250,7 +250,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC if (IsEqualGUID(&input_info.guidMajorType, &MFMediaType_Audio)) category = decoder ? MFT_CATEGORY_AUDIO_DECODER : MFT_CATEGORY_AUDIO_EFFECT; else if (IsEqualGUID(&input_info.guidMajorType, &MFMediaType_Video)) - category = decoder ? MFT_CATEGORY_VIDEO_DECODER : MFT_CATEGORY_VIDEO_EFFECT; + category = decoder ? MFT_CATEGORY_VIDEO_DECODER : MFT_CATEGORY_VIDEO_PROCESSOR; else return MF_E_INVALIDMEDIATYPE; @@ -293,6 +293,8 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC IMFActivate_Release(activates[i]); CoTaskMemFree(activates); + if (!count) + return MF_E_TOPO_CODEC_NOT_FOUND; return hr; }

1 0

Rémi Bernon : mf: Propagate missing attributes to downstream media types.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: ee0e10be895fa4e2660917ff87013212fd547a94 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee0e10be895fa4e2660917ff870132… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 1 15:05:53 2022 +0200 mf: Propagate missing attributes to downstream media types. --- dlls/mf/tests/mf.c | 2 +- dlls/mf/topology_loader.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f5d110174b0..9dab87b928d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2283,7 +2283,7 @@ static void test_topology_loader(void) /* I420 -> RGB32, Video Processor media type without frame size */ .input_type = &video_i420_1280, .output_type = &video_video_processor_rgb32, .sink_method = -1, .source_method = -1, .expected_result = S_OK, - .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER, }, }; diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index f7d1007971d..08ee7922094 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -215,6 +215,30 @@ static HRESULT topology_node_list_branches(IMFTopologyNode *node, struct list *b return hr; } +static HRESULT topology_branch_fill_media_type(IMFMediaType *up_type, IMFMediaType *down_type) +{ + HRESULT hr = S_OK; + PROPVARIANT value; + UINT32 count; + GUID key; + + if (FAILED(hr = IMFMediaType_GetCount(up_type, &count))) + return hr; + + while (count--) + { + PropVariantInit(&value); + hr = IMFMediaType_GetItemByIndex(up_type, count, &key, &value); + if (SUCCEEDED(hr) && FAILED(IMFMediaType_GetItem(down_type, &key, NULL))) + hr = IMFMediaType_SetItem(down_type, &key, &value); + PropVariantClear(&value); + if (FAILED(hr)) + return hr; + } + + return hr; +} + static HRESULT topology_branch_connect(IMFTopology *topology, MF_CONNECT_METHOD method_mask, struct topology_branch *branch); static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_METHOD method_mask, @@ -276,6 +300,8 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC IMFTopologyNode_SetGUID(node, &MF_TOPONODE_TRANSFORM_OBJECTID, &guid); hr = topology_branch_connect_down(topology, MF_CONNECT_DIRECT, &up_branch, up_type); + if (SUCCEEDED(hr)) + hr = topology_branch_fill_media_type(up_type, down_type); if (SUCCEEDED(hr)) hr = IMFTransform_SetOutputType(transform, 0, down_type, 0); IMFTransform_Release(transform);

1 0

Rémi Bernon : mf/tests: Rotate test videos 90° to better show vertical flips.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 69bc9ad99e462cef1a122afc9852ed89565e1bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/69bc9ad99e462cef1a122afc9852ed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 1 13:51:30 2022 +0200 mf/tests: Rotate test videos 90° to better show vertical flips. --- dlls/mf/tests/h264data.bin | Bin 2330 -> 2220 bytes dlls/mf/tests/i420frame.bin | 2 +- dlls/mf/tests/nv12frame.bin | 2 +- dlls/mf/tests/resource.rc | 9 +++++++++ dlls/mf/tests/rgb32frame.bin | Bin 36864 -> 36864 bytes 5 files changed, 11 insertions(+), 2 deletions(-)

1 0

Rémi Bernon : mf/tests: Add video processor conversion tests.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 366e3f84f6409c0a5cd115008659921dcd0716ff URL: https://gitlab.winehq.org/wine/wine/-/commit/366e3f84f6409c0a5cd11500865992… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 1 09:46:45 2022 +0200 mf/tests: Add video processor conversion tests. --- dlls/mf/tests/mf.c | 2255 +++++++++++++++++++++++---------------- dlls/mf/tests/resource.rc | 4 + dlls/mf/tests/rgb32frame-vp.bin | Bin 0 -> 36864 bytes 3 files changed, 1343 insertions(+), 916 deletions(-)

1 0

Rémi Bernon : mf/tests: Add topology loader tests with video formats.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 4031786fab83c35d18f2a69bdd0db37e7c4ea33f URL: https://gitlab.winehq.org/wine/wine/-/commit/4031786fab83c35d18f2a69bdd0db3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 1 14:49:23 2022 +0200 mf/tests: Add topology loader tests with video formats. --- dlls/mf/tests/mf.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 96d37e0a6b9..f2815f05ff2 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2121,6 +2121,29 @@ static void test_topology_loader(void) ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 1), ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 8), }; + static const media_type_desc video_i420_1280 = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), + ATTR_RATIO(MF_MT_FRAME_SIZE, 1280, 720), + }; + static const media_type_desc video_color_convert_1280_rgb32 = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, DMOVideoFormat_RGB32), + ATTR_RATIO(MF_MT_FRAME_SIZE, 1280, 720), + }; + static const media_type_desc video_video_processor_1280_rgb32 = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), + ATTR_RATIO(MF_MT_FRAME_SIZE, 1280, 720), + }; + static const media_type_desc video_video_processor_rgb32 = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), + }; const struct loader_test { @@ -2243,6 +2266,25 @@ static void test_topology_loader(void) .expected_result = S_OK, .flags = LOADER_EXPECTED_DECODER | LOADER_TODO, }, + + { + /* I420 -> RGB32, Color Convert media type */ + .input_type = &video_i420_1280, .output_type = &video_color_convert_1280_rgb32, .sink_method = -1, .source_method = -1, + .expected_result = MF_E_TOPO_CODEC_NOT_FOUND, + .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + }, + { + /* I420 -> RGB32, Video Processor media type */ + .input_type = &video_i420_1280, .output_type = &video_video_processor_1280_rgb32, .sink_method = -1, .source_method = -1, + .expected_result = S_OK, + .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + }, + { + /* I420 -> RGB32, Video Processor media type without frame size */ + .input_type = &video_i420_1280, .output_type = &video_video_processor_rgb32, .sink_method = -1, .source_method = -1, + .expected_result = S_OK, + .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + }, }; IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl };

1 0

Giovanni Mascellani : vkd3d: Remove unused field fence_destruction_cond.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: vkd3d Branch: master Commit: 5168929edc0a0c30848e2622f152db329823f000 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5168929edc0a0c30848e2622f152d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Aug 4 14:44:18 2022 +0200 vkd3d: Remove unused field fence_destruction_cond. --- libs/vkd3d/command.c | 10 ---------- libs/vkd3d/vkd3d_private.h | 1 - 2 files changed, 11 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9ae6079c..82871053 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -427,20 +427,11 @@ static HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, return hresult_from_errno(rc); } - if ((rc = vkd3d_cond_init(&worker->fence_destruction_cond))) - { - ERR("Failed to initialize condition variable, error %d.\n", rc); - vkd3d_mutex_destroy(&worker->mutex); - vkd3d_cond_destroy(&worker->cond); - return hresult_from_errno(rc); - } - if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, vkd3d_fence_worker_main, worker, &worker->thread))) { vkd3d_mutex_destroy(&worker->mutex); vkd3d_cond_destroy(&worker->cond); - vkd3d_cond_destroy(&worker->fence_destruction_cond); } return hr; @@ -470,7 +461,6 @@ static HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, vkd3d_mutex_destroy(&worker->mutex); vkd3d_cond_destroy(&worker->cond); - vkd3d_cond_destroy(&worker->fence_destruction_cond); vkd3d_free(worker->fences); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f00181a2..d2ab8857 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -346,7 +346,6 @@ struct vkd3d_fence_worker union vkd3d_thread_handle thread; struct vkd3d_mutex mutex; struct vkd3d_cond cond; - struct vkd3d_cond fence_destruction_cond; bool should_exit; size_t fence_count;

1 0

Giovanni Mascellani : vkd3d: Unlock fence worker mutex before exiting.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: vkd3d Branch: master Commit: 5749ae4700afde9ae316e91309796db86a7043a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5749ae4700afde9ae316e91309796… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Aug 4 13:51:28 2022 +0200 vkd3d: Unlock fence worker mutex before exiting. Pthread mandates that a mutex must be unlocked before being destroyed. In pratice I doubt this make a difference on any platform (certainly it doesn't on Linux), but let's comply to standards. --- libs/vkd3d/command.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e0201d5d..9ae6079c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -369,7 +369,10 @@ static void *vkd3d_fence_worker_main(void *arg) } if (worker->should_exit) + { + vkd3d_mutex_unlock(&worker->mutex); break; + } old_fences_size = cur_fences_size; old_fences = cur_fences;

1 0

Jeremy White : Only assign reviewers on the first version of MR.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: tools Branch: master Commit: 8251347264b5b60d3954aa9a8aad7ab649e21bdb URL: https://gitlab.winehq.org/winehq/tools/-/commit/8251347264b5b60d3954aa9a8aa… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Aug 8 09:36:27 2022 -0500 Only assign reviewers on the first version of MR. This avoids an issue that arose when Torge rebased a large volume of patches which resulted in assignment of MR 564 to much of the world. --- gitlab/gitlab-to-mail/gitlabtomail.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 525130e8..221e587e 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -625,8 +625,8 @@ def process_mr(mr, update_db, assigner): log(f"MR{iid}v{version} - skipping, has no changes") return - # Assign reviewers if there are none currently - if len(mr['reviewers']) == 0: + # Assign reviewers if there are none currently, but only on the first submission + if len(mr['reviewers']) == 0 and len(versions) == 1: full_version = fetch_mr_version(iid, versions[0]['id']) assigner.assign_reviewers(iid, mr['author'], full_version, update_db)

1 0

Rémi Bernon : gitlab: Build every commit in a merge request.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 660aead73f8d84b915f8567d362a2ddf99d97fc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/660aead73f8d84b915f8567d362a2d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 4 19:43:07 2022 +0200 gitlab: Build every commit in a merge request. --- tools/gitlab/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 1cb674d837a..c8be84ccd67 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -30,7 +30,8 @@ build-all: - build64/config.log - build32/config.log script: - - ./tools/gitlab/build-all + - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase + - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-all build-winetest: extends: .wine-build

1 0

Alexandre Julliard : gitlab: Disable building image in forks.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: bfc73b0b80a1da2b137b5da4a2fcf530ee3a9d7d URL: https://gitlab.winehq.org/wine/wine/-/commit/bfc73b0b80a1da2b137b5da4a2fcf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 17:02:07 2022 +0200 gitlab: Disable building image in forks. --- tools/gitlab/image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gitlab/image.yml b/tools/gitlab/image.yml index 2108f5c85cc..7a866553dc2 100644 --- a/tools/gitlab/image.yml +++ b/tools/gitlab/image.yml @@ -3,7 +3,7 @@ build-image: stage: image rules: - - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_PATH == "wine/wine" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - tools/gitlab/image.yml - tools/gitlab/image.docker

1 0