Signed-off-by: Zebediah Figura z.figura12@gmail.com --- Should hopefully fix some intermittent test failures caused by receiving EOS events inside of test_filter_state().
dlls/quartz/tests/avisplit.c | 13 +++++++++++-- dlls/quartz/tests/mpegsplit.c | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 06c2f5fed3c..f295c074d5a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -836,10 +836,21 @@ static void testfilter_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); }
+static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->new_segment_count = 0; + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, };
static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -1689,7 +1700,6 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n");
- testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); @@ -1716,7 +1726,6 @@ static void test_streaming(void) ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end);
- testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 0809c5f861f..5a9efe84551 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1125,10 +1125,21 @@ static void testfilter_destroy(struct strmbase_filter *iface) CloseHandle(filter->eos_event); }
+static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->new_segment_count = 0; + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, };
static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -1842,7 +1853,6 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n");
- testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); @@ -1869,7 +1879,6 @@ static void test_streaming(void) ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end);
- testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control);
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/tests/avisplit.c | 21 ++++++++++++++------- dlls/quartz/tests/mpegsplit.c | 21 ++++++++++++++------- 2 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index f295c074d5a..0665fad3ad8 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -809,7 +809,7 @@ struct testfilter const AM_MEDIA_TYPE *mt; HANDLE eos_event; unsigned int sample_count, eos_count, new_segment_count; - REFERENCE_TIME seek_start, seek_end; + REFERENCE_TIME segment_start, segment_end, seek_start, seek_end; };
static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -985,14 +985,20 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface, IMediaSeeking *seeking; HRESULT hr;
+ if (winetest_debug > 1) + trace("%04x: Got segment with timestamps %I64d-%I64d.\n", GetCurrentThreadId(), start, end); + ++filter->new_segment_count;
IPin_QueryInterface(iface->pin.peer, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaSeeking_GetPositions(seeking, &filter->seek_start, &filter->seek_end); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(rate == 1.0, "Got rate %.16e.\n", rate); IMediaSeeking_Release(seeking);
+ ok(start == filter->segment_start, "Expected start %I64d, got %I64d.\n", filter->segment_start, start); + ok(end == filter->segment_end, "Expected end %I64d, got %I64d.\n", filter->segment_end, end); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return S_OK; }
@@ -1092,6 +1098,7 @@ static void testfilter_init(struct testfilter *filter) strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); filter->IAsyncReader_iface.lpVtbl = &async_reader_vtbl; filter->eos_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->segment_end = 50000000; }
static void test_filter_state(IMediaControl *control) @@ -1709,11 +1716,11 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n");
- testsink.sample_count = testsink.eos_count = 0; - start = 1500 * 10000; - end = 3500 * 10000; - hr = IMediaSeeking_SetPositions(seeking, &start, AM_SEEKING_AbsolutePositioning, - &end, AM_SEEKING_AbsolutePositioning); + testsink.new_segment_count = testsink.sample_count = testsink.eos_count = 0; + testsink.segment_start = 1500 * 10000; + testsink.segment_end = 3500 * 10000; + hr = IMediaSeeking_SetPositions(seeking, &testsink.segment_start, AM_SEEKING_AbsolutePositioning, + &testsink.segment_end, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(!WaitForSingleObject(testsink.eos_event, 1000), "Did not receive EOS.\n"); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 5a9efe84551..5aae09b596d 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1098,7 +1098,7 @@ struct testfilter const AM_MEDIA_TYPE *mt; HANDLE eos_event; unsigned int sample_count, eos_count, new_segment_count; - REFERENCE_TIME seek_start, seek_end; + REFERENCE_TIME segment_start, segment_end, seek_start, seek_end; };
static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1260,14 +1260,20 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface, IMediaSeeking *seeking; HRESULT hr;
+ if (winetest_debug > 1) + trace("%04x: Got segment with timestamps %I64d-%I64d.\n", GetCurrentThreadId(), start, end); + ++filter->new_segment_count;
IPin_QueryInterface(iface->pin.peer, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaSeeking_GetPositions(seeking, &filter->seek_start, &filter->seek_end); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(rate == 1.0, "Got rate %.16e.\n", rate); IMediaSeeking_Release(seeking);
+ ok(start == filter->segment_start, "Expected start %I64d, got %I64d.\n", filter->segment_start, start); + ok(end == filter->segment_end, "Expected end %I64d, got %I64d.\n", filter->segment_end, end); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return S_OK; }
@@ -1367,6 +1373,7 @@ static void testfilter_init(struct testfilter *filter) strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); filter->IAsyncReader_iface.lpVtbl = &async_reader_vtbl; filter->eos_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->segment_end = 5392500; }
static void test_connect_pin(void) @@ -1862,11 +1869,11 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n");
- testsink.sample_count = testsink.eos_count = 0; - start = 100 * 10000; - end = 300 * 10000; - hr = IMediaSeeking_SetPositions(seeking, &start, AM_SEEKING_AbsolutePositioning, - &end, AM_SEEKING_AbsolutePositioning); + testsink.new_segment_count = testsink.sample_count = testsink.eos_count = 0; + testsink.segment_start = 100 * 10000; + testsink.segment_end = 300 * 10000; + hr = IMediaSeeking_SetPositions(seeking, &testsink.segment_start, AM_SEEKING_AbsolutePositioning, + &testsink.segment_end, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(!WaitForSingleObject(testsink.eos_event, 1000), "Did not receive EOS.\n");
Instead of translating them from GST_EVENT_SEGMENT.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/winegstreamer/quartz_parser.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index e06c55ccfe0..eab94aca004 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -75,6 +75,12 @@ struct parser_source
CRITICAL_SECTION flushing_cs; HANDLE thread; + + /* This variable is read and written by both the streaming thread and + * application threads. However, it is only written by the application + * thread when the streaming thread is not running, or when it is blocked + * by flushing_cs. */ + bool need_segment; };
static inline struct parser *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -750,6 +756,14 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event HRESULT hr; IMediaSample *sample;
+ if (pin->need_segment) + { + if (FAILED(hr = IPin_NewSegment(pin->pin.pin.peer, + pin->seek.llCurrent, pin->seek.llStop, pin->seek.dRate))) + WARN("Failed to deliver new segment, hr %#lx.\n", hr); + pin->need_segment = false; + } + if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM) || IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_IEEE_FLOAT))) @@ -828,8 +842,6 @@ static DWORD CALLBACK stream_thread(void *arg) break;
case WG_PARSER_EVENT_SEGMENT: - IPin_NewSegment(pin->pin.pin.peer, event.u.segment.position, - event.u.segment.stop, event.u.segment.rate); break;
case WG_PARSER_EVENT_NONE: @@ -972,6 +984,8 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) if (FAILED(hr = IMemAllocator_Commit(filter->sources[i]->pin.pAllocator))) ERR("Failed to commit allocator, hr %#lx.\n", hr);
+ filter->sources[i]->need_segment = true; + filter->sources[i]->thread = CreateThread(NULL, 0, stream_thread, filter->sources[i], 0, NULL); }
@@ -1359,6 +1373,8 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { struct parser_source *flush_pin = filter->sources[i];
+ flush_pin->need_segment = true; + if (flush_pin->pin.pin.peer) LeaveCriticalSection(&flush_pin->flushing_cs); }
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/winegstreamer/media_source.c | 3 --- dlls/winegstreamer/quartz_parser.c | 3 --- dlls/winegstreamer/unixlib.h | 6 ------ dlls/winegstreamer/wg_parser.c | 7 ------- dlls/winegstreamer/wm_reader.c | 3 --- 5 files changed, 22 deletions(-)
diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index bccbf888a4a..e40974bf73a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -554,9 +554,6 @@ static void wait_on_sample(struct media_stream *stream, IUnknown *token) dispatch_end_of_presentation(stream->parent_source); return;
- case WG_PARSER_EVENT_SEGMENT: - break; - case WG_PARSER_EVENT_NONE: assert(0); } diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index eab94aca004..4afd265bca7 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -841,9 +841,6 @@ static DWORD CALLBACK stream_thread(void *arg) IPin_EndOfStream(pin->pin.pin.peer); break;
- case WG_PARSER_EVENT_SEGMENT: - break; - case WG_PARSER_EVENT_NONE: assert(0); } diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 4adbb694766..f445fc7ac7e 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -108,7 +108,6 @@ enum wg_parser_event_type WG_PARSER_EVENT_NONE = 0, WG_PARSER_EVENT_BUFFER, WG_PARSER_EVENT_EOS, - WG_PARSER_EVENT_SEGMENT, };
struct wg_parser_event @@ -123,11 +122,6 @@ struct wg_parser_event uint32_t size; bool discontinuity, preroll, delta, has_pts, has_duration; } buffer; - struct - { - ULONGLONG position, stop; - DOUBLE rate; - } segment; } u; }; C_ASSERT(sizeof(struct wg_parser_event) == 40); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a2e970a4dd..d0883c4c024 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -500,7 +500,6 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_SEGMENT: if (stream->enabled) { - struct wg_parser_event stream_event; const GstSegment *segment;
gst_event_parse_segment(event, &segment); @@ -512,12 +511,6 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) }
gst_segment_copy_into(segment, &stream->segment); - - stream_event.type = WG_PARSER_EVENT_SEGMENT; - stream_event.u.segment.position = segment->position / 100; - stream_event.u.segment.stop = segment->stop / 100; - stream_event.u.segment.rate = segment->rate * segment->applied_rate; - queue_stream_event(stream, &stream_event, NULL); } break;
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 01518c6b9a8..f49d99071e0 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1935,9 +1935,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, TRACE("End of stream.\n"); return NS_E_NO_MORE_SAMPLES;
- case WG_PARSER_EVENT_SEGMENT: - break; - case WG_PARSER_EVENT_NONE: assert(0); }
-
Zebediah Figura