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

multiqueue: Fix interleave calculation for data before segment start

Browse source 
This commit modifies the interleave calculation to allow growing when incoming
data is before the segment start.

The rationale is that there is no requirement whatsoever for data before the
segment start to be "coherent" on all streams.

For example, a demuxer could rightfully send data from the video stream from the
previous keyframe (potentially quite a bit before the segment start) and the
audio from just before the segment start.

This will activate the same logic as growing the interleave when some streams
haven't received buffers yet.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1892>
This commit is contained in:
Edward Hervey 2022-03-02 17:07:37 +01:00 committed by GStreamer Marge Bot
parent b141324eae
commit 2943d92389
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
subprojects/gstreamer/plugins/elements/gstmultiqueue.c
View file

@ -1602,6 +1602,17 @@ calculate_interleave (GstMultiQueue * mq, GstSingleQueue * sq)
low = oq->cached_sinktime; low = oq->cached_sinktime;
if (high == GST_CLOCK_STIME_NONE || oq->cached_sinktime > high) if (high == GST_CLOCK_STIME_NONE || oq->cached_sinktime > high)
high = oq->cached_sinktime; high = oq->cached_sinktime;
/* If the input is before the segment start, consider as inactive to allow
* the interleave to grow until *all* streams have data within the segment.
*
* The reason for this is that there is no requirements for data before
* the segment start to be "aligned" and therefore interleave calculation
* can't reliably be done. For example a demuxer could provide video data
* from the previous keyframe but audio only from just before the segment
* start */
if (oq->cached_sinktime < 0)
some_inactive = TRUE;
} }
GST_LOG_OBJECT (mq, GST_LOG_OBJECT (mq,
"queue %d , sinktime:%" GST_STIME_FORMAT " low:%" GST_STIME_FORMAT "queue %d , sinktime:%" GST_STIME_FORMAT " low:%" GST_STIME_FORMAT