mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: flush samples before adding more from moof

Browse source 
Avoids accumulating all samples from a fragmented stream that could
lead to a 'index-too-big' error once it goes over 50MB of data. It
could reach that before 2h of playback so it doesn't take that long.

As upstream elements are providing data in time format they should
be the ones that have more information about the full media index
and should be able to seek if possible.
This commit is contained in:
Thiago Santos 2015-07-07 23:53:02 -03:00
parent 6ee4b31c0e
commit ee7ddf6c67
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/isomp4/qtdemux.c
View file

@ -2165,14 +2165,22 @@ gst_qtdemux_stbl_free (QtDemuxStream * stream)
stream->ctts.data = NULL; stream->ctts.data = NULL;
} }
static void
gst_qtdemux_stream_flush_segments_data (GstQTDemux * qtdemux,
QtDemuxStream * stream)
{
g_free (stream->segments);
stream->segments = NULL;
stream->segment_index = -1;
stream->accumulated_base = 0;
}
static void static void
gst_qtdemux_stream_flush_samples_data (GstQTDemux * qtdemux, gst_qtdemux_stream_flush_samples_data (GstQTDemux * qtdemux,
QtDemuxStream * stream) QtDemuxStream * stream)
{ {
g_free (stream->samples); g_free (stream->samples);
stream->samples = NULL; stream->samples = NULL;
g_free (stream->segments);
stream->segments = NULL;
gst_qtdemux_stbl_free (stream); gst_qtdemux_stbl_free (stream);
/* fragments */ /* fragments */
@ -2184,8 +2192,6 @@ gst_qtdemux_stream_flush_samples_data (GstQTDemux * qtdemux,
stream->stbl_index = -1; stream->stbl_index = -1;
stream->n_samples = 0; stream->n_samples = 0;
stream->time_position = 0; stream->time_position = 0;
stream->segment_index = -1;
stream->accumulated_base = 0;
} }
static void static void
@ -2210,6 +2216,7 @@ gst_qtdemux_stream_clear (GstQTDemux * qtdemux, QtDemuxStream * stream)
stream->sent_eos = FALSE; stream->sent_eos = FALSE;
stream->sparse = FALSE; stream->sparse = FALSE;
gst_qtdemux_stream_flush_segments_data (qtdemux, stream);
gst_qtdemux_stream_flush_samples_data (qtdemux, stream); gst_qtdemux_stream_flush_samples_data (qtdemux, stream);
} }
@ -2694,7 +2701,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
timestamp = GSTTIME_TO_QTSTREAMTIME (stream, qtdemux->fragment_start); timestamp = GSTTIME_TO_QTSTREAMTIME (stream, qtdemux->fragment_start);
qtdemux->fragment_start = -1; qtdemux->fragment_start = -1;
} else { } else {
if (G_UNLIKELY (stream->n_samples == 0)) { if (stream->n_samples == 0) {
if (decode_ts > 0) { if (decode_ts > 0) {
timestamp = decode_ts; timestamp = decode_ts;
} else if (stream->pending_seek != NULL) { } else if (stream->pending_seek != NULL) {
@ -3016,6 +3023,10 @@ qtdemux_parse_moof (GstQTDemux * qtdemux, const guint8 * buffer, guint length,
} }
if (G_UNLIKELY (base_offset < -1)) if (G_UNLIKELY (base_offset < -1))
goto lost_offset; goto lost_offset;
if (qtdemux->upstream_format_is_time)
gst_qtdemux_stream_flush_samples_data (qtdemux, stream);
/* Track Run node */ /* Track Run node */
trun_node = trun_node =
qtdemux_tree_get_child_by_type_full (traf_node, FOURCC_trun, qtdemux_tree_get_child_by_type_full (traf_node, FOURCC_trun,
@ -7821,6 +7832,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
} }
/* flush samples data from this track from previous moov */ /* flush samples data from this track from previous moov */
gst_qtdemux_stream_flush_segments_data (qtdemux, stream);
gst_qtdemux_stream_flush_samples_data (qtdemux, stream); gst_qtdemux_stream_flush_samples_data (qtdemux, stream);
} }