slomo gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mxf/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     slomo
Date:           Mon Dec 01 2008  14:25:33 UTC

Log message:
* gst/mxf/mxfdemux.c: (gst_mxf_demux_choose_package):
If the preface references a primary package use this as the default
playback package unless one was specified by the "package" property.
If there's no preface primary package still try to use the first
material package.

Modified files:
    .               : ChangeLog
    gst/mxf         : mxfdemux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3771&r2=1.3772
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.20&r2=1.21

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3771
retrieving revision 1.3772
diff -u -d -r1.3771 -r1.3772
--- ChangeLog	30 Nov 2008 17:58:31 -0000	1.3771
+++ ChangeLog	1 Dec 2008 14:25:16 -0000	1.3772
@@ -1,3 +1,11 @@
+2008-12-01  Sebastian Dröge  <[email protected]>
+
+	* gst/mxf/mxfdemux.c: (gst_mxf_demux_choose_package):
+	If the preface references a primary package use this as the default
+	playback package unless one was specified by the "package" property.
+	If there's no preface primary package still try to use the first
+	material package.
 2008-11-30  Sebastian Dröge  <[email protected]>
 
 	* gst/mxf/mxfdemux.c:
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mxfdemux.c	30 Nov 2008 17:58:32 -0000	1.20
+++ mxfdemux.c	1 Dec 2008 14:25:19 -0000	1.21
@@ -1305,9 +1305,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;
         }
@@ -1677,6 +1676,12 @@
     GST_WARNING_OBJECT (demux,
         "Current package not found, choosing the first best");
+  if (demux->preface.primary_package)
+    ret = demux->preface.primary_package;
+  if (ret && (ret->type == MXF_METADATA_GENERIC_PACKAGE_TOP_LEVEL_SOURCE
+          || ret->type == MXF_METADATA_GENERIC_PACKAGE_MATERIAL))
+    return ret;
   if (!demux->material_package) {
     GST_ERROR_OBJECT (demux, "No material package");
     return NULL;

-------------------------------------------------------------------------
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