Rémi Bernon : winegstreamer: Use IWMSyncReader2_GetOutputProps in the async reader.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6070192528fe3888a9bab669b95f655049237dd4
URL:    https://gitlab.winehq.org/wine/wine/-/commit/6070192528fe3888a9bab669b95f655...

Author: Rémi Bernon 
Date:   Mon Aug 22 13:31:34 2022 +0200

winegstreamer: Use IWMSyncReader2_GetOutputProps in the async reader.

---

dlls/winegstreamer/gst_private.h    |  2 --
 dlls/winegstreamer/wm_asyncreader.c |  2 +-
 dlls/winegstreamer/wm_reader.c      | 30 ++++++++++++------------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 23e568b232a..b5c2676a40d 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -192,8 +192,6 @@ struct wm_reader *wm_reader_from_sync_reader_inner(IUnknown *inner);
 HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output,
         DWORD index, IWMOutputMediaProps **props);
 HRESULT wm_reader_get_output_format_count(struct wm_reader *reader, DWORD output, DWORD *count);
-HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output,
-        IWMOutputMediaProps **props);
 HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackAdvanced *callback_advanced, WORD stream_number,
         INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number);
 HRESULT wm_reader_get_stream_selection(struct wm_reader *reader,
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index 7d5bf7347cb..c6ea7146e0a 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -508,7 +508,7 @@ static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output, IW

TRACE("reader %p, output %lu, props %p.\n", reader, output, props);

-    return wm_reader_get_output_props(reader->wm_reader, output, props);
+    return IWMSyncReader2_GetOutputProps(reader->reader, output, props);
 }

static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output, IWMOutputMediaProps *props)
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index b9834f8dae5..30e8e009850 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1487,23 +1487,6 @@ static struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader
     return NULL;
 }

-HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props)
-{
-    struct wm_stream *stream;
-
-    EnterCriticalSection(&reader->cs);
-
-    if (!(stream = get_stream_by_output_number(reader, output)))
-    {
-        LeaveCriticalSection(&reader->cs);
-        return E_INVALIDARG;
-    }
-
-    *props = output_props_create(&stream->format);
-    LeaveCriticalSection(&reader->cs);
-    return *props ? S_OK : E_OUTOFMEMORY;
-}
-
 static const enum wg_video_format video_formats[] =
 {
     /* Try to prefer YUV formats over RGB ones. Most decoders output in the
@@ -2220,10 +2203,21 @@ static HRESULT WINAPI reader_GetOutputProps(IWMSyncReader2 *iface,
         DWORD output, IWMOutputMediaProps **props)
 {
     struct wm_reader *reader = impl_from_IWMSyncReader2(iface);
+    struct wm_stream *stream;

TRACE("reader %p, output %lu, props %p.\n", reader, output, props);

-    return wm_reader_get_output_props(reader, output, props);
+    EnterCriticalSection(&reader->cs);
+
+    if (!(stream = get_stream_by_output_number(reader, output)))
+    {
+        LeaveCriticalSection(&reader->cs);
+        return E_INVALIDARG;
+    }
+
+    *props = output_props_create(&stream->format);
+    LeaveCriticalSection(&reader->cs);
+    return *props ? S_OK : E_OUTOFMEMORY;
 }

static HRESULT WINAPI reader_GetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name,