Rémi Bernon : mf/tests: Add more DMO class name, media type and interface checks.
Alexandre Julliard
julliard at winehq.org
Wed May 4 16:14:44 CDT 2022
Module: wine
Branch: master
Commit: 6f49156bbc763179feac35074f61a683ff4c5a7b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f49156bbc763179feac35074f61a683ff4c5a7b
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Wed Apr 6 22:06:51 2022 +0200
mf/tests: Add more DMO class name, media type and interface checks.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/tests/Makefile.in | 2 +-
dlls/mf/tests/mf.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in
index a0ca40481da..8d1a22fb35f 100644
--- a/dlls/mf/tests/Makefile.in
+++ b/dlls/mf/tests/Makefile.in
@@ -1,5 +1,5 @@
TESTDLL = mf.dll
-IMPORTS = mf mfplat mfuuid ole32 user32 propsys
+IMPORTS = mf mfplat mfuuid ole32 user32 propsys msdmo
C_SRCS = \
mf.c
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index a2f4b2dae2f..0541ba6f268 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -28,9 +28,11 @@
#include "winbase.h"
#include "initguid.h"
+#include "dmo.h"
#include "mediaobj.h"
#include "ole2.h"
#include "wmcodecdsp.h"
+#include "propsys.h"
#include "propvarutil.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
@@ -100,6 +102,51 @@ static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID
IUnknown_Release(unk);
}
+static void check_dmo(const GUID *class_id, const WCHAR *expect_name, const GUID *expect_major_type,
+ const GUID *expect_input, ULONG expect_input_count, const GUID *expect_output, ULONG expect_output_count)
+{
+ ULONG i, input_count = 0, output_count = 0;
+ DMO_PARTIAL_MEDIATYPE output[32] = {{{0}}};
+ DMO_PARTIAL_MEDIATYPE input[32] = {{{0}}};
+ WCHAR name[80];
+ HRESULT hr;
+
+ winetest_push_context("%s", debugstr_w(expect_name));
+
+ hr = DMOGetName(class_id, name);
+ ok(hr == S_OK, "DMOGetName returned %#lx\n", hr);
+ todo_wine_if(!wcscmp(expect_name, L"WMAudio Decoder DMO"))
+ ok(!wcscmp(name, expect_name), "got name %s\n", debugstr_w(name));
+
+ hr = DMOGetTypes(class_id, ARRAY_SIZE(input), &input_count, input,
+ ARRAY_SIZE(output), &output_count, output);
+ ok(hr == S_OK, "DMOGetTypes returned %#lx\n", hr);
+ ok(input_count == expect_input_count, "got input_count %lu\n", input_count);
+ ok(output_count == expect_output_count, "got output_count %lu\n", output_count);
+
+ for (i = 0; i < input_count; ++i)
+ {
+ winetest_push_context("in %lu", i);
+ ok(IsEqualGUID(&input[i].type, expect_major_type),
+ "got type %s\n", debugstr_guid(&input[i].type));
+ ok(IsEqualGUID(&input[i].subtype, expect_input + i),
+ "got subtype %s\n", debugstr_guid(&input[i].subtype));
+ winetest_pop_context();
+ }
+
+ for (i = 0; i < output_count; ++i)
+ {
+ winetest_push_context("out %lu", i);
+ ok(IsEqualGUID(&output[i].type, expect_major_type),
+ "got type %s\n", debugstr_guid(&output[i].type));
+ ok(IsEqualGUID(&output[i].subtype, expect_output + i),
+ "got subtype %s\n", debugstr_guid( &output[i].subtype));
+ winetest_pop_context();
+ }
+
+ winetest_pop_context();
+}
+
struct attribute_desc
{
const GUID *key;
@@ -5788,6 +5835,16 @@ static void test_wma_encoder(void)
MFAudioFormat_WMAudioV9,
MFAudioFormat_WMAudio_Lossless,
};
+ const GUID dmo_inputs[] =
+ {
+ MEDIASUBTYPE_PCM,
+ };
+ const GUID dmo_outputs[] =
+ {
+ MEDIASUBTYPE_WMAUDIO2,
+ MEDIASUBTYPE_WMAUDIO3,
+ MEDIASUBTYPE_WMAUDIO_LOSSLESS,
+ };
static const struct attribute_desc input_type_desc[] =
{
@@ -5838,7 +5895,13 @@ static void test_wma_encoder(void)
&transform, &CLSID_CWMAEncMediaObject, &class_id))
goto failed;
+ check_dmo(&class_id, L"WMAudio Encoder DMO", &MEDIATYPE_Audio, dmo_inputs, ARRAY_SIZE(dmo_inputs),
+ dmo_outputs, ARRAY_SIZE(dmo_outputs));
+
+ check_interface(transform, &IID_IMFTransform, TRUE);
check_interface(transform, &IID_IMediaObject, TRUE);
+ check_interface(transform, &IID_IPropertyStore, TRUE);
+ check_interface(transform, &IID_IPropertyBag, TRUE);
hr = MFCreateMediaType(&media_type);
ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr);
@@ -5965,6 +6028,18 @@ static void test_wma_decoder(void)
MFAudioFormat_PCM,
MFAudioFormat_Float,
};
+ const GUID dmo_inputs[] =
+ {
+ MEDIASUBTYPE_MSAUDIO1,
+ MEDIASUBTYPE_WMAUDIO2,
+ MEDIASUBTYPE_WMAUDIO3,
+ MEDIASUBTYPE_WMAUDIO_LOSSLESS,
+ };
+ const GUID dmo_outputs[] =
+ {
+ MEDIASUBTYPE_PCM,
+ MEDIASUBTYPE_IEEE_FLOAT,
+ };
static const media_type_desc expect_available_inputs[] =
{
@@ -6068,7 +6143,14 @@ static void test_wma_decoder(void)
&transform, &CLSID_CWMADecMediaObject, &class_id))
goto failed;
+ check_dmo(&class_id, L"WMAudio Decoder DMO", &MEDIATYPE_Audio, dmo_inputs, ARRAY_SIZE(dmo_inputs),
+ dmo_outputs, ARRAY_SIZE(dmo_outputs));
+
+ check_interface(transform, &IID_IMFTransform, TRUE);
check_interface(transform, &IID_IMediaObject, TRUE);
+ todo_wine
+ check_interface(transform, &IID_IPropertyStore, TRUE);
+ check_interface(transform, &IID_IPropertyBag, TRUE);
/* check default media types */
More information about the wine-cvs
mailing list