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

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     slomo
Date:           Wed Dec 03 2008  08:04:53 UTC

Log message:
* gst/mxf/mxfdemux.c:
(gst_mxf_demux_handle_header_metadata_update_streams),
(gst_mxf_demux_base_init):
Use a single "track_%u" src pad template and use the track ID
of the playback package for the pad name instead of the track ID
of the source package, as the latter could be the same for
more than one track if they're in different packages.

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

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3778&r2=1.3779
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.22&r2=1.23

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3778
retrieving revision 1.3779
diff -u -d -r1.3778 -r1.3779
--- ChangeLog	2 Dec 2008 06:21:20 -0000	1.3778
+++ ChangeLog	3 Dec 2008 08:04:37 -0000	1.3779
@@ -1,3 +1,13 @@
+2008-12-03  Sebastian Dröge  <[email protected]>
+
+	* gst/mxf/mxfdemux.c:
+	(gst_mxf_demux_handle_header_metadata_update_streams),
+	(gst_mxf_demux_base_init):
+	Use a single "track_%u" src pad template and use the track ID
+	of the playback package for the pad name instead of the track ID
+	of the source package, as the latter could be the same for
+	more than one track if they're in different packages.
 2008-12-01  David Schleef  <[email protected]>
 
 	* ext/jp2k/gstjasperenc.c: Some compilers complain about
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mxfdemux.c	1 Dec 2008 15:24:37 -0000	1.22
+++ mxfdemux.c	3 Dec 2008 08:04:38 -0000	1.23
@@ -45,20 +45,8 @@
     GST_STATIC_CAPS ("application/mxf")
     );
-static GstStaticPadTemplate audio_src_template =
-GST_STATIC_PAD_TEMPLATE ("audio_%u",
-    GST_PAD_SRC,
-    GST_PAD_SOMETIMES,
-    GST_STATIC_CAPS_ANY);
-
-static GstStaticPadTemplate video_src_template =
-GST_STATIC_PAD_TEMPLATE ("video_%u",
-static GstStaticPadTemplate data_src_template =
-GST_STATIC_PAD_TEMPLATE ("data_%u",
+static GstStaticPadTemplate mxf_src_template =
+GST_STATIC_PAD_TEMPLATE ("track_%u",
     GST_PAD_SRC,
     GST_PAD_SOMETIMES,
     GST_STATIC_CAPS_ANY);
@@ -1305,9 +1293,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;
         }
@@ -1816,29 +1803,10 @@
       GstPadTemplate *templ;
       gchar *pad_name;
-      switch (track_type) {
-        case MXF_METADATA_TRACK_PICTURE_ESSENCE:
-          templ =
-              gst_element_class_get_pad_template (GST_ELEMENT_GET_CLASS (demux),
-              "video_%u");
-          pad_name = g_strdup_printf ("video_%u", source_track->track_id);
-          break;
-        case MXF_METADATA_TRACK_SOUND_ESSENCE:
-              "audio_%u");
-          pad_name = g_strdup_printf ("audio_%u", source_track->track_id);
-        case MXF_METADATA_TRACK_DATA_ESSENCE:
-              "data_%u");
-          pad_name = g_strdup_printf ("data_%u", source_track->track_id);
-        default:
-          g_assert_not_reached ();
-      }
+      templ =
+          gst_element_class_get_pad_template (GST_ELEMENT_GET_CLASS (demux),
+          "track_%u");
+      pad_name = g_strdup_printf ("track_%u", track->track_id);
       g_assert (templ != NULL);
@@ -3223,11 +3191,7 @@
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&mxf_sink_template));
-      gst_static_pad_template_get (&audio_src_template));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&video_src_template));
-      gst_static_pad_template_get (&data_src_template));
+      gst_static_pad_template_get (&mxf_src_template));
   gst_element_class_set_details_simple (element_class, "MXF Demuxer",
       "Codec/Demuxer",
       "Demux MXF files", "Sebastian Dröge <[email protected]>");

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