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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8de2ec5fa0cbaa3a773ec5be5465acbe56694531
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8de2ec5fa0cbaa3a773ec5be5465acb...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Mon Aug 22 15:44:48 2022 +0200

winegstreamer: Use IWMSyncReader2_SetAllocateForOutput in the async reader.

---

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

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index fa93ce969c7..67df97d0c84 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -151,7 +151,6 @@ struct wm_stream
     WMT_STREAM_SELECTION selection;
     WORD index;
     bool eos;
-    bool allocate_output;
     bool allocate_stream;
     /* Note that we only pretend to read compressed samples, and instead output
      * uncompressed samples regardless of whether we are configured to read
@@ -194,7 +193,6 @@ struct wm_reader *wm_reader_from_sync_reader_inner(IUnknown *inner);
 
 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_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate);
 HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_number, BOOL allocate);
 
 #endif /* __GST_PRIVATE_INCLUDED__ */
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index 089c96deddf..fc0090f01c6 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -870,14 +870,13 @@ static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface,
-        DWORD output, BOOL allocate)
+static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output, BOOL allocate)
 {
     struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
 
     TRACE("reader %p, output %lu, allocate %d.\n", reader, output, allocate);
 
-    return wm_reader_set_allocate_for_output(reader->wm_reader, output, allocate);
+    return IWMSyncReader2_SetAllocateForOutput(reader->reader, output, allocate ? reader->allocator : NULL);
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate)
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index acdb7cdc817..8d026aae723 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1631,9 +1631,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA
         else if (callback_advanced && stream->read_compressed && stream->allocate_stream)
             hr = IWMReaderCallbackAdvanced_AllocateForStream(callback_advanced,
                     stream->index + 1, wg_buffer.size, &sample, NULL);
-        else if (callback_advanced && !stream->read_compressed && stream->allocate_output)
-            hr = IWMReaderCallbackAdvanced_AllocateForOutput(callback_advanced,
-                    stream->index, wg_buffer.size, &sample, NULL);
         /* FIXME: Should these be pooled? */
         else if (!(object = calloc(1, offsetof(struct buffer, data[wg_buffer.size]))))
             hr = E_OUTOFMEMORY;
@@ -1692,24 +1689,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA
     }
 }
 
-HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate)
-{
-    struct wm_stream *stream;
-
-    EnterCriticalSection(&reader->cs);
-
-    if (!(stream = get_stream_by_output_number(reader, output)))
-    {
-        LeaveCriticalSection(&reader->cs);
-        return E_INVALIDARG;
-    }
-
-    stream->allocate_output = !!allocate;
-
-    LeaveCriticalSection(&reader->cs);
-    return S_OK;
-}
-
 HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_number, BOOL allocate)
 {
     struct wm_stream *stream;