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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 64ee5529e19a62a1811d45fd207170ebec07e8d5
URL:    https://gitlab.winehq.org/wine/wine/-/commit/64ee5529e19a62a1811d45fd207170e...

Author: Rémi Bernon 
Date:   Mon Aug 22 13:25:48 2022 +0200

winegstreamer: Use IWMSyncReader2_GetMaxStreamSampleSize in the async reader.

---

dlls/winegstreamer/gst_private.h    |  1 -
 dlls/winegstreamer/wm_asyncreader.c |  2 +-
 dlls/winegstreamer/wm_reader.c      | 40 +++++++++++++++++--------------------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 5ed44f0d50b..23e568b232a 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -189,7 +189,6 @@ struct wm_reader
 HRESULT WINAPI winegstreamer_create_wm_sync_reader(IUnknown *outer, void **out);
 struct wm_reader *wm_reader_from_sync_reader_inner(IUnknown *inner);

-HRESULT wm_reader_get_max_stream_size(struct wm_reader *reader, WORD stream_number, DWORD *size);
 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);
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index 60cffba2553..7d5bf7347cb 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -810,7 +810,7 @@ static HRESULT WINAPI WMReaderAdvanced_GetMaxStreamSampleSize(IWMReaderAdvanced6

TRACE("reader %p, stream_number %u, size %p.\n", reader, stream_number, size);

-    return wm_reader_get_max_stream_size(reader->wm_reader, stream_number, size);
+    return IWMSyncReader2_GetMaxStreamSampleSize(reader->reader, stream_number, size);
 }

static HRESULT WINAPI WMReaderAdvanced_NotifyLateDelivery(IWMReaderAdvanced6 *iface, QWORD lateness)
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 09af7457b27..b9834f8dae5 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1985,24 +1985,6 @@ HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_
     return S_OK;
 }

-HRESULT wm_reader_get_max_stream_size(struct wm_reader *reader, WORD stream_number, DWORD *size)
-{
-    struct wm_stream *stream;
-
-    EnterCriticalSection(&reader->cs);
-
-    if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number)))
-    {
-        LeaveCriticalSection(&reader->cs);
-        return E_INVALIDARG;
-    }
-
-    *size = wg_format_get_max_size(&stream->format);
-
-    LeaveCriticalSection(&reader->cs);
-    return S_OK;
-}
-
 static struct wm_reader *impl_from_IUnknown(IUnknown *iface)
 {
     return CONTAINING_RECORD(iface, struct wm_reader, IUnknown_inner);
@@ -2145,11 +2127,25 @@ static HRESULT WINAPI reader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD
     return E_NOTIMPL;
 }

-static HRESULT WINAPI reader_GetMaxStreamSampleSize(IWMSyncReader2 *iface, WORD stream, DWORD *max)
+static HRESULT WINAPI reader_GetMaxStreamSampleSize(IWMSyncReader2 *iface, WORD stream_number, DWORD *size)
 {
-    struct wm_reader *This = impl_from_IWMSyncReader2(iface);
-    FIXME("(%p)->(%d %p): stub!\n", This, stream, max);
-    return E_NOTIMPL;
+    struct wm_reader *reader = impl_from_IWMSyncReader2(iface);
+    struct wm_stream *stream;
+
+    TRACE("reader %p, stream_number %u, size %p.\n", reader, stream_number, size);
+
+    EnterCriticalSection(&reader->cs);
+
+    if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number)))
+    {
+        LeaveCriticalSection(&reader->cs);
+        return E_INVALIDARG;
+    }
+
+    *size = wg_format_get_max_size(&stream->format);
+
+    LeaveCriticalSection(&reader->cs);
+    return S_OK;
 }

static HRESULT WINAPI reader_GetNextSample(IWMSyncReader2 *iface,