mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskademux: no need to search for keyframes for intra-only streams

Browse source 
If the video streams are all I-frame only then we don't need to look
for a cluster with a keyframe, we can just assume there will be one.

https://bugzilla.gnome.org/show_bug.cgi?id=790696
This commit is contained in:
Tim-Philipp Müller 2018-08-15 11:25:21 +01:00
parent 694631520d
commit ffb4533137
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/matroska/matroska-demux.c
View file

@ -285,6 +285,7 @@ gst_matroska_demux_reset (GstElement * element)
demux->num_a_streams = 0; demux->num_a_streams = 0;
demux->num_t_streams = 0; demux->num_t_streams = 0;
demux->num_v_streams = 0; demux->num_v_streams = 0;
demux->have_nonintraonly_v_streams = FALSE;
demux->have_group_id = FALSE; demux->have_group_id = FALSE;
demux->group_id = G_MAXUINT; demux->group_id = G_MAXUINT;
@ -1377,6 +1378,9 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux, GstEbmlRead * ebml)
context->codec_id, context->codec_priv, context->codec_id, context->codec_priv,
context->codec_priv_size, &codec, &riff_fourcc); context->codec_priv_size, &codec, &riff_fourcc);
if (!context->intra_only)
demux->have_nonintraonly_v_streams = TRUE;
if (codec) { if (codec) {
gst_tag_list_add (context->tags, GST_TAG_MERGE_REPLACE, gst_tag_list_add (context->tags, GST_TAG_MERGE_REPLACE,
GST_TAG_VIDEO_CODEC, codec, NULL); GST_TAG_VIDEO_CODEC, codec, NULL);
@ -2474,15 +2478,13 @@ retry:
/* If we have video and can easily backtrack, check if we landed on a cluster /* If we have video and can easily backtrack, check if we landed on a cluster
* that starts with a keyframe - and if not backtrack until we find one that * that starts with a keyframe - and if not backtrack until we find one that
* does. */ * does. */
/* FIXME: skip if all video streams are I-frame only streams (should probably if (demux->have_nonintraonly_v_streams && demux->seen_cluster_prevsize) {
* set the default value in peek_cluster_info() accordingly then) */
if (demux->num_v_streams > 0 && demux->seen_cluster_prevsize) {
if (gst_matroska_demux_scan_back_for_keyframe_cluster (demux, if (gst_matroska_demux_scan_back_for_keyframe_cluster (demux,
&cluster_offset, &cluster_time)) { &cluster_offset, &cluster_time)) {
GST_INFO_OBJECT (demux, "Adjusted cluster to %" GST_TIME_FORMAT " @ " GST_INFO_OBJECT (demux, "Adjusted cluster to %" GST_TIME_FORMAT " @ "
"%" G_GUINT64_FORMAT, GST_TIME_ARGS (cluster_time), cluster_offset); "%" G_GUINT64_FORMAT, GST_TIME_ARGS (cluster_time), cluster_offset);
} }
} else if (demux->num_v_streams > 0) { } else if (demux->have_nonintraonly_v_streams) {
GST_FIXME_OBJECT (demux, "implement scanning back to prev cluster without " GST_FIXME_OBJECT (demux, "implement scanning back to prev cluster without "
"cluster prev size field"); "cluster prev size field");
} }

1
gst/matroska/matroska-demux.h
View file

@ -52,6 +52,7 @@ typedef struct _GstMatroskaDemux {
/* pads */ /* pads */
GstClock *clock; GstClock *clock;
gboolean have_nonintraonly_v_streams;
guint num_v_streams; guint num_v_streams;
guint num_a_streams; guint num_a_streams;
guint num_t_streams; guint num_t_streams;