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 22 2008  20:56:25 UTC

Log message:
* gst/mxf/mxfmpeg.c: (mxf_mpeg_es_create_caps),
(mxf_mpeg_create_caps):
Add initial support for h.264 video (SMPTE RP2008).

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

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3828&r2=1.3829
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfmpeg.c.diff?r1=1.14&r2=1.15

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3828
retrieving revision 1.3829
diff -u -d -r1.3828 -r1.3829
--- ChangeLog	22 Dec 2008 20:37:23 -0000	1.3828
+++ ChangeLog	22 Dec 2008 20:56:09 -0000	1.3829
@@ -1,5 +1,11 @@
 2008-12-22  Sebastian Dröge  <[email protected]>
 
+	* gst/mxf/mxfmpeg.c: (mxf_mpeg_es_create_caps),
+	(mxf_mpeg_create_caps):
+	Add initial support for h.264 video (SMPTE RP2008).
+
+2008-12-22  Sebastian Dröge  <[email protected]>
 	* gst/mxf/mxfmetadata.c: (mxf_metadata_base_resolve):
 	* gst/mxf/mxfmetadata.h:
 	If resolving a metadata object failed the first time return
Index: mxfmpeg.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfmpeg.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mxfmpeg.c	19 Dec 2008 10:06:24 -0000	1.14
+++ mxfmpeg.c	22 Dec 2008 20:56:10 -0000	1.15
@@ -386,6 +386,12 @@
         gst_buffer_unref (codec_data);
       }
       codec_name = "MPEG-4 Video";
+    } else if ((p->picture_essence_coding.u[13] >> 4) == 0x03) {
+      /* RP 2008 */
+      /* TODO: What about codec_data for AVC1 streams? */
+      caps = gst_caps_new_simple ("video/x-h264", NULL);
+      codec_name = "h.264 Video";
     } else {
       GST_ERROR ("Unsupported MPEG picture essence coding 0x%02x",
           p->picture_essence_coding.u[13]);
@@ -472,17 +478,17 @@
     if (!track->parent.descriptor[i])
       continue;
-    if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent.
-            descriptor[i])) {
+    if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->
+            parent.descriptor[i])) {
       f = track->parent.descriptor[i];
-      p = (MXFMetadataGenericPictureEssenceDescriptor *) track->
-          parent.descriptor[i];
+      p = (MXFMetadataGenericPictureEssenceDescriptor *) track->parent.
+          descriptor[i];
       break;
-    } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.
+    } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->
-      s = (MXFMetadataGenericSoundEssenceDescriptor *) track->
+      s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent.
     }
   }
@@ -518,9 +524,28 @@
       *tags = gst_tag_list_new ();
     gst_tag_list_add (*tags, GST_TAG_MERGE_APPEND, GST_TAG_VIDEO_CODEC,
         "MPEG TS", NULL);
+  } else if (f->essence_container.u[13] == 0x0f) {
+    GST_DEBUG ("Found h264 NAL unit stream");
+    /* RP 2008 */
+    /* TODO: What about codec_data? */
+    caps = gst_caps_new_simple ("video/x-h264", NULL);
+    if (!*tags)
+      *tags = gst_tag_list_new ();
+    gst_tag_list_add (*tags, GST_TAG_MERGE_APPEND, GST_TAG_VIDEO_CODEC,
+        "h.264 Video", NULL);
+  } else if (f->essence_container.u[13] == 0x10) {
+    GST_DEBUG ("Found h264 byte stream stream");
-  if (p)
+  if (p && caps)
     mxf_metadata_generic_picture_essence_descriptor_set_caps (p, caps);
   return caps;

------------------------------------------------------------------------------

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose