mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: Improve gap detection

Browse source 
We should also take into account whether data is currently pending when checking
for gap on streams. It could very well be that some streams have very low
bitrate (and spread out) data. For those we don't want to push out a gap event.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1179>
This commit is contained in:
Edward Hervey 2021-10-01 14:36:48 +02:00 committed by GStreamer Marge Bot
parent 0ff569d408
commit d9b1e1e99f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subprojects/gst-plugins-bad/gst/mpegtsdemux/tsdemux.c
View file

@ -2887,9 +2887,10 @@ gst_ts_demux_check_and_sync_streams (GstTSDemux * demux, GstClockTime time)
* This means we can detect buffers passing without PTSes fine and still generate * This means we can detect buffers passing without PTSes fine and still generate
* gaps. * gaps.
* *
* If there haven't been any buffers pushed on this stream since the last * If there haven't been any buffers pushed on this stream since the last gap
* gap check, push a gap event updating to the indicated input PCR time * check *AND* there is no pending data (stream->current_size), push a gap
* and update the pad's tracking. * event updating to the indicated input PCR time and update the pad's
* tracking.
* *
* If there have been buffers pushed, update the reference buffer count * If there have been buffers pushed, update the reference buffer count
* and but don't push a gap event * and but don't push a gap event
@ -2898,15 +2899,16 @@ gst_ts_demux_check_and_sync_streams (GstTSDemux * demux, GstClockTime time)
TSDemuxStream *ps = (TSDemuxStream *) tmp->data; TSDemuxStream *ps = (TSDemuxStream *) tmp->data;
GST_DEBUG_OBJECT (ps->pad, GST_DEBUG_OBJECT (ps->pad,
"0x%04x, PTS:%" GST_TIME_FORMAT " REFPTS:%" GST_TIME_FORMAT " Gap:%" "0x%04x, PTS:%" GST_TIME_FORMAT " REFPTS:%" GST_TIME_FORMAT " Gap:%"
GST_TIME_FORMAT " nb_buffers: %d (ref:%d)", GST_TIME_FORMAT " nb_buffers: %d (ref:%d) pending_data size %u",
((MpegTSBaseStream *) ps)->pid, GST_TIME_ARGS (ps->pts), ((MpegTSBaseStream *) ps)->pid, GST_TIME_ARGS (ps->pts),
GST_TIME_ARGS (ps->gap_ref_pts), GST_TIME_ARGS (ps->gap_ref_pts),
GST_TIME_ARGS (ps->pts - ps->gap_ref_pts), ps->nb_out_buffers, GST_TIME_ARGS (ps->pts - ps->gap_ref_pts), ps->nb_out_buffers,
ps->gap_ref_buffers); ps->gap_ref_buffers, ps->current_size);
if (ps->pad == NULL) if (ps->pad == NULL)
continue; continue;
if (ps->nb_out_buffers == ps->gap_ref_buffers && ps->gap_ref_pts != ps->pts) { if (ps->nb_out_buffers == ps->gap_ref_buffers && ps->current_size == 0
&& ps->gap_ref_pts != ps->pts) {
/* Do initial setup of pad if needed - segment etc */ /* Do initial setup of pad if needed - segment etc */
GST_DEBUG_OBJECT (ps->pad, GST_DEBUG_OBJECT (ps->pad,
"Stream needs update. Pushing GAP event to TS %" GST_TIME_FORMAT, "Stream needs update. Pushing GAP event to TS %" GST_TIME_FORMAT,