FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mxfdemux: Make sure that the srcpad and essence track arrays always exist

Browse Source
This commit is contained in:
Sebastian Dröge 2009-02-09 17:25:35 +01:00
parent ae4b0fcb7c
commit 32dc77f853
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gst/mxf/mxfdemux.c
View File

@ -151,6 +151,8 @@ gst_mxf_demux_partition_free (GstMXFDemuxPartition * partition)
static void static void
gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux) gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
{ {
guint i;
GST_DEBUG_OBJECT (demux, "Resetting MXF state"); GST_DEBUG_OBJECT (demux, "Resetting MXF state");
g_list_foreach (demux->partitions, (GFunc) gst_mxf_demux_partition_free, g_list_foreach (demux->partitions, (GFunc) gst_mxf_demux_partition_free,
@ -160,9 +162,6 @@ gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
demux->current_partition = NULL; demux->current_partition = NULL;
if (demux->essence_tracks) {
guint i;
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *t = GstMXFDemuxEssenceTrack *t =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i); &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
@ -178,9 +177,7 @@ gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
if (t->caps) if (t->caps)
gst_caps_unref (t->caps); gst_caps_unref (t->caps);
} }
g_array_free (demux->essence_tracks, TRUE); g_array_set_size (demux->essence_tracks, 0);
demux->essence_tracks = NULL;
}
} }
static void static void
@ -254,7 +251,6 @@ gst_mxf_demux_reset (GstMXFDemux * demux)
demux->close_seg_event = NULL; demux->close_seg_event = NULL;
} }
if (demux->adapter)
gst_adapter_clear (demux->adapter); gst_adapter_clear (demux->adapter);
gst_mxf_demux_remove_pads (demux); gst_mxf_demux_remove_pads (demux);
@ -3790,6 +3786,8 @@ gst_mxf_demux_finalize (GObject * object)
g_ptr_array_free (demux->src, TRUE); g_ptr_array_free (demux->src, TRUE);
demux->src = NULL; demux->src = NULL;
g_array_free (demux->essence_tracks, TRUE);
demux->essence_tracks = NULL;
g_hash_table_destroy (demux->metadata); g_hash_table_destroy (demux->metadata);
@ -3867,8 +3865,12 @@ gst_mxf_demux_init (GstMXFDemux * demux, GstMXFDemuxClass * g_class)
demux->max_drift = 500 * GST_MSECOND; demux->max_drift = 500 * GST_MSECOND;
demux->adapter = gst_adapter_new (); demux->adapter = gst_adapter_new ();
demux->src = g_ptr_array_new ();
demux->metadata_lock = g_mutex_new (); demux->metadata_lock = g_mutex_new ();
demux->src = g_ptr_array_new ();
demux->essence_tracks =
g_array_new (FALSE, FALSE, sizeof (GstMXFDemuxEssenceTrack));
gst_segment_init (&demux->segment, GST_FORMAT_TIME); gst_segment_init (&demux->segment, GST_FORMAT_TIME);
gst_mxf_demux_reset (demux); gst_mxf_demux_reset (demux);