[PATCH 1/4] winegstreamer: Preserve the frame rate when converting video formats.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/winegstreamer/gstdemux.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 20de73c173d..a4371384e34 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1721,13 +1721,18 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin,

if (!strcmp(type, "video/x-raw") && index < ARRAY_SIZE(video_formats))
     {
-        gint width, height;
+        gint width, height, fps_n, fps_d;
         GstVideoInfo info;

gst_caps_unref(caps);
         gst_structure_get_int(structure, "width", &width);
         gst_structure_get_int(structure, "height", &height);
         gst_video_info_set_format(&info, video_formats[index], width, height);
+        if (gst_structure_get_fraction(structure, "framerate", &fps_n, &fps_d) && fps_n)
+        {
+            info.fps_n = fps_n;
+            info.fps_d = fps_d;
+        }
         if (!amt_from_gst_video_info(&info, mt))
             return E_OUTOFMEMORY;
         return S_OK;

[PATCH 2/4] winegstreamer: Release the IAsyncReader on disconnection.

[Zebediah Figura]

This allows "Zero Escape: Nine Hours, Nine Persons, Nine Doors" to start.

Signed-off-by: Zebediah Figura 
---
 dlls/winegstreamer/gstdemux.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index a4371384e34..1bb0eef7c79 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1601,6 +1601,9 @@ static void gstdemux_sink_disconnect(struct strmbase_sink *iface)
     mark_wine_thread();

GST_RemoveOutputPins(filter);
+
+    IAsyncReader_Release(filter->reader);
+    filter->reader = NULL;
 }

static const struct strmbase_sink_ops sink_ops =

[PATCH 3/4] quartz/dsoundrender: Clear the DirectSound buffer on EOS.

[Zebediah Figura]

"Zero Escape: Nine Hours, Nine Persons, Nine Doors" does not stop or destroy the
graph after it is finished running, so the last second of audio repeats
otherwise.

Signed-off-by: Zebediah Figura 
---
 dlls/quartz/dsoundrender.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index a3155477fde..8b914751e15 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -477,6 +477,8 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface)
     struct dsound_render *filter = impl_from_strmbase_pin(&iface->pin);
     IFilterGraph *graph = filter->filter.graph;
     IMediaEventSink *event_sink;
+    void *buffer;
+    DWORD size;

EnterCriticalSection(&filter->stream_cs);

@@ -494,6 +496,10 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface)

DSoundRender_HandleEndOfStream(filter);

+    IDirectSoundBuffer_Lock(filter->dsbuffer, 0, 0, &buffer, &size, NULL, NULL, DSBLOCK_ENTIREBUFFER);
+    memset(buffer, 0, size);
+    IDirectSoundBuffer_Unlock(filter->dsbuffer, buffer, size, NULL, 0);
+
     LeaveCriticalSection(&filter->stream_cs);
     return S_OK;
 }

[PATCH 4/4] quartz: Don't pause the graph in IMediaSeeking::SetPositions if it hasn't finished running yet.

[Zebediah Figura]

Fixes: 114832224fc5babd1417562dbd64d489fabe1e01
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49604
Signed-off-by: Zebediah Figura 
---
 dlls/quartz/filtergraph.c       |  4 ++--
 dlls/quartz/tests/filtergraph.c | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 3b06d32c20a..db432b7dd95 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -2398,7 +2398,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
     EnterCriticalSection(&graph->cs);

state = graph->state;
-    if (state == State_Running)
+    if (state == State_Running && !graph->needs_async_run)
         IMediaControl_Pause(&graph->IMediaControl_iface);

LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry)
@@ -2434,7 +2434,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
         graph->stream_elapsed = 0;
     }

-    if (state == State_Running)
+    if (state == State_Running && !graph->needs_async_run)
         IMediaControl_Run(&graph->IMediaControl_iface);

LeaveCriticalSection(&graph->cs);
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 4fcd27b2918..cf641a4306e 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -3205,9 +3205,10 @@ static void test_filter_state(void)
     struct testpin source_pin, sink_pin;

IFilterGraph2 *graph = create_graph();
-    REFERENCE_TIME start_time;
+    REFERENCE_TIME start_time, time;
     IReferenceClock *clock;
     IMediaControl *control;
+    IMediaSeeking *seeking;
     FILTER_STATE mf_state;
     IMediaFilter *filter;
     OAFilterState state;
@@ -3219,6 +3220,7 @@ static void test_filter_state(void)
     testfilter_init(&source, &source_pin, 1);
     testfilter_init(&sink, &sink_pin, 1);
     testfilter_init(&dummy, NULL, 0);
+    sink.IMediaSeeking_iface.lpVtbl = &testseek_vtbl;

IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter);
     IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control);
@@ -3350,6 +3352,7 @@ static void test_filter_state(void)
     graph = create_graph();
     IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter);
     IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control);
+    IFilterGraph2_QueryInterface(graph, &IID_IMediaSeeking, (void **)&seeking);

/* Add the filters in reverse order this time. */
     IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL);
@@ -3511,6 +3514,13 @@ todo_wine
     ok(sink.state == State_Paused, "Got state %u.\n", sink.state);
     ok(source.state == State_Paused, "Got state %u.\n", source.state);

+    /* SetPositions() does not pause the graph in this case, since it is
+     * already in a paused state. */
+    time = 0;
+    hr = IMediaSeeking_SetPositions(seeking, &time, AM_SEEKING_AbsolutePositioning,
+            NULL, AM_SEEKING_NoPositioning);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
+
     hr = IMediaControl_Run(control);
     todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);

@@ -3684,6 +3694,7 @@ todo_wine
     source.expect_stop_prev = sink.expect_stop_prev = State_Running;
     IMediaFilter_Release(filter);
     IMediaControl_Release(control);
+    IMediaSeeking_Release(seeking);
     ref = IFilterGraph2_Release(graph);
     ok(!ref, "Got outstanding refcount %d.\n", ref);
     ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref);

[PATCH 4/4] quartz: Don't pause the graph in IMediaSeeking::SetPositions if it hasn't finished running yet.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=76012

Your paranoid android.

=== debiant (32 bit Chinese:China report) ===

quartz:
dsoundrender.c:810: Test failed: Got hr 0x103.