[PATCH 0/2] MR3351: mfmediaengine: Implement RemoveAllEffects().

[Bernhard Kölbl]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3351

[PATCH 1/2] mfmediaengine/tests: Add tests for RemoveAllEffects().

[Bernhard Kölbl]

From: Bernhard Kölbl <bkoelbl(a)codeweavers.com>

Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com>
---
 dlls/mfmediaengine/tests/mfmediaengine.c | 25 +++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c
index aa9de414fcb..e39917dc879 100644
--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -1823,6 +1823,9 @@ static void test_effect(void)
     hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
+    hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex);
+    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
     hr = passthrough_mft_create(0, &video_effect);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
@@ -1837,6 +1840,22 @@ static void test_effect(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     EXPECT_REF(&video_effect2->IMFTransform_iface, 2);
 
+    hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex);
+    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 1);
+    todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 1);
+
+    if (FAILED(hr)) /* Temporary skip */
+        goto done;
+
+    hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect->IMFTransform_iface, FALSE);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 2);
+
+    hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect2->IMFTransform_iface, FALSE);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 2);
+
     hr = passthrough_mft_create(0, &audio_effect);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
@@ -1892,7 +1911,7 @@ done:
         IMFMediaEngineEx_Shutdown(media_engine_ex);
 
         ref = IMFMediaEngineEx_Release(media_engine_ex);
-        todo_wine ok(!ref, "Unexpected ref %lu.\n", ref);
+        ok(!ref, "Unexpected ref %lu.\n", ref);
     }
 
     if (texture)
@@ -1914,12 +1933,12 @@ done:
     if (video_effect2)
     {
         ref = IMFTransform_Release(&video_effect2->IMFTransform_iface);
-        todo_wine ok(!ref, "Unexpected ref %lu.\n", ref);
+        ok(!ref, "Unexpected ref %lu.\n", ref);
     }
     if (video_effect)
     {
         ref = IMFTransform_Release(&video_effect->IMFTransform_iface);
-        todo_wine ok(!ref, "Unexpected ref %lu.\n", ref);
+        ok(!ref, "Unexpected ref %lu.\n", ref);
     }
 
     IMFMediaEngineNotify_Release(¬ify->IMFMediaEngineNotify_iface);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/3351

[PATCH 2/2] mfmediaengine: Implement RemoveAllEffects().

[Bernhard Kölbl]

From: Bernhard Kölbl <bkoelbl(a)codeweavers.com>

Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com>
---
 dlls/mfmediaengine/main.c                |  9 +++++++--
 dlls/mfmediaengine/tests/mfmediaengine.c | 21 +++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index 925d9c3566e..61a2e0ae45e 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -2719,9 +2719,14 @@ static HRESULT WINAPI media_engine_InsertAudioEffect(IMFMediaEngineEx *iface, IU
 
 static HRESULT WINAPI media_engine_RemoveAllEffects(IMFMediaEngineEx *iface)
 {
-    FIXME("%p stub.\n", iface);
+    struct media_engine *engine = impl_from_IMFMediaEngineEx(iface);
 
-    return E_NOTIMPL;
+    TRACE("%p.\n", iface);
+
+    media_engine_clear_effects(&engine->audio_effects);
+    media_engine_clear_effects(&engine->video_effects);
+
+    return S_OK;
 }
 
 static HRESULT WINAPI media_engine_SetTimelineMarkerTimer(IMFMediaEngineEx *iface, double timeout)
diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c
index e39917dc879..c8da71fcdac 100644
--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -1824,7 +1824,7 @@ static void test_effect(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = passthrough_mft_create(0, &video_effect);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1841,20 +1841,17 @@ static void test_effect(void)
     EXPECT_REF(&video_effect2->IMFTransform_iface, 2);
 
     hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 1);
-    todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 1);
-
-    if (FAILED(hr)) /* Temporary skip */
-        goto done;
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    EXPECT_REF(&video_effect->IMFTransform_iface, 1);
+    EXPECT_REF(&video_effect2->IMFTransform_iface, 1);
 
     hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect->IMFTransform_iface, FALSE);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 2);
+    EXPECT_REF(&video_effect->IMFTransform_iface, 2);
 
     hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect2->IMFTransform_iface, FALSE);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 2);
+    EXPECT_REF(&video_effect2->IMFTransform_iface, 2);
 
     hr = passthrough_mft_create(0, &audio_effect);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1911,7 +1908,7 @@ done:
         IMFMediaEngineEx_Shutdown(media_engine_ex);
 
         ref = IMFMediaEngineEx_Release(media_engine_ex);
-        ok(!ref, "Unexpected ref %lu.\n", ref);
+        todo_wine ok(!ref, "Unexpected ref %lu.\n", ref);
     }
 
     if (texture)
@@ -1933,12 +1930,12 @@ done:
     if (video_effect2)
     {
         ref = IMFTransform_Release(&video_effect2->IMFTransform_iface);
-        ok(!ref, "Unexpected ref %lu.\n", ref);
+        todo_wine ok(!ref, "Unexpected ref %lu.\n", ref);
     }
     if (video_effect)
     {
         ref = IMFTransform_Release(&video_effect->IMFTransform_iface);
-        ok(!ref, "Unexpected ref %lu.\n", ref);
+        todo_wine ok(!ref, "Unexpected ref %lu.\n", ref);
     }
 
     IMFMediaEngineNotify_Release(¬ify->IMFMediaEngineNotify_iface);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3351

[PATCH 2/2] mfmediaengine: Implement RemoveAllEffects().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=134969

Your paranoid android.


=== w10pro64 (32 bit report) ===

mfmediaengine:
mfmediaengine.c:1922: Test failed: Unexpected ref 4.

[Nikolay Sivov (＠nsivov)]

This probably needs to check for shutdown state.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3351#note_39286