[PATCH v3 0/2] MR7417: mfplat: Modify MFCreateWaveFormatExFromMFMediaType to allow MF_MT_AM_FORMAT_TYPE to be missing or set to GUID_NULL.
This MR: - adds tests for when MF_MT_AM_FORMAT_TYPE is missing or set to GUID_NULL; and - modifies MFCreateWaveFormatExFromMFMediaType to pass these tests -- v3: mfplat: Allow MF_MT_USER_DATA to be missing for all subtypes. mfplat/tests: Add additional MFCreateWaveFormatExFromMFMediaType tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/7417
From: Brendan McGrath <bmcgrath(a)codeweavers.com> Test additional subtypes without MF_MT_USER_DATA. --- dlls/mfplat/tests/mfplat.c | 40 +++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 6bd6bb74d68..0a6286b17ec 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5930,11 +5930,17 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) { const GUID *subtype; WORD format_tag; + UINT32 size; + WORD size_field; + BOOL todo; + BOOL todo_size; } wave_fmt_tests[] = { - { &MFAudioFormat_PCM, WAVE_FORMAT_PCM, }, - { &MFAudioFormat_Float, WAVE_FORMAT_IEEE_FLOAT, }, + { &MFAudioFormat_PCM, WAVE_FORMAT_PCM, sizeof(WAVEFORMATEX), 0, }, + { &MFAudioFormat_Float, WAVE_FORMAT_IEEE_FLOAT, sizeof(WAVEFORMATEX), 0, }, + { &MFAudioFormat_MP3, WAVE_FORMAT_MPEGLAYER3, sizeof(WAVEFORMATEX), 0, TRUE, }, + { &DUMMY_GUID3, WAVE_FORMAT_EXTENSIBLE, sizeof(WAVEFORMATEXTENSIBLE), 22, TRUE, TRUE, }, }; WAVEFORMATEXTENSIBLE *format_ext; IMFMediaType *mediatype; @@ -5962,27 +5968,35 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) for (i = 0; i < ARRAY_SIZE(wave_fmt_tests); ++i) { + winetest_push_context("test %d", i); hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, wave_fmt_tests[i].subtype); ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + todo_wine_if(wave_fmt_tests[i].todo) ok(hr == S_OK, "Failed to create format, hr %#lx.\n", hr); ok(format != NULL, "Expected format structure.\n"); - ok(size == sizeof(*format), "Unexpected size %u.\n", size); + todo_wine_if(wave_fmt_tests[i].todo_size) + ok(size == wave_fmt_tests[i].size, "Unexpected size %u.\n", size); + todo_wine_if(wave_fmt_tests[i].todo) ok(format->wFormatTag == wave_fmt_tests[i].format_tag, "Expected tag %u, got %u.\n", wave_fmt_tests[i].format_tag, format->wFormatTag); ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %lu.\n", format->nSamplesPerSec); ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %lu.\n", format->nAvgBytesPerSec); ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); - ok(format->cbSize == 0, "Unexpected size field, %u.\n", format->cbSize); + todo_wine_if(wave_fmt_tests[i].todo_size) + ok(format->cbSize == wave_fmt_tests[i].size_field, "Unexpected size field, %u.\n", format->cbSize); CoTaskMemFree(format); hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, MFWaveFormatExConvertFlag_ForceExtensible); + todo_wine_if(wave_fmt_tests[i].todo) ok(hr == S_OK, "Failed to create format, hr %#lx.\n", hr); ok(format_ext != NULL, "Expected format structure.\n"); + todo_wine_if(wave_fmt_tests[i].todo) ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); + todo_wine_if(wave_fmt_tests[i].todo) ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %lu.\n", format_ext->Format.nSamplesPerSec); @@ -5990,14 +6004,18 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) format_ext->Format.nAvgBytesPerSec); ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); + todo_wine_if(wave_fmt_tests[i].todo) ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", format_ext->Format.cbSize); CoTaskMemFree(format_ext); hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); + todo_wine_if(wave_fmt_tests[i].todo) ok(hr == S_OK, "Failed to create format, hr %#lx.\n", hr); - ok(size == sizeof(*format), "Unexpected size %u.\n", size); + todo_wine_if(wave_fmt_tests[i].todo_size) + ok(size == wave_fmt_tests[i].size, "Unexpected size %u.\n", size); CoTaskMemFree(format); + winetest_pop_context(); } IMFMediaType_Release(mediatype); @@ -8485,6 +8503,18 @@ static void test_MFInitAMMediaTypeFromMFMediaType(void) ok(IsEqualGUID(&am_type.formattype, &FORMAT_MPEG2Video), "got %s.\n", debugstr_guid(&am_type.formattype)); ok(am_type.cbFormat == sizeof(MPEG2VIDEOINFO), "got %lu\n", am_type.cbFormat); CoTaskMemFree(am_type.pbFormat); + IMFMediaType_DeleteAllItems(media_type); + + /* test audio with NULL mapping */ + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_MP3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, 2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFMediaType_DeleteAllItems(media_type); /* test WAVEFORMATEX mapping */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7417
From: Brendan McGrath <bmcgrath(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 4 ---- dlls/mfplat/tests/mfplat.c | 16 ++-------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index feab99e3d8f..755ef7e2216 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3005,11 +3005,7 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE return E_INVALIDARG; if (FAILED(hr = IMFMediaType_GetBlobSize(mediatype, &MF_MT_USER_DATA, &user_size))) - { - if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) - return hr; user_size = 0; - } if (media_type_get_uint32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS) > 2 && SUCCEEDED(IMFMediaType_GetItem(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, NULL))) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 0a6286b17ec..b9cdabb3328 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5932,15 +5932,13 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) WORD format_tag; UINT32 size; WORD size_field; - BOOL todo; - BOOL todo_size; } wave_fmt_tests[] = { { &MFAudioFormat_PCM, WAVE_FORMAT_PCM, sizeof(WAVEFORMATEX), 0, }, { &MFAudioFormat_Float, WAVE_FORMAT_IEEE_FLOAT, sizeof(WAVEFORMATEX), 0, }, - { &MFAudioFormat_MP3, WAVE_FORMAT_MPEGLAYER3, sizeof(WAVEFORMATEX), 0, TRUE, }, - { &DUMMY_GUID3, WAVE_FORMAT_EXTENSIBLE, sizeof(WAVEFORMATEXTENSIBLE), 22, TRUE, TRUE, }, + { &MFAudioFormat_MP3, WAVE_FORMAT_MPEGLAYER3, sizeof(WAVEFORMATEX), 0, }, + { &DUMMY_GUID3, WAVE_FORMAT_EXTENSIBLE, sizeof(WAVEFORMATEXTENSIBLE), 22, }, }; WAVEFORMATEXTENSIBLE *format_ext; IMFMediaType *mediatype; @@ -5973,30 +5971,23 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); - todo_wine_if(wave_fmt_tests[i].todo) ok(hr == S_OK, "Failed to create format, hr %#lx.\n", hr); ok(format != NULL, "Expected format structure.\n"); - todo_wine_if(wave_fmt_tests[i].todo_size) ok(size == wave_fmt_tests[i].size, "Unexpected size %u.\n", size); - todo_wine_if(wave_fmt_tests[i].todo) ok(format->wFormatTag == wave_fmt_tests[i].format_tag, "Expected tag %u, got %u.\n", wave_fmt_tests[i].format_tag, format->wFormatTag); ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %lu.\n", format->nSamplesPerSec); ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %lu.\n", format->nAvgBytesPerSec); ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); - todo_wine_if(wave_fmt_tests[i].todo_size) ok(format->cbSize == wave_fmt_tests[i].size_field, "Unexpected size field, %u.\n", format->cbSize); CoTaskMemFree(format); hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, MFWaveFormatExConvertFlag_ForceExtensible); - todo_wine_if(wave_fmt_tests[i].todo) ok(hr == S_OK, "Failed to create format, hr %#lx.\n", hr); ok(format_ext != NULL, "Expected format structure.\n"); - todo_wine_if(wave_fmt_tests[i].todo) ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); - todo_wine_if(wave_fmt_tests[i].todo) ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %lu.\n", format_ext->Format.nSamplesPerSec); @@ -6004,15 +5995,12 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) format_ext->Format.nAvgBytesPerSec); ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); - todo_wine_if(wave_fmt_tests[i].todo) ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", format_ext->Format.cbSize); CoTaskMemFree(format_ext); hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); - todo_wine_if(wave_fmt_tests[i].todo) ok(hr == S_OK, "Failed to create format, hr %#lx.\n", hr); - todo_wine_if(wave_fmt_tests[i].todo_size) ok(size == wave_fmt_tests[i].size, "Unexpected size %u.\n", size); CoTaskMemFree(format); winetest_pop_context(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7417
On Wed Feb 26 08:10:18 2025 +0000, Brendan McGrath wrote:
Do we know what should happen if MT_AM_FORMAT_TYPE is used with non-zero GUID value?
I suspect it should fail It didn't fail at all actually. I tried with different combinations of `MF_MT_SUBTYPE`, `MF_MT_AM_FORMAT_TYPE` and with and without `MT_USER_DATA` and Windows accepted everything. Seems like there's no need for any check when `MT_USER_DATA` is missing. So I have pushed a change to the MR accordingly.
This nesting check looks too complicated
I'll to look rewrite that and push a change The check has now been removed. Just updated the MR description and updated the commit messages to reflect the latest changes.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/7417#note_96039
participants (2)
-
Brendan McGrath -
Brendan McGrath (＠redmcg)