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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b69717e797722e8293b94b119e724b04661f428c
URL:    https://gitlab.winehq.org/wine/wine/-/commit/b69717e797722e8293b94b119e724b0...

Author: Rémi Bernon 
Date:   Mon Aug 22 18:47:47 2022 +0200

winegstreamer: Use IWMSyncReader2_GetReadStreamSamples in the async reader.

---

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

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index c4d1be54364..6b24a73d5d6 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -196,8 +196,6 @@ HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output,
 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);
-struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader,
-        WORD stream_number);
 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 85d417b4152..a26f03b4cd9 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -138,7 +138,6 @@ static void async_reader_deliver_sample(struct async_reader *reader, struct samp
 {
     IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced;
     IWMReaderCallback *callback = reader->callback;
-    struct wm_stream *stream;
     BOOL read_compressed;
     HRESULT hr;

@@ -146,8 +145,9 @@ static void async_reader_deliver_sample(struct async_reader *reader, struct samp
             reader, sample->stream, debugstr_time(sample->pts), debugstr_time(sample->duration),
             sample->flags, sample->buffer);

-    stream = wm_reader_get_stream_by_stream_number(reader->wm_reader, sample->stream);
-    read_compressed = stream->read_compressed;
+    if (FAILED(hr = IWMSyncReader2_GetReadStreamSamples(reader->reader, sample->stream,
+            &read_compressed)))
+        read_compressed = FALSE;

LeaveCriticalSection(&reader->callback_cs);
     if (read_compressed)
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 09745ae2023..44e75a8d0c0 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1580,7 +1580,7 @@ HRESULT wm_reader_close(struct wm_reader *reader)
     return S_OK;
 }

-struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number)
+static struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number)
 {
     if (stream_number && stream_number <= reader->stream_count)
         return &reader->streams[stream_number - 1];