mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

streamsynchronizer: check reset-time when handling FLUSH_STOP

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4749>
This commit is contained in:
Guillaume Desmottes 2023-05-31 16:26:45 +02:00
parent c2d8f4f729
commit b3d27da397
1 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
subprojects/gst-plugins-base/gst/playback/gststreamsynchronizer.c
View file

@ -581,12 +581,19 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstObject * parent,
GstSyncStream *stream; GstSyncStream *stream;
GList *l; GList *l;
GstClockTime new_group_start_time = 0; GstClockTime new_group_start_time = 0;
gboolean reset_time;
gst_event_parse_flush_stop (event, &reset_time);
GST_STREAM_SYNCHRONIZER_LOCK (self); GST_STREAM_SYNCHRONIZER_LOCK (self);
stream = gst_streamsync_pad_get_stream (pad); stream = gst_streamsync_pad_get_stream (pad);
GST_DEBUG_OBJECT (pad, "Resetting segment for stream %d",
stream->stream_number); if (reset_time) {
gst_segment_init (&stream->segment, GST_FORMAT_UNDEFINED); GST_DEBUG_OBJECT (pad, "Resetting segment for stream %d",
stream->stream_number);
gst_segment_init (&stream->segment, GST_FORMAT_UNDEFINED);
}
stream->is_eos = FALSE; stream->is_eos = FALSE;
stream->eos_sent = FALSE; stream->eos_sent = FALSE;
@ -594,32 +601,35 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstObject * parent,
stream->wait = FALSE; stream->wait = FALSE;
g_cond_broadcast (&stream->stream_finish_cond); g_cond_broadcast (&stream->stream_finish_cond);
for (l = self->streams; l; l = l->next) { if (reset_time) {
GstSyncStream *ostream = l->data; for (l = self->streams; l; l = l->next) {
GstClockTime start_running_time; GstSyncStream *ostream = l->data;
GstClockTime start_running_time;
if (ostream == stream || ostream->flushing) if (ostream == stream || ostream->flushing)
continue; continue;
if (ostream->segment.format == GST_FORMAT_TIME) { if (ostream->segment.format == GST_FORMAT_TIME) {
if (ostream->segment.rate > 0) if (ostream->segment.rate > 0)
start_running_time = start_running_time =
gst_segment_to_running_time (&ostream->segment, gst_segment_to_running_time (&ostream->segment,
GST_FORMAT_TIME, ostream->segment.start); GST_FORMAT_TIME, ostream->segment.start);
else else
start_running_time = start_running_time =
gst_segment_to_running_time (&ostream->segment, gst_segment_to_running_time (&ostream->segment,
GST_FORMAT_TIME, ostream->segment.stop); GST_FORMAT_TIME, ostream->segment.stop);
new_group_start_time = MAX (new_group_start_time, start_running_time); new_group_start_time =
MAX (new_group_start_time, start_running_time);
}
} }
}
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
"Updating group start time from %" GST_TIME_FORMAT " to %" "Updating group start time from %" GST_TIME_FORMAT " to %"
GST_TIME_FORMAT, GST_TIME_ARGS (self->group_start_time), GST_TIME_FORMAT, GST_TIME_ARGS (self->group_start_time),
GST_TIME_ARGS (new_group_start_time)); GST_TIME_ARGS (new_group_start_time));
self->group_start_time = new_group_start_time; self->group_start_time = new_group_start_time;
}
gst_syncstream_unref (stream); gst_syncstream_unref (stream);
GST_STREAM_SYNCHRONIZER_UNLOCK (self); GST_STREAM_SYNCHRONIZER_UNLOCK (self);