mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 14:36:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: Cleanup latency query handling

Browse source 
The minimum latency is always 0 or more. And we should
requery upstream as it may have changed.
This commit is contained in:
Olivier Crête 2015-04-17 13:55:26 -06:00
parent 774866ad62
commit a1f709c293
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/mpegtsdemux/tsdemux.c
View file

@ -66,6 +66,9 @@
#define GST_FLOW_REWINDING GST_FLOW_CUSTOM_ERROR #define GST_FLOW_REWINDING GST_FLOW_CUSTOM_ERROR
/* latency in nsecs */
#define TS_LATENCY (700 * GST_MSECOND)
GST_DEBUG_CATEGORY_STATIC (ts_demux_debug); GST_DEBUG_CATEGORY_STATIC (ts_demux_debug);
#define GST_CAT_DEFAULT ts_demux_debug #define GST_CAT_DEFAULT ts_demux_debug
@ -507,7 +510,7 @@ gst_ts_demux_srcpad_query (GstPad * pad, GstObject * parent, GstQuery * query)
{ {
GST_DEBUG ("query latency"); GST_DEBUG ("query latency");
res = gst_pad_peer_query (base->sinkpad, query); res = gst_pad_peer_query (base->sinkpad, query);
if (res && base->upstream_live) { if (res) {
GstClockTime min_lat, max_lat; GstClockTime min_lat, max_lat;
gboolean live; gboolean live;
@ -519,10 +522,10 @@ gst_ts_demux_srcpad_query (GstPad * pad, GstObject * parent, GstQuery * query)
PTS/DTS. We therefore allow a latency of 700ms for that. PTS/DTS. We therefore allow a latency of 700ms for that.
*/ */
gst_query_parse_latency (query, &live, &min_lat, &max_lat); gst_query_parse_latency (query, &live, &min_lat, &max_lat);
if (min_lat != -1) if (min_lat)
min_lat += 700 * GST_MSECOND; min_lat += TS_LATENCY;
if (max_lat != -1) if (GST_CLOCK_TIME_IS_VALID (max_lat))
max_lat += 700 * GST_MSECOND; max_lat += TS_LATENCY;
gst_query_set_latency (query, live, min_lat, max_lat); gst_query_set_latency (query, live, min_lat, max_lat);
} }
break; break;