Rémi Bernon : mfplat: Support AAC format attributes in MFInitMediaTypeFromWaveFormatEx.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1939bfff9ff402c009bf72d1522aac050c469484
URL:    https://gitlab.winehq.org/wine/wine/-/commit/1939bfff9ff402c009bf72d1522aac0...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Thu Nov 16 11:51:35 2023 +0100

mfplat: Support AAC format attributes in MFInitMediaTypeFromWaveFormatEx.

---

 dlls/mfplat/mediatype.c    | 9 +++++++++
 dlls/mfplat/tests/mfplat.c | 5 -----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
index 2ba967c6719..01890e77ce4 100644
--- a/dlls/mfplat/mediatype.c
+++ b/dlls/mfplat/mediatype.c
@@ -3124,6 +3124,15 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA
         mediatype_set_uint32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr);
     }
 
+    if (IsEqualGUID(&subtype, &MFAudioFormat_AAC))
+    {
+        HEAACWAVEINFO *info = CONTAINING_RECORD(format, HEAACWAVEINFO, wfx);
+        if (format->cbSize < sizeof(HEAACWAVEINFO) - sizeof(WAVEFORMATEX))
+            return E_INVALIDARG;
+        mediatype_set_uint32(mediatype, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, info->wAudioProfileLevelIndication, &hr);
+        mediatype_set_uint32(mediatype, &MF_MT_AAC_PAYLOAD_TYPE, info->wPayloadType, &hr);
+    }
+
     if (format->cbSize && format->wFormatTag != WAVE_FORMAT_EXTENSIBLE)
         mediatype_set_blob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)(format + 1), format->cbSize, &hr);
 
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 05633aaca52..19281c71151 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -7059,7 +7059,6 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
     /* test with invalid format size */
     aacformat.wfInfo.wfx.cbSize = sizeof(aacformat) - 2 - sizeof(WAVEFORMATEX);
     hr = MFInitMediaTypeFromWaveFormatEx(mediatype, (WAVEFORMATEX *)&aacformat, sizeof(aacformat) - 2);
-    todo_wine
     ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
     aacformat.wfInfo.wfx.cbSize = sizeof(aacformat) - sizeof(WAVEFORMATEX);
@@ -7070,15 +7069,11 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
 
     value = 0xdeadbeef;
     hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, &value);
-    todo_wine
     ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
-    todo_wine
     ok(value == aacformat.wfInfo.wAudioProfileLevelIndication, "Unexpected AAC_AUDIO_PROFILE_LEVEL_INDICATION %u.\n", value);
     value = 0xdeadbeef;
     hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AAC_PAYLOAD_TYPE, &value);
-    todo_wine
     ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
-    todo_wine
     ok(value == aacformat.wfInfo.wPayloadType, "Unexpected AAC_PAYLOAD_TYPE %u.\n", value);
 
     hr = IMFMediaType_GetBlob(mediatype, &MF_MT_USER_DATA, buff, sizeof(buff), &size);