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

matroskademux: figure out if we have prev_size when starting up

Browse source 
This is useful to know in case someone initiates a seek or
direction change before we reach the second cluster.
This commit is contained in:
Tim-Philipp Müller 2018-08-15 01:10:32 +01:00
parent 43ce85f794
commit 694631520d
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4975,10 +4975,10 @@ gst_matroska_demux_parse_id (GstMatroskaDemux * demux, guint32 id,
goto no_tracks; goto no_tracks;
} }
} }
if (G_UNLIKELY (demux->common.state if (demux->common.state == GST_MATROSKA_READ_STATE_HEADER) {
== GST_MATROSKA_READ_STATE_HEADER)) {
demux->common.state = GST_MATROSKA_READ_STATE_DATA; demux->common.state = GST_MATROSKA_READ_STATE_DATA;
demux->first_cluster_offset = demux->common.offset; demux->first_cluster_offset = demux->common.offset;
if (!demux->streaming && if (!demux->streaming &&
!GST_CLOCK_TIME_IS_VALID (demux->common.segment.duration)) { !GST_CLOCK_TIME_IS_VALID (demux->common.segment.duration)) {
GstMatroskaIndex *last = NULL; GstMatroskaIndex *last = NULL;
@ -4999,6 +4999,22 @@ gst_matroska_demux_parse_id (GstMatroskaDemux * demux, guint32 id,
GST_TIME_ARGS (demux->common.segment.duration)); GST_TIME_ARGS (demux->common.segment.duration));
} }
} }
/* Peek at second cluster in order to figure out if we have cluster
* prev_size or not (which is never set on the first cluster for
* obvious reasons). This is useful in case someone initiates a
* seek or direction change before we reach the second cluster. */
if (!demux->streaming) {
ClusterInfo cluster = { 0, };
if (gst_matroska_demux_peek_cluster_info (demux, &cluster,
demux->first_cluster_offset) && cluster.size > 0) {
gst_matroska_demux_peek_cluster_info (demux, &cluster,
demux->first_cluster_offset + cluster.size);
}
demux->common.offset = demux->first_cluster_offset;
}
GST_DEBUG_OBJECT (demux, "signaling no more pads"); GST_DEBUG_OBJECT (demux, "signaling no more pads");
gst_element_no_more_pads (GST_ELEMENT (demux)); gst_element_no_more_pads (GST_ELEMENT (demux));
/* send initial segment - we wait till we know the first /* send initial segment - we wait till we know the first