summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2015-08-23 23:38:21 +0100
committerTim-Philipp Müller <tim@centricular.com>2015-08-24 10:46:31 +0100
commit54fc1ed5f4c5ee682799dcb4b7953a7607d87964 (patch)
tree733d17921e57bb78fe016244d79c31c2c2491301 /gst
parent88d7b22d40e25e4e6efc33aa4838f67fe72cad2e (diff)
downloadgstreamer-plugins-bad-54fc1ed5f4c5ee682799dcb4b7953a7607d87964.tar.gz
tsdemux: fix latency handling again
The tsdemux latency should always be added to the minimum latency (which is always a valid clock time value). The "cleanup" in commit a1f709c2 made it so that it would not be added if upstream reported 0 as minimum latency (as e.g. udpsrc would). This broke playback of live mpeg-ts streaming in some cases, leading to playback stutter due to a too-small configured latency for the pipeline. https://bugzilla.gnome.org/show_bug.cgi?id=751508
Diffstat (limited to 'gst')
-rw-r--r--gst/mpegtsdemux/tsdemux.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 217d5ad35..8971bc828 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -523,8 +523,7 @@ gst_ts_demux_srcpad_query (GstPad * pad, GstObject * parent, GstQuery * query)
PTS/DTS. We therefore allow a latency of 700ms for that.
*/
gst_query_parse_latency (query, &live, &min_lat, &max_lat);
- if (min_lat)
- min_lat += TS_LATENCY;
+ min_lat += TS_LATENCY;
if (GST_CLOCK_TIME_IS_VALID (max_lat))
max_lat += TS_LATENCY;
gst_query_set_latency (query, live, min_lat, max_lat);