[PATCH v2 6/7] winegstreamer: Introduce a generic audio decoder transform.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winegstreamer/audio_decoder.c           | 38 ++++++++++++++++++++
 dlls/winegstreamer/gst_private.h             |  1 +
 dlls/winegstreamer/mfplat.c                  | 22 ++++++++++++
 dlls/winegstreamer/winegstreamer_classes.idl |  6 ++++
 4 files changed, 67 insertions(+)

diff --git a/dlls/winegstreamer/audio_decoder.c b/dlls/winegstreamer/audio_decoder.c
index aa7a58734a9..615c0392ee0 100644
--- a/dlls/winegstreamer/audio_decoder.c
+++ b/dlls/winegstreamer/audio_decoder.c
@@ -612,6 +612,9 @@ HRESULT aac_decoder_create(REFIID riid, void **ret)

if (!(decoder = calloc(1, sizeof(*decoder))))
         return E_OUTOFMEMORY;
+    decoder->IMFTransform_iface.lpVtbl = &transform_vtbl;
+    decoder->refcount = 1;
+
     decoder->input_types = (WAVEFORMATEXTENSIBLE *)aac_decoder_input_types;
     decoder->input_type_count = ARRAY_SIZE(aac_decoder_input_types);

@@ -621,9 +624,44 @@ HRESULT aac_decoder_create(REFIID riid, void **ret)
         return hr;
     }

+    *ret = &decoder->IMFTransform_iface;
+    TRACE("Created decoder %p\n", *ret);
+    return S_OK;
+}
+
+static WAVEFORMATEXTENSIBLE audio_decoder_input_types[] =
+{
+#define MAKE_WAVEFORMATEXTENSIBLE(format) \
+    {.Format = {.wFormatTag = WAVE_FORMAT_EXTENSIBLE, .nChannels = 6, .nSamplesPerSec = 48000, .nAvgBytesPerSec = 1152000, \
+                .nBlockAlign = 24, .wBitsPerSample = 32, .cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)}, \
+     .SubFormat = {format,0x0000,0x0010,{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}}
+
+    MAKE_WAVEFORMATEXTENSIBLE(MAKEFOURCC('G','S','T','a')),
+
+#undef MAKE_WAVEFORMATEXTENSIBLE
+};
+
+HRESULT audio_decoder_create(REFIID riid, void **ret)
+{
+    struct audio_decoder *decoder;
+    HRESULT hr;
+
+    TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret);
+
+    if (!(decoder = calloc(1, sizeof(*decoder))))
+        return E_OUTOFMEMORY;
     decoder->IMFTransform_iface.lpVtbl = &transform_vtbl;
     decoder->refcount = 1;

+    decoder->input_types = audio_decoder_input_types;
+    decoder->input_type_count = ARRAY_SIZE(audio_decoder_input_types);
+
+    if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue)))
+    {
+        free(decoder);
+        return hr;
+    }
+
     *ret = &decoder->IMFTransform_iface;
     TRACE("Created decoder %p\n", *ret);
     return S_OK;
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 5e6cbbab5d5..b48acd67760 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -170,6 +170,7 @@ unsigned int wg_format_get_stride(const struct wg_format *format);

bool wg_video_format_is_rgb(enum wg_video_format format);

+HRESULT audio_decoder_create(REFIID riid, void **ret);
 HRESULT aac_decoder_create(REFIID riid, void **ret);
 HRESULT h264_decoder_create(REFIID riid, void **ret);
 HRESULT video_processor_create(REFIID riid, void **ret);
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index a083915cdbd..9e831900cfa 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -119,6 +119,7 @@ static const IClassFactoryVtbl class_factory_vtbl =
     class_factory_LockServer,
 };

+static const GUID CLSID_GStreamerAudioDecoder = {0x480b1517, 0xc8e9, 0x4eae, {0xb0, 0x06, 0xe6, 0x30, 0x07, 0x18, 0xd8, 0x5d}};
 static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};

static const struct class_object
@@ -128,6 +129,7 @@ static const struct class_object
 }
 class_objects[] =
 {
+    { &CLSID_GStreamerAudioDecoder, &audio_decoder_create },
     { &CLSID_VideoProcessorMFT, &video_processor_create },
     { &CLSID_GStreamerByteStreamHandler, &gstreamer_byte_stream_handler_create },
     { &CLSID_MSAACDecMFT, &aac_decoder_create },
@@ -327,6 +329,16 @@ HRESULT mfplat_DllRegisterServer(void)
         {MFMediaType_Video, MFVideoFormat_NV11},
     };

+    MFT_REGISTER_TYPE_INFO audio_decoder_input_types[] =
+    {
+        {MFMediaType_Audio, MFAudioFormat_GStreamer},
+    };
+    MFT_REGISTER_TYPE_INFO audio_decoder_output_types[] =
+    {
+        {MFMediaType_Audio, MFAudioFormat_Float},
+        {MFMediaType_Audio, MFAudioFormat_PCM},
+    };
+
     struct mft
     {
         GUID clsid;
@@ -410,6 +422,16 @@ HRESULT mfplat_DllRegisterServer(void)
             ARRAY_SIZE(color_convert_output_types),
             color_convert_output_types,
         },
+        {
+            CLSID_GStreamerAudioDecoder,
+            MFT_CATEGORY_AUDIO_DECODER,
+            L"Wine Audio Decoder MFT",
+            MFT_ENUM_FLAG_SYNCMFT,
+            ARRAY_SIZE(audio_decoder_input_types),
+            audio_decoder_input_types,
+            ARRAY_SIZE(audio_decoder_output_types),
+            audio_decoder_output_types,
+        },
     };

unsigned int i;
diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl
index bb727ca8645..0ce6acaceef 100644
--- a/dlls/winegstreamer/winegstreamer_classes.idl
+++ b/dlls/winegstreamer/winegstreamer_classes.idl
@@ -76,6 +76,12 @@ coclass decodebin_parser {}
 ]
 coclass VideoProcessorMFT {}

+[
+    threading(both),
+    uuid(480b1517-c8e9-4eae-b006-e6300718d85d)
+]
+coclass GStreamerAudioDecoder {}
+
 [
     helpstring("Generic Decodebin Byte Stream Handler"),
     threading(both),