[PATCH v2 4/5] winegstreamer: Implement compressed output support in WMSyncReader.

[Alfred Agrell]

From: Alfred Agrell

---
 dlls/winegstreamer/wm_reader.c | 45 ++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 882b6df1bbb..857d40855b4 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -30,10 +30,6 @@ struct wm_stream
     WMT_STREAM_SELECTION selection;
     WORD index;
     bool eos;
-    /* Note that we only pretend to read compressed samples, and instead output
-     * uncompressed samples regardless of whether we are configured to read
-     * compressed samples. Rather, the behaviour of the reader objects differs
-     * in nontrivial ways depending on this field. */
     bool read_compressed;

IWMReaderAllocatorEx *output_allocator;
@@ -55,6 +51,7 @@ struct wm_reader

CRITICAL_SECTION cs;
     QWORD start_time;
+    QWORD file_size;

IStream *source_stream;
     HANDLE file;
@@ -567,6 +564,7 @@ static HRESULT WINAPI stream_props_GetMediaType(IWMMediaProps *iface, WM_MEDIA_T
     memcpy(mt, &stream_mt, sizeof(*mt));
     memcpy(mt + 1, stream_mt.pbFormat, stream_mt.cbFormat);
     mt->pbFormat = (BYTE *)(mt + 1);
+    FreeMediaType(&stream_mt);
     return S_OK;
 }

@@ -1453,13 +1451,15 @@ static const IWMReaderTimecodeVtbl timecode_vtbl =
     timecode_GetTimecodeRangeBounds,
 };

-static HRESULT init_stream(struct wm_reader *reader, QWORD file_size)
+static HRESULT init_stream(struct wm_reader *reader, bool read_compressed)
 {
     wg_parser_t wg_parser;
     HRESULT hr;
     WORD i;

-    if (!(wg_parser = wg_parser_create(WG_PARSER_DECODEBIN, FALSE)))
+    EnterCriticalSection(&reader->cs);
+
+    if (!(wg_parser = wg_parser_create(WG_PARSER_DECODEBIN, read_compressed)))
         return E_OUTOFMEMORY;

reader->wg_parser = wg_parser;
@@ -1470,20 +1470,26 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size)
         goto out_destroy_parser;
     }

-    if (FAILED(hr = wg_parser_connect(reader->wg_parser, file_size)))
+    if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size)))
     {
         ERR("Failed to connect parser, hr %#lx.\n", hr);
         goto out_shutdown_thread;
     }

-    reader->stream_count = wg_parser_get_stream_count(reader->wg_parser);
-
-    if (!(reader->streams = calloc(reader->stream_count, sizeof(*reader->streams))))
+    if (!reader->streams)
     {
-        hr = E_OUTOFMEMORY;
-        goto out_disconnect_parser;
+        reader->stream_count = wg_parser_get_stream_count(reader->wg_parser);
+        if (!(reader->streams = calloc(reader->stream_count, sizeof(*reader->streams))))
+        {
+            hr = E_OUTOFMEMORY;
+            goto out_disconnect_parser;
+        }
+        for (i = 0; i < reader->stream_count; ++i)
+            reader->streams[i].selection = WMT_ON;
     }

+    assert(reader->stream_count == wg_parser_get_stream_count(reader->wg_parser));
+
     for (i = 0; i < reader->stream_count; ++i)
     {
         struct wm_stream *stream = &reader->streams[i];
@@ -1491,7 +1497,6 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size)
         stream->wg_stream = wg_parser_get_stream(reader->wg_parser, i);
         stream->reader = reader;
         stream->index = i;
-        stream->selection = WMT_ON;
         wg_parser_stream_get_preferred_format(stream->wg_stream, &stream->format);
         if (stream->format.major_type == WG_MAJOR_TYPE_AUDIO)
         {
@@ -1517,13 +1522,15 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size)
             if (stream->format.u.video.height > 0)
                 stream->format.u.video.height = -stream->format.u.video.height;
         }
-        wg_parser_stream_enable(stream->wg_stream, &stream->format);
+        if (stream->selection == WMT_ON)
+            wg_parser_stream_enable(stream->wg_stream, &stream->format);
     }

/* We probably discarded events because streams weren't enabled yet.
      * Now that they're all enabled seek back to the start again. */
     wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, 0, 0,
             AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning);
+    LeaveCriticalSection(&reader->cs);

return S_OK;

@@ -1540,6 +1547,8 @@ out_destroy_parser:
     wg_parser_destroy(reader->wg_parser);
     reader->wg_parser = 0;

+    LeaveCriticalSection(&reader->cs);
+
     return hr;
 }

@@ -2134,8 +2143,9 @@ static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename)
     }

reader->file = file;
+    reader->file_size = size.QuadPart;

-    if (FAILED(hr = init_stream(reader, size.QuadPart)))
+    if (FAILED(hr = init_stream(reader, false)))
         reader->file = NULL;

LeaveCriticalSection(&reader->cs);
@@ -2166,7 +2176,9 @@ static HRESULT WINAPI reader_OpenStream(IWMSyncReader2 *iface, IStream *stream)
     }

IStream_AddRef(reader->source_stream = stream);
-    if (FAILED(hr = init_stream(reader, stat.cbSize.QuadPart)))
+    reader->file_size = stat.cbSize.QuadPart;
+
+    if (FAILED(hr = init_stream(reader, false)))
     {
         IStream_Release(stream);
         reader->source_stream = NULL;
@@ -2340,6 +2352,7 @@ static HRESULT WINAPI reader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD st
     }

stream->read_compressed = compressed;
+    init_stream(reader, compressed);

LeaveCriticalSection(&reader->cs);
     return S_OK;