CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: slomo
Date: Mon Nov 24 2008 11:31:41 UTC
Log message:
* gst/mxf/mxfdemux.c:
(gst_mxf_demux_handle_generic_container_essence_element):
Make sure to only output generic container essence elements
for a track if the body SID of the surrounding partition is
the same as the body SID of the track's source package.
Modified files:
. : ChangeLog
gst/mxf : mxfdemux.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3736&r2=1.3737
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.5&r2=1.6
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3736
retrieving revision 1.3737
diff -u -d -r1.3736 -r1.3737
--- ChangeLog 24 Nov 2008 11:17:17 -0000 1.3736
+++ ChangeLog 24 Nov 2008 11:31:26 -0000 1.3737
@@ -1,3 +1,11 @@
+2008-11-24 Sebastian Dröge <[email protected]>
+
+ * gst/mxf/mxfdemux.c:
+ (gst_mxf_demux_handle_generic_container_essence_element):
+ Make sure to only output generic container essence elements
+ for a track if the body SID of the surrounding partition is
+ the same as the body SID of the track's source package.
2008-11-24 Julien Moutte <[email protected]>
* gst/flv/gstflvdemux.c: (gst_flv_demux_find_offset),
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mxfdemux.c 24 Nov 2008 10:41:12 -0000 1.5
+++ mxfdemux.c 24 Nov 2008 11:31:27 -0000 1.6
@@ -1127,9 +1127,8 @@
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;
}
@@ -1862,7 +1861,7 @@
{
GstFlowReturn ret = GST_FLOW_OK;
guint32 track_number;
- guint i;
+ guint i, j;
GstMXFPad *pad = NULL;
GstBuffer *inbuf;
GstBuffer *outbuf = NULL;
@@ -1890,8 +1889,24 @@
(p->source_track->track_number == 0 &&
demux->src->len == 1 &&
demux->current_package->n_essence_tracks == 1)) {
- pad = p;
- break;
+ if (demux->essence_container_data) {
+ for (j = 0; j < demux->essence_container_data->len; j++) {
+ MXFMetadataEssenceContainerData *edata =
+ &g_array_index (demux->essence_container_data,
+ MXFMetadataEssenceContainerData, j);
+ if (p->source_package == edata->linked_package
+ && demux->partition.body_sid == edata->body_sid) {
+ pad = p;
+ break;
+ }
+ }
+ } else {
+ pad = p;
+ }
+ if (pad)
+ break;
}
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.