mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

streamsynchronizer: Re-enable stream update

Browse source 
Not 100% perfect yet, but allows people to test
This commit is contained in:
Edward Hervey 2012-07-19 16:12:22 +02:00
parent ed8504e590
commit f72f4c09c9
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gst/playback/gststreamsynchronizer.c
View file

@ -53,7 +53,7 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_REQUEST, GST_PAD_REQUEST,
GST_STATIC_CAPS_ANY); GST_STATIC_CAPS_ANY);
static const gboolean passthrough = TRUE; static const gboolean passthrough = FALSE;
#define gst_stream_synchronizer_parent_class parent_class #define gst_stream_synchronizer_parent_class parent_class
G_DEFINE_TYPE (GstStreamSynchronizer, gst_stream_synchronizer, G_DEFINE_TYPE (GstStreamSynchronizer, gst_stream_synchronizer,
@ -288,14 +288,17 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstObject * parent,
ostream->wait = FALSE; ostream->wait = FALSE;
stop_running_time = if (ostream->segment.format == GST_FORMAT_TIME) {
gst_segment_to_running_time (&ostream->segment, stop_running_time =
GST_FORMAT_TIME, ostream->segment.stop); gst_segment_to_running_time (&ostream->segment,
position_running_time = GST_FORMAT_TIME, ostream->segment.stop);
gst_segment_to_running_time (&ostream->segment, position_running_time =
GST_FORMAT_TIME, ostream->segment.position); gst_segment_to_running_time (&ostream->segment,
position = GST_FORMAT_TIME, ostream->segment.position);
MAX (position, MAX (stop_running_time, position_running_time)); position =
MAX (position, MAX (stop_running_time,
position_running_time));
}
} }
position = MAX (0, position); position = MAX (0, position);
self->group_start_time = MAX (self->group_start_time, position); self->group_start_time = MAX (self->group_start_time, position);
@ -369,15 +372,8 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstObject * parent,
stream->new_stream = FALSE; stream->new_stream = FALSE;
stream->drop_discont = TRUE; stream->drop_discont = TRUE;
if (stop_running_time < self->group_start_time) {
gint64 diff = self->group_start_time - stop_running_time;
GST_DEBUG_OBJECT (pad, segment.base = stop_running_time;
"Advancing running time for other streams by: %"
GST_TIME_FORMAT, GST_TIME_ARGS (diff));
segment.base += diff;
}
} }
GST_DEBUG_OBJECT (pad, "Segment was: %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (pad, "Segment was: %" GST_SEGMENT_FORMAT,
@ -389,6 +385,14 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstObject * parent,
GST_DEBUG_OBJECT (pad, "Stream start running time: %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (pad, "Stream start running time: %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->segment.base)); GST_TIME_ARGS (stream->segment.base));
stream->running_time_diff = stream->segment.base; stream->running_time_diff = stream->segment.base;
{
GstEvent *tmpev;
tmpev = gst_event_new_segment (&stream->segment);
gst_event_unref (event);
event = tmpev;
}
} else if (stream) { } else if (stream) {
GST_WARNING_OBJECT (pad, "Non-TIME segment: %s", GST_WARNING_OBJECT (pad, "Non-TIME segment: %s",
gst_format_get_name (segment.format)); gst_format_get_name (segment.format));