mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 21:28:45 +00:00
matroska-demux: send GAP events for lagging audio and video streams too
Send GAP events for non-subtitle streams too if they lag too much behind, but use a higher threshold than for subtitles. This helps with fixing prerolling with a file where one of the audio streams only has data starting from 19s onwards. It's not a complete fix yet, it also requires changes elsewhere, such as in baseparse, to make sure caps are propagated. https://bugzilla.gnome.org/show_bug.cgi?id=614460 https://bugzilla.gnome.org/show_bug.cgi?id=753899
This commit is contained in:
parent
5faa9c11a6
commit
77403d0afe
1 changed files with 10 additions and 8 deletions
|
@ -2584,6 +2584,7 @@ gst_matroska_ebmlnum_sint (guint8 * data, guint size, gint64 * num)
|
||||||
static void
|
static void
|
||||||
gst_matroska_demux_sync_streams (GstMatroskaDemux * demux)
|
gst_matroska_demux_sync_streams (GstMatroskaDemux * demux)
|
||||||
{
|
{
|
||||||
|
GstClockTime gap_threshold;
|
||||||
gint stream_nr;
|
gint stream_nr;
|
||||||
|
|
||||||
GST_OBJECT_LOCK (demux);
|
GST_OBJECT_LOCK (demux);
|
||||||
|
@ -2601,21 +2602,22 @@ gst_matroska_demux_sync_streams (GstMatroskaDemux * demux)
|
||||||
"Checking for resync on stream %d (%" GST_TIME_FORMAT ")", stream_nr,
|
"Checking for resync on stream %d (%" GST_TIME_FORMAT ")", stream_nr,
|
||||||
GST_TIME_ARGS (context->pos));
|
GST_TIME_ARGS (context->pos));
|
||||||
|
|
||||||
if (G_LIKELY (context->type != GST_MATROSKA_TRACK_TYPE_SUBTITLE)) {
|
/* Only send gap events on non-subtitle streams if lagging way behind.
|
||||||
GST_LOG_OBJECT (demux, "Skipping sync on non-subtitle stream");
|
* The 0.5 second threshold for subtitle streams is also quite random. */
|
||||||
continue;
|
if (context->type == GST_MATROSKA_TRACK_TYPE_SUBTITLE)
|
||||||
}
|
gap_threshold = GST_SECOND / 2;
|
||||||
|
else
|
||||||
|
gap_threshold = 3 * GST_SECOND;
|
||||||
|
|
||||||
/* does it lag? 0.5 seconds is a random threshold...
|
/* Lag need only be considered if we have advanced into requested segment */
|
||||||
* lag need only be considered if we have advanced into requested segment */
|
|
||||||
if (GST_CLOCK_TIME_IS_VALID (context->pos) &&
|
if (GST_CLOCK_TIME_IS_VALID (context->pos) &&
|
||||||
GST_CLOCK_TIME_IS_VALID (demux->common.segment.position) &&
|
GST_CLOCK_TIME_IS_VALID (demux->common.segment.position) &&
|
||||||
demux->common.segment.position > demux->common.segment.start &&
|
demux->common.segment.position > demux->common.segment.start &&
|
||||||
context->pos + (GST_SECOND / 2) < demux->common.segment.position) {
|
context->pos + gap_threshold < demux->common.segment.position) {
|
||||||
|
|
||||||
GstEvent *event;
|
GstEvent *event;
|
||||||
guint64 start = context->pos;
|
guint64 start = context->pos;
|
||||||
guint64 stop = demux->common.segment.position - (GST_SECOND / 2);
|
guint64 stop = demux->common.segment.position - gap_threshold;
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (demux,
|
GST_DEBUG_OBJECT (demux,
|
||||||
"Synchronizing stream %d with other by advancing time from %"
|
"Synchronizing stream %d with other by advancing time from %"
|
||||||
|
|
Loading…
Reference in a new issue