From f51b2ca8f7640dd0770a82c1e2c19caa65286eef Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 21 Feb 2022 23:13:21 -0600 Subject: [PATCH] winegstreamer: No longer queue WG_PARSER_EVENT_SEGMENT. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- 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); }