mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Refactor stbl sub-atom freeing. Free when index has been

Browse source 
completely parsed.
This commit is contained in:
Robert Swain 2010-01-08 13:55:05 +01:00
parent 3daf1871c1
commit a340359127
1 changed files with 26 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
gst/qtdemux/qtdemux.c
View file

@ -1578,6 +1578,25 @@ gst_qtdemux_get_index (GstElement * element)
return result; return result;
} }
static void
gst_qtdemux_stbl_free (QtDemuxStream * stream)
{
if (stream->stco.data)
g_free ((gpointer) stream->stco.data);
if (stream->stsz.data)
g_free ((gpointer) stream->stsz.data);
if (stream->stsc.data)
g_free ((gpointer) stream->stsc.data);
if (stream->stts.data)
g_free ((gpointer) stream->stts.data);
if (stream->stss.data)
g_free ((gpointer) stream->stss.data);
if (stream->stps.data)
g_free ((gpointer) stream->stps.data);
if (stream->ctts.data)
g_free ((gpointer) stream->ctts.data);
}
static GstStateChangeReturn static GstStateChangeReturn
gst_qtdemux_change_state (GstElement * element, GstStateChange transition) gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
{ {
@ -1635,20 +1654,8 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
g_free (stream->segments); g_free (stream->segments);
if (stream->pending_tags) if (stream->pending_tags)
gst_tag_list_free (stream->pending_tags); gst_tag_list_free (stream->pending_tags);
if (stream->stco.data) /* free stbl sub-atoms */
g_free ((gpointer) stream->stco.data); gst_qtdemux_stbl_free (stream);
if (stream->stsz.data)
g_free ((gpointer) stream->stsz.data);
if (stream->stsc.data)
g_free ((gpointer) stream->stsc.data);
if (stream->stts.data)
g_free ((gpointer) stream->stts.data);
if (stream->stss.data)
g_free ((gpointer) stream->stss.data);
if (stream->stps.data)
g_free ((gpointer) stream->stps.data);
if (stream->ctts.data)
g_free ((gpointer) stream->ctts.data);
g_free (stream); g_free (stream);
} }
qtdemux->major_brand = 0; qtdemux->major_brand = 0;
@ -4567,6 +4574,9 @@ ctts:
} }
done: done:
stream->stbl_index = n; stream->stbl_index = n;
/* if index has been completely parsed, free data that is no-longer needed */
if (n == stream->n_samples)
gst_qtdemux_stbl_free (stream);
GST_OBJECT_UNLOCK (qtdemux); GST_OBJECT_UNLOCK (qtdemux);
return TRUE; return TRUE;
@ -5745,42 +5755,11 @@ error_encrypted:
return FALSE; return FALSE;
} }
samples_failed: samples_failed:
{
/* we posted an error already */
if (stream->stco.data)
g_free ((gpointer) stream->stco.data);
if (stream->stsz.data)
g_free ((gpointer) stream->stsz.data);
if (stream->stsc.data)
g_free ((gpointer) stream->stsc.data);
if (stream->stts.data)
g_free ((gpointer) stream->stts.data);
if (stream->stss.data)
g_free ((gpointer) stream->stss.data);
if (stream->stps.data)
g_free ((gpointer) stream->stps.data);
if (stream->ctts.data)
g_free ((gpointer) stream->ctts.data);
g_free (stream);
return FALSE;
}
segments_failed: segments_failed:
{ {
/* we posted an error already */ /* we posted an error already */
if (stream->stco.data) /* free stbl sub-atoms */
g_free ((gpointer) stream->stco.data); gst_qtdemux_stbl_free (stream);
if (stream->stsz.data)
g_free ((gpointer) stream->stsz.data);
if (stream->stsc.data)
g_free ((gpointer) stream->stsc.data);
if (stream->stts.data)
g_free ((gpointer) stream->stts.data);
if (stream->stss.data)
g_free ((gpointer) stream->stss.data);
if (stream->stps.data)
g_free ((gpointer) stream->stps.data);
if (stream->ctts.data)
g_free ((gpointer) stream->ctts.data);
g_free (stream); g_free (stream);
return FALSE; return FALSE;
} }