From: <sl...@ke...> - 2008-11-30 17:58:49
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Sun Nov 30 2008 17:58:46 UTC Log message: * gst/mxf/mxfdemux.c: (gst_mxf_demux_handle_header_metadata_resolve_references): If there's no descriptor for the track in the track's source package and there's a single descriptor without a linked track assume that it belongs to this track. Modified files: . : ChangeLog gst/mxf : mxfdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3770&r2=1.3771 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.19&r2=1.20 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3770 retrieving revision 1.3771 diff -u -d -r1.3770 -r1.3771 --- ChangeLog 30 Nov 2008 17:42:28 -0000 1.3770 +++ ChangeLog 30 Nov 2008 17:58:31 -0000 1.3771 @@ -1,5 +1,13 @@ 2008-11-30 Sebastian Dröge <seb...@co...> + * gst/mxf/mxfdemux.c: + (gst_mxf_demux_handle_header_metadata_resolve_references): + If there's no descriptor for the track in the track's source + package and there's a single descriptor without a linked track + assume that it belongs to this track. + +2008-11-30 Sebastian Dröge <seb...@co...> * gst/mxf/mxfalaw.c: (mxf_is_alaw_essence_track): * gst/mxf/mxfalaw.h: * gst/mxf/mxfdemux.c: Index: mxfdemux.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- mxfdemux.c 30 Nov 2008 17:42:30 -0000 1.19 +++ mxfdemux.c 30 Nov 2008 17:58:32 -0000 1.20 @@ -1305,8 +1305,9 @@ MXFMetadataEssenceContainerData, i); for (j = 0; j < demux->content_storage.n_essence_container_data; j++) { - if (mxf_ul_is_equal (&demux->content_storage. - essence_container_data_uids[j], &data->instance_uid)) { + if (mxf_ul_is_equal (&demux-> + content_storage.essence_container_data_uids[j], + &data->instance_uid)) { demux->content_storage.essence_container_data[j] = data; break; } @@ -1392,7 +1393,7 @@ if (package->tracks && package->descriptors) { for (j = 0; j < package->n_tracks; j++) { MXFMetadataTrack *track = package->tracks[j]; - guint n_descriptor = 0; + guint i, n_descriptor = 0; if (!track) continue; @@ -1406,14 +1407,15 @@ e = (MXFMetadataFileDescriptor *) d; - if (e->linked_track_id == track->track_id) + if (e->linked_track_id == track->track_id || + e->linked_track_id == 0) n_descriptor++; } track->n_descriptor = n_descriptor; track->descriptor = g_new0 (MXFMetadataFileDescriptor *, n_descriptor); - n_descriptor = 0; + i = 0; for (k = 0; k < package->n_descriptors; k++) { MXFMetadataGenericDescriptor *d = package->descriptors[k]; @@ -1424,8 +1426,9 @@ - track->descriptor[n_descriptor++] = e; + (e->linked_track_id == 0 && n_descriptor == 1)) + track->descriptor[i++] = e; } |