videomixer: Don't reset the output segment on flush stop

Only init it when getting from READY to PAUSED, and change it on seek events.

https://bugzilla.gnome.org/show_bug.cgi?id=699793
This commit is contained in:
Mathieu Duponchelle 2013-05-20 19:51:07 +02:00 committed by Sebastian Dröge
parent 00ffe41e6a
commit 521c9a7b5d

View file

@ -1733,7 +1733,6 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata,
pad->mixcol->start_time = -1; pad->mixcol->start_time = -1;
pad->mixcol->end_time = -1; pad->mixcol->end_time = -1;
gst_segment_init (&mix->segment, GST_FORMAT_TIME);
mix->segment.position = -1; mix->segment.position = -1;
mix->ts_offset = 0; mix->ts_offset = 0;
mix->nframes = 0; mix->nframes = 0;
@ -1796,6 +1795,7 @@ gst_videomixer2_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
mix->send_stream_start = TRUE; mix->send_stream_start = TRUE;
mix->send_caps = TRUE; mix->send_caps = TRUE;
gst_segment_init (&mix->segment, GST_FORMAT_TIME);
gst_caps_replace (&mix->current_caps, NULL); gst_caps_replace (&mix->current_caps, NULL);
GST_LOG_OBJECT (mix, "starting collectpads"); GST_LOG_OBJECT (mix, "starting collectpads");
gst_collect_pads_start (mix->collect); gst_collect_pads_start (mix->collect);