diff options
author | Edward Hervey | 2012-09-11 09:27:24 -0500 |
---|---|---|
committer | Nikhil Devshatwar | 2013-05-15 05:35:45 -0500 |
commit | 6898b5c7aa5aecb33e1313a57c546fce19901cba (patch) | |
tree | 9d710022db774cab78ece4916e5aab8bea5e745f | |
parent | a0bbe5ea8298d38d58da66904d3700b1cac34403 (diff) | |
download | gst-plugins-base0-10-6898b5c7aa5aecb33e1313a57c546fce19901cba.tar.gz gst-plugins-base0-10-6898b5c7aa5aecb33e1313a57c546fce19901cba.tar.xz gst-plugins-base0-10-6898b5c7aa5aecb33e1313a57c546fce19901cba.zip |
streamsynchronizer: Don't wait on non-time streams
streams with non-TIME segments will not have timestamps ...
... and therefore will never unblock the other streams.
Fixes blocking issue when using playbin suburi feature
-rw-r--r-- | gst/playback/gststreamsynchronizer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gst/playback/gststreamsynchronizer.c b/gst/playback/gststreamsynchronizer.c index f22ab4bca..64dbdf8d0 100644 --- a/gst/playback/gststreamsynchronizer.c +++ b/gst/playback/gststreamsynchronizer.c | |||
@@ -455,6 +455,9 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstEvent * event) | |||
455 | GST_WARNING_OBJECT (pad, "Non-TIME segment: %s", | 455 | GST_WARNING_OBJECT (pad, "Non-TIME segment: %s", |
456 | gst_format_get_name (format)); | 456 | gst_format_get_name (format)); |
457 | gst_segment_init (&stream->segment, GST_FORMAT_UNDEFINED); | 457 | gst_segment_init (&stream->segment, GST_FORMAT_UNDEFINED); |
458 | /* Since this stream is not time-based, we mark it so that | ||
459 | * other streams don't wait forever on it */ | ||
460 | stream->wait = TRUE; | ||
458 | } | 461 | } |
459 | GST_STREAM_SYNCHRONIZER_UNLOCK (self); | 462 | GST_STREAM_SYNCHRONIZER_UNLOCK (self); |
460 | break; | 463 | break; |