mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-21 06:38:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

mxfdemux: Store GstMXFDemuxEssenceTrack in their own fixed allocation

Browse source 
Previously they were stored inline inside a GArray, but as references to
the tracks were stored in various other places although the array could
still be updated (and reallocated!), this could lead to dangling
references in various places.

Instead now store them in a GPtrArray in their own allocation so each
track's memory position stays fixed.

Fixes ZDI-CAN-22299

Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3055

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5635>
This commit is contained in:
Sebastian Dröge 2023-10-20 00:09:57 +03:00 committed by Tim-Philipp Müller
parent 1db83d3f74
commit 274551d450
2 changed files with 50 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
View file

@ -169,11 +169,26 @@ gst_mxf_demux_partition_free (GstMXFDemuxPartition * partition)
g_free (partition); g_free (partition);
} }
static void
gst_mxf_demux_essence_track_free (GstMXFDemuxEssenceTrack * t)
{
if (t->offsets)
g_array_free (t->offsets, TRUE);
g_free (t->mapping_data);
if (t->tags)
gst_tag_list_unref (t->tags);
if (t->caps)
gst_caps_unref (t->caps);
g_free (t);
}
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,
@ -182,23 +197,7 @@ gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
demux->partitions = NULL; demux->partitions = NULL;
demux->current_partition = NULL; demux->current_partition = NULL;
g_ptr_array_set_size (demux->essence_tracks, 0);
for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *t =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
if (t->offsets)
g_array_free (t->offsets, TRUE);
g_free (t->mapping_data);
if (t->tags)
gst_tag_list_unref (t->tags);
if (t->caps)
gst_caps_unref (t->caps);
}
g_array_set_size (demux->essence_tracks, 0);
} }
static void static void
@ -216,7 +215,7 @@ gst_mxf_demux_reset_linked_metadata (GstMXFDemux * demux)
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *track = GstMXFDemuxEssenceTrack *track =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i); g_ptr_array_index (demux->essence_tracks, i);
track->source_package = NULL; track->source_package = NULL;
track->delta_id = -1; track->delta_id = -1;
@ -419,7 +418,7 @@ gst_mxf_demux_partition_postcheck (GstMXFDemux * demux,
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *cand = GstMXFDemuxEssenceTrack *cand =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i); g_ptr_array_index (demux->essence_tracks, i);
if (cand->body_sid != partition->partition.body_sid) if (cand->body_sid != partition->partition.body_sid)
continue; continue;
@ -861,8 +860,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
for (k = 0; k < demux->essence_tracks->len; k++) { for (k = 0; k < demux->essence_tracks->len; k++) {
GstMXFDemuxEssenceTrack *tmp = GstMXFDemuxEssenceTrack *tmp =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, g_ptr_array_index (demux->essence_tracks, k);
k);
if (tmp->track_number == track->parent.track_number && if (tmp->track_number == track->parent.track_number &&
tmp->body_sid == edata->body_sid) { tmp->body_sid == edata->body_sid) {
@ -880,24 +878,23 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
} }
if (!etrack) { if (!etrack) {
GstMXFDemuxEssenceTrack tmp; GstMXFDemuxEssenceTrack *tmp = g_new0 (GstMXFDemuxEssenceTrack, 1);
memset (&tmp, 0, sizeof (tmp)); tmp->body_sid = edata->body_sid;
tmp.body_sid = edata->body_sid; tmp->index_sid = edata->index_sid;
tmp.index_sid = edata->index_sid; tmp->track_number = track->parent.track_number;
tmp.track_number = track->parent.track_number; tmp->track_id = track->parent.track_id;
tmp.track_id = track->parent.track_id; memcpy (&tmp->source_package_uid, &package->parent.package_uid, 32);
memcpy (&tmp.source_package_uid, &package->parent.package_uid, 32);
if (demux->current_partition->partition.body_sid == edata->body_sid && if (demux->current_partition->partition.body_sid == edata->body_sid &&
demux->current_partition->partition.body_offset == 0) demux->current_partition->partition.body_offset == 0)
tmp.position = 0; tmp->position = 0;
else else
tmp.position = -1; tmp->position = -1;
g_array_append_val (demux->essence_tracks, tmp); g_ptr_array_add (demux->essence_tracks, tmp);
etrack = etrack =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, g_ptr_array_index (demux->essence_tracks,
demux->essence_tracks->len - 1); demux->essence_tracks->len - 1);
new = TRUE; new = TRUE;
} }
@ -1045,13 +1042,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
next: next:
if (new) { if (new) {
g_free (etrack->mapping_data); g_ptr_array_remove_index (demux->essence_tracks,
if (etrack->tags)
gst_tag_list_unref (etrack->tags);
if (etrack->caps)
gst_caps_unref (etrack->caps);
g_array_remove_index (demux->essence_tracks,
demux->essence_tracks->len - 1); demux->essence_tracks->len - 1);
} }
} }
@ -1064,7 +1055,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *etrack = GstMXFDemuxEssenceTrack *etrack =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i); g_ptr_array_index (demux->essence_tracks, i);
if (!etrack->source_package || !etrack->source_track || !etrack->caps) { if (!etrack->source_package || !etrack->source_track || !etrack->caps) {
GST_ERROR_OBJECT (demux, "Failed to update essence track %u", i); GST_ERROR_OBJECT (demux, "Failed to update essence track %u", i);
@ -1450,7 +1441,7 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
for (k = 0; k < demux->essence_tracks->len; k++) { for (k = 0; k < demux->essence_tracks->len; k++) {
GstMXFDemuxEssenceTrack *tmp = GstMXFDemuxEssenceTrack *tmp =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, k); g_ptr_array_index (demux->essence_tracks, k);
if (tmp->source_package == source_package && if (tmp->source_package == source_package &&
tmp->source_track == source_track) { tmp->source_track == source_track) {
@ -1939,8 +1930,7 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
pad->current_essence_track = NULL; pad->current_essence_track = NULL;
for (k = 0; k < demux->essence_tracks->len; k++) { for (k = 0; k < demux->essence_tracks->len; k++) {
GstMXFDemuxEssenceTrack *tmp = GstMXFDemuxEssenceTrack *tmp = g_ptr_array_index (demux->essence_tracks, k);
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, k);
if (tmp->source_package == source_package && if (tmp->source_package == source_package &&
tmp->source_track == source_track) { tmp->source_track == source_track) {
@ -2724,7 +2714,7 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux,
if (!etrack) { if (!etrack) {
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *tmp = GstMXFDemuxEssenceTrack *tmp =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i); g_ptr_array_index (demux->essence_tracks, i);
if (tmp->body_sid == demux->current_partition->partition.body_sid && if (tmp->body_sid == demux->current_partition->partition.body_sid &&
(tmp->track_number == track_number || tmp->track_number == 0)) { (tmp->track_number == track_number || tmp->track_number == 0)) {
@ -3928,8 +3918,7 @@ from_track_offset:
gst_mxf_demux_set_partition_for_offset (demux, demux->offset); gst_mxf_demux_set_partition_for_offset (demux, demux->offset);
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *t = GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
if (index_start_position != -1 && t == etrack) if (index_start_position != -1 && t == etrack)
t->position = index_start_position; t->position = index_start_position;
@ -3953,8 +3942,7 @@ from_track_offset:
/* Handle EOS */ /* Handle EOS */
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, g_ptr_array_index (demux->essence_tracks, i);
i);
if (t->position > 0) if (t->position > 0)
t->duration = t->position; t->duration = t->position;
@ -4192,8 +4180,7 @@ gst_mxf_demux_pull_and_handle_klv_packet (GstMXFDemux * demux)
guint i; guint i;
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *etrack = GstMXFDemuxEssenceTrack *etrack =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, g_ptr_array_index (demux->essence_tracks, i);
i);
if (etrack->body_sid != partition->partition.body_sid) if (etrack->body_sid != partition->partition.body_sid)
continue; continue;
@ -4664,9 +4651,8 @@ gst_mxf_demux_pad_to_track_and_position (GstMXFDemux * demux,
/* Get the corresponding essence track for the given source package and stream id */ /* Get the corresponding essence track for the given source package and stream id */
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *track = GstMXFDemuxEssenceTrack *track =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i); g_ptr_array_index (demux->essence_tracks, i);
GST_LOG_OBJECT (pad, GST_LOG_OBJECT (pad, "Looking at essence track body_sid:%d index_sid:%d",
"Looking at essence track body_sid:%d index_sid:%d",
track->body_sid, track->index_sid); track->body_sid, track->index_sid);
if (clip->source_track_id == 0 || (track->track_id == clip->source_track_id if (clip->source_track_id == 0 || (track->track_id == clip->source_track_id
&& mxf_umid_is_equal (&clip->source_package_id, && mxf_umid_is_equal (&clip->source_package_id,
@ -4915,8 +4901,7 @@ gst_mxf_demux_seek_push (GstMXFDemux * demux, GstEvent * event)
} }
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *t = GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
t->position = -1; t->position = -1;
} }
@ -5354,8 +5339,7 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event)
} }
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *t = GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
t->position = -1; t->position = -1;
} }
@ -5654,7 +5638,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
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_ptr_array_index (demux->essence_tracks, i);
if (t->position > 0) if (t->position > 0)
t->duration = t->position; t->duration = t->position;
@ -5695,8 +5679,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
for (i = 0; i < demux->essence_tracks->len; i++) { for (i = 0; i < demux->essence_tracks->len; i++) {
GstMXFDemuxEssenceTrack *etrack = GstMXFDemuxEssenceTrack *etrack =
&g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, g_ptr_array_index (demux->essence_tracks, i);
i);
etrack->position = -1; etrack->position = -1;
} }
ret = TRUE; ret = TRUE;
@ -5720,8 +5703,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
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, g_ptr_array_index (demux->essence_tracks, i);
i);
t->position = -1; t->position = -1;
} }
demux->current_partition = NULL; demux->current_partition = NULL;
@ -5994,7 +5976,7 @@ 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); g_ptr_array_free (demux->essence_tracks, TRUE);
demux->essence_tracks = NULL; demux->essence_tracks = NULL;
g_hash_table_destroy (demux->metadata); g_hash_table_destroy (demux->metadata);
@ -6071,8 +6053,8 @@ gst_mxf_demux_init (GstMXFDemux * demux)
g_rw_lock_init (&demux->metadata_lock); g_rw_lock_init (&demux->metadata_lock);
demux->src = g_ptr_array_new (); demux->src = g_ptr_array_new ();
demux->essence_tracks = demux->essence_tracks = g_ptr_array_new_with_free_func ((GDestroyNotify)
g_array_new (FALSE, FALSE, sizeof (GstMXFDemuxEssenceTrack)); gst_mxf_demux_essence_track_free);
gst_segment_init (&demux->segment, GST_FORMAT_TIME); gst_segment_init (&demux->segment, GST_FORMAT_TIME);

2
subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
View file

@ -266,7 +266,7 @@ struct _GstMXFDemux
GList *partitions; GList *partitions;
GstMXFDemuxPartition *current_partition; GstMXFDemuxPartition *current_partition;
GArray *essence_tracks; GPtrArray *essence_tracks;
GList *pending_index_table_segments; GList *pending_index_table_segments;
GList *index_tables; /* one per BodySID / IndexSID */ GList *index_tables; /* one per BodySID / IndexSID */