Rémi Bernon : winegstreamer: Introduce new init_audio_media_types helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 43ea59fdf92b440178f61503664a21f63ac0b2f6
URL:    https://gitlab.winehq.org/wine/wine/-/commit/43ea59fdf92b440178f61503664a21f...

Author: Rémi Bernon 
Date:   Thu Jun  1 09:04:34 2023 +0200

winegstreamer: Introduce new init_audio_media_types helper.

---

dlls/winegstreamer/media_source.c | 45 +++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
index ea34eb22fcf..de7094781f2 100644
--- a/dlls/winegstreamer/media_source.c
+++ b/dlls/winegstreamer/media_source.c
@@ -371,6 +371,31 @@ done:
     return hr;
 }

+static HRESULT init_audio_media_types(struct wg_format *format, IMFMediaType *types[6], DWORD *types_count)
+{
+    /* Expose at least one PCM and one floating point type for the
+       consumer to pick from. */
+    static const enum wg_audio_format audio_types[] =
+    {
+        WG_AUDIO_FORMAT_S16LE,
+        WG_AUDIO_FORMAT_F32LE,
+    };
+    UINT count = *types_count, i;
+
+    for (i = 0; i < ARRAY_SIZE(audio_types); i++)
+    {
+        struct wg_format new_format = *format;
+        if (new_format.u.audio.format == audio_types[i])
+            continue;
+        new_format.u.audio.format = audio_types[i];
+        if ((types[count] = mf_media_type_from_wg_format(&new_format)))
+            count++;
+    }
+
+    *types_count = count;
+    return S_OK;
+}
+
 static BOOL enqueue_token(struct media_stream *stream, IUnknown *token)
 {
     if (stream->token_queue_count == stream->token_queue_cap)
@@ -988,24 +1013,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
     }
     else if (format.major_type == WG_MAJOR_TYPE_AUDIO)
     {
-        /* Expose at least one PCM and one floating point type for the
-           consumer to pick from. */
-        static const enum wg_audio_format audio_types[] =
-        {
-            WG_AUDIO_FORMAT_S16LE,
-            WG_AUDIO_FORMAT_F32LE,
-        };
-
-        for (i = 0; i < ARRAY_SIZE(audio_types); i++)
-        {
-            struct wg_format new_format;
-            if (format.u.audio.format == audio_types[i])
-                continue;
-            new_format = format;
-            new_format.u.audio.format = audio_types[i];
-            if ((stream_types[type_count] = mf_media_type_from_wg_format(&new_format)))
-                type_count++;
-        }
+        if (FAILED(hr = init_audio_media_types(&format, stream_types, &type_count)))
+            goto done;
     }

assert(type_count <= ARRAY_SIZE(stream_types));