[PATCH v3 0/2] MR5611: winegstreamer: Fix audio decoding support checks.

[Anton Baskanov (＠baskanov)]

Fixes: cc82780c22db31fed4da8b84e85c01652a995490

--
  v3: winegstreamer: Add missing format fields to WMA support check.
      winegstreamer: Recognize MFAudioFormat_MPEG and MFAudioFormat_MP3.

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

[PATCH v3 1/2] winegstreamer: Recognize MFAudioFormat_MPEG and MFAudioFormat_MP3.

[Anton Baskanov]

From: Anton Baskanov

Fixes: cc82780c22db31fed4da8b84e85c01652a995490
---
 dlls/winegstreamer/mfplat.c | 61 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 879ea0707fc..df3d95629c1 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -638,6 +638,61 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub
     FIXME("Unrecognized audio subtype %s, depth %u.\n", debugstr_guid(subtype), depth);
 }

+static void mf_media_type_to_wg_format_audio_mpeg(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
+{
+    MPEG1WAVEFORMAT wfx = {0};
+    UINT32 codec_data_size;
+    UINT32 rate, channels;
+
+    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate)))
+    {
+        FIXME("Sample rate is not set.\n");
+        return;
+    }
+    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels)))
+    {
+        FIXME("Channel count is not set.\n");
+        return;
+    }
+    if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, (UINT8 *)(&wfx.wfx + 1),
+            sizeof(wfx) - sizeof(WAVEFORMATEX), &codec_data_size)))
+    {
+        FIXME("Codec data is not set.\n");
+        return;
+    }
+    if (codec_data_size < sizeof(wfx) - sizeof(WAVEFORMATEX))
+    {
+        FIXME("Codec data is incomplete.\n");
+        return;
+    }
+
+    format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1;
+    format->u.audio.channels = channels;
+    format->u.audio.rate = rate;
+    format->u.audio.layer = wfx.fwHeadLayer;
+}
+
+static void mf_media_type_to_wg_format_audio_mpeg_layer3(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
+{
+    UINT32 rate, channels;
+
+    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate)))
+    {
+        FIXME("Sample rate is not set.\n");
+        return;
+    }
+    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels)))
+    {
+        FIXME("Channel count is not set.\n");
+        return;
+    }
+
+    format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1;
+    format->u.audio.channels = channels;
+    format->u.audio.rate = rate;
+    format->u.audio.layer = 3;
+}
+
 static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
 {
     BYTE buffer[sizeof(HEAACWAVEFORMAT) + 64];
@@ -942,7 +997,11 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)

if (IsEqualGUID(&major_type, &MFMediaType_Audio))
     {
-        if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) ||
+        if (IsEqualGUID(&subtype, &MFAudioFormat_MPEG))
+            mf_media_type_to_wg_format_audio_mpeg(type, &subtype, format);
+        else if (IsEqualGUID(&subtype, &MFAudioFormat_MP3))
+            mf_media_type_to_wg_format_audio_mpeg_layer3(type, &subtype, format);
+        else if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) ||
                 IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV8) ||
                 IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) ||
                 IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless))

[PATCH v3 2/2] winegstreamer: Add missing format fields to WMA support check.

[Anton Baskanov]

From: Anton Baskanov

Fixes: cc82780c22db31fed4da8b84e85c01652a995490
---
 dlls/winegstreamer/wma_decoder.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c
index 15815f11374..28439b1cf7e 100644
--- a/dlls/winegstreamer/wma_decoder.c
+++ b/dlls/winegstreamer/wma_decoder.c
@@ -1032,8 +1032,9 @@ HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out)
     };
     static const WMAUDIO2WAVEFORMAT input_format =
     {
-        .wfx = {.wFormatTag = WAVE_FORMAT_WMAUDIO2, .nSamplesPerSec = 44100, .nChannels = 1,
-                .cbSize = sizeof(input_format) - sizeof(WAVEFORMATEX)},
+        .wfx = {.wFormatTag = WAVE_FORMAT_WMAUDIO2, .wBitsPerSample = 16, .nSamplesPerSec = 44100, .nChannels = 1,
+                .nAvgBytesPerSec = 3000, .nBlockAlign = 139, .cbSize = sizeof(input_format) - sizeof(WAVEFORMATEX)},
+        .wEncodeOptions = 1,
     };
     struct wma_decoder *decoder;
     HRESULT hr;

[Anton Baskanov (＠baskanov)]

v3:
- Fixed wrong commit reference in the commit descriptions.

[Rémi Bernon (＠rbernon)]

Ah crap, sorry, I missed that some other MPEG formats were missing. I wanted to avoid having to add more format conversions as I was planning to get rid of them, which is why I skipped the MPEG video (see https://gitlab.winehq.org/wine/wine/-/merge_requests/5615), but I guess temporarily adding them is probably fine (or we could revert the quartz_transform changes).

[PATCH v3 0/2] MR5611: winegstreamer: Fix audio decoding support checks. - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.

[PATCH v3 0/2] MR5611: winegstreamer: Fix audio decoding support checks. - approved

[Elizabeth Figura (＠zfigura)]

This merge request was approved by Elizabeth Figura.