slomo gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mxf/
[email protected] Sun, 7 Dec 2008 09:16:43 -0800 (PST)
| Newsgroups | gmane.comp.video.gstreamer.cvs |
|---|---|
| Message-ID | <[email protected]> |
CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: slomo
Date: Sun Dec 07 2008 17:16:43 UTC
Log message:
* gst/mxf/Makefile.am:
* gst/mxf/mxfdemux.c:
(gst_mxf_demux_handle_header_metadata_update_streams):
* gst/mxf/mxftypes.h:
* gst/mxf/mxfup.c: (mxf_is_up_essence_track),
(mxf_up_handle_essence_element), (mxf_up_rgba_create_caps),
(mxf_up_create_caps):
* gst/mxf/mxfup.h:
Add initial support for uncompressed video essence (SMPTE S384M).
* gst/mxf/mxfparse.c:
(mxf_metadata_rgba_picture_essence_descriptor_handle_tag),
(mxf_metadata_rgba_picture_essence_descriptor_reset):
Fix parsing of the RGBA descriptor and add support for parsing
the pixel layout.
Modified files:
. : ChangeLog
gst/mxf : Makefile.am mxfdemux.c mxfparse.c mxftypes.h
Added files:
gst/mxf : mxfup.c mxfup.h
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3794&r2=1.3795
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/Makefile.am.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.30&r2=1.31
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfparse.c.diff?r1=1.18&r2=1.19
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxftypes.h.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfup.c?rev=1.1&content-type=text/vnd.viewcvs-markup
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfup.h?rev=1.1&content-type=text/vnd.viewcvs-markup
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3794
retrieving revision 1.3795
diff -u -d -r1.3794 -r1.3795
--- ChangeLog 6 Dec 2008 20:46:45 -0000 1.3794
+++ ChangeLog 7 Dec 2008 17:16:27 -0000 1.3795
@@ -1,3 +1,21 @@
+2008-12-07 Sebastian Dröge <[email protected]>
+
+ * gst/mxf/Makefile.am:
+ * gst/mxf/mxfdemux.c:
+ (gst_mxf_demux_handle_header_metadata_update_streams):
+ * gst/mxf/mxftypes.h:
+ * gst/mxf/mxfup.c: (mxf_is_up_essence_track),
+ (mxf_up_handle_essence_element), (mxf_up_rgba_create_caps),
+ (mxf_up_create_caps):
+ * gst/mxf/mxfup.h:
+ Add initial support for uncompressed video essence (SMPTE S384M).
+
+ * gst/mxf/mxfparse.c:
+ (mxf_metadata_rgba_picture_essence_descriptor_handle_tag),
+ (mxf_metadata_rgba_picture_essence_descriptor_reset):
+ Fix parsing of the RGBA descriptor and add support for parsing
+ the pixel layout.
2008-12-06 Sebastian Dröge <[email protected]>
* gst/mxf/mxfdemux.c: (gst_mxf_demux_parse_footer_metadata):
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am 4 Dec 2008 08:37:18 -0000 1.5
+++ Makefile.am 7 Dec 2008 17:16:28 -0000 1.6
@@ -9,10 +9,12 @@
mxfdv-dif.c \
mxfalaw.c \
mxfjpeg2000.c \
- mxfd10.c
+ mxfd10.c \
+ mxfup.c
-libgstmxf_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
-libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
+libgstmxf_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+ -lgstvideo-@GST_MAJORMINOR@
libgstmxf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
@@ -24,5 +26,6 @@
mxfalaw.h \
mxfjpeg2000.h \
mxfd10.h \
+ mxfup.h \
mxftypes.h
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- mxfdemux.c 6 Dec 2008 20:46:46 -0000 1.30
+++ mxfdemux.c 7 Dec 2008 17:16:28 -0000 1.31
@@ -37,6 +37,7 @@
#include "mxfalaw.h"
#include "mxfjpeg2000.h"
#include "mxfd10.h"
+#include "mxfup.h"
#include <string.h>
@@ -1323,8 +1324,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;
}
@@ -1887,6 +1889,10 @@
caps =
mxf_d10_create_caps (source_package, source_track,
&pad->tags, &pad->handle_essence_element, &pad->mapping_data);
+ else if (mxf_is_up_essence_track (source_track))
+ caps =
+ mxf_up_create_caps (source_package, source_track,
+ &pad->tags, &pad->handle_essence_element, &pad->mapping_data);
break;
case MXF_METADATA_TRACK_SOUND_ESSENCE:
if (mxf_is_aes_bwf_essence_track (source_track))
Index: mxfparse.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfparse.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mxfparse.c 5 Dec 2008 12:26:02 -0000 1.18
+++ mxfparse.c 7 Dec 2008 17:16:29 -0000 1.19
@@ -2774,36 +2774,70 @@
goto error;
descriptor->component_max_ref = GST_READ_UINT32_BE (tag_data);
GST_DEBUG (" component max ref = %u", descriptor->component_max_ref);
+ ret = TRUE;
break;
case 0x3407:
if (tag_size != 4)
descriptor->component_min_ref = GST_READ_UINT32_BE (tag_data);
GST_DEBUG (" component min ref = %u", descriptor->component_min_ref);
case 0x3408:
descriptor->alpha_max_ref = GST_READ_UINT32_BE (tag_data);
GST_DEBUG (" alpha max ref = %u", descriptor->alpha_max_ref);
case 0x3409:
descriptor->alpha_min_ref = GST_READ_UINT32_BE (tag_data);
GST_DEBUG (" alpha min ref = %u", descriptor->alpha_min_ref);
case 0x3405:
if (tag_size != 1)
descriptor->scanning_direction = GST_READ_UINT8 (tag_data);
GST_DEBUG (" scanning direction = %u", descriptor->scanning_direction);
- case 0x3401:
+ case 0x3401:{
+ guint i, len;
+ if (tag_size % 2 != 0)
+ goto error;
+ i = 0;
+ while (tag_data[i] != 0 && tag_data[i + 1] != 0 && i + 2 <= tag_size)
+ i += 2;
+ len = i / 2;
+ descriptor->n_pixel_layout = len;
+ GST_DEBUG (" number of pixel layouts = %u", len);
+ if (len == 0)
+ return TRUE;
+ descriptor->pixel_layout = g_malloc0 (2 * len);
+ for (i = 0; i < len; i++) {
+ descriptor->pixel_layout[2 * i] = tag_data[2 * i];
+ descriptor->pixel_layout[2 * i + 1] = tag_data[2 * i + 1];
+ GST_DEBUG (" pixel layout %u = %c : %u", i,
+ (gchar) descriptor->pixel_layout[2 * i],
+ descriptor->pixel_layout[2 * i + 1]);
+ }
+ break;
+ }
case 0x3403:
case 0x3404:
/* TODO: handle this */
GST_WARNING (" tag 0x%04x not implemented yet", tag);
default:
ret =
@@ -2829,6 +2863,8 @@
mxf_metadata_generic_picture_essence_descriptor_reset (
(MXFMetadataGenericPictureEssenceDescriptor *) descriptor);
+ g_free (descriptor->pixel_layout);
MXF_METADATA_DESCRIPTOR_CLEAR (descriptor,
MXFMetadataRGBAPictureEssenceDescriptor,
MXFMetadataGenericPictureEssenceDescriptor);
Index: mxftypes.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxftypes.h,v
--- mxftypes.h 5 Dec 2008 12:26:02 -0000 1.5
+++ mxftypes.h 7 Dec 2008 17:16:28 -0000 1.6
@@ -477,7 +477,10 @@
guint32 alpha_min_ref;
guint8 scanning_direction;
- /* TODO: pixel layout, palette & palette layout */
+ guint32 n_pixel_layout;
+ guint8 *pixel_layout;
+ /* TODO: palette & palette layout */
};
struct _MXFMetadataGenericSoundEssenceDescriptor {
--- NEW FILE: mxfup.c ---
/* GStreamer
* Copyright (C) 2008 Sebastian Dröge <[email protected]>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/* Implementation of SMPTE 384M - Mapping of Uncompressed Pictures into the MXF
* Generic Container
/* TODO:
* - Handle CDCI essence
* - Correctly transform for the GStreamer strides
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gst/gst.h>
#include <string.h>
#include <gst/video/video.h>
#include "mxfup.h"
GST_DEBUG_CATEGORY_EXTERN (mxf_debug);
#define GST_CAT_DEFAULT mxf_debug
gboolean
mxf_is_up_essence_track (const MXFMetadataTrack * track)
{
guint i;
g_return_val_if_fail (track != NULL, FALSE);
if (track->descriptor == NULL)
return FALSE;
for (i = 0; i < track->n_descriptor; i++) {
MXFMetadataFileDescriptor *d = track->descriptor[i];
MXFUL *key = &d->essence_container;
/* SMPTE 384M 8 */
if (mxf_is_generic_container_essence_container_label (key) &&
key->u[12] == 0x02 && key->u[13] == 0x05 && key->u[15] <= 0x03)
return TRUE;
}
return FALSE;
}
static GstFlowReturn
mxf_up_handle_essence_element (const MXFUL * key, GstBuffer * buffer,
GstCaps * caps, MXFMetadataGenericPackage * package,
MXFMetadataTrack * track, MXFMetadataStructuralComponent * component,
gpointer mapping_data, GstBuffer ** outbuf)
*outbuf = buffer;
/* SMPTE 384M 7.1 */
if (key->u[12] != 0x15 || (key->u[14] != 0x01 && key->u[14] != 0x02
&& key->u[14] != 0x03 && key->u[14] != 0x04)) {
GST_ERROR ("Invalid uncompressed picture essence element");
return GST_FLOW_ERROR;
return GST_FLOW_OK;
static GstCaps *
mxf_up_rgba_create_caps (MXFMetadataGenericPackage * package,
MXFMetadataTrack * track, MXFMetadataRGBAPictureEssenceDescriptor * d,
GstTagList ** tags,
MXFEssenceElementHandler * handler, gpointer * mapping_data)
GstCaps *caps = NULL;
if (!d->pixel_layout) {
GST_ERROR ("No pixel layout");
return NULL;
if (d->n_pixel_layout == 3) {
if (d->pixel_layout[0] == 'R' && d->pixel_layout[2] == 'G'
&& d->pixel_layout[4] == 'B' && d->pixel_layout[1] == 8
&& d->pixel_layout[3] == 8 && d->pixel_layout[5] == 8) {
caps = gst_caps_from_string (GST_VIDEO_CAPS_RGB);
} else if (d->pixel_layout[0] == 'B' && d->pixel_layout[2] == 'G'
&& d->pixel_layout[4] == 'R' && d->pixel_layout[1] == 8
caps = gst_caps_from_string (GST_VIDEO_CAPS_BGR);
} else {
GST_ERROR ("Unsupport 3 component pixel layout");
return NULL;
}
} else if (d->n_pixel_layout == 4) {
&& d->pixel_layout[4] == 'B' && d->pixel_layout[6] == 'F'
&& d->pixel_layout[1] == 8 && d->pixel_layout[3] == 8
&& d->pixel_layout[5] == 8 && d->pixel_layout[7] == 8) {
caps = gst_caps_from_string (GST_VIDEO_CAPS_RGBx);
&& d->pixel_layout[4] == 'R' && d->pixel_layout[6] == 'F'
caps = gst_caps_from_string (GST_VIDEO_CAPS_BGRx);
} else if (d->pixel_layout[0] == 'F' && d->pixel_layout[2] == 'R'
&& d->pixel_layout[4] == 'G' && d->pixel_layout[6] == 'B'
caps = gst_caps_from_string (GST_VIDEO_CAPS_xRGB);
} else if (d->pixel_layout[0] == 'F' && d->pixel_layout[2] == 'B'
&& d->pixel_layout[4] == 'G' && d->pixel_layout[6] == 'R'
caps = gst_caps_from_string (GST_VIDEO_CAPS_xBGR);
} else if (d->pixel_layout[0] == 'A' && d->pixel_layout[2] == 'R'
caps = gst_caps_from_string (GST_VIDEO_CAPS_ARGB);
} else if (d->pixel_layout[0] == 'A' && d->pixel_layout[2] == 'B'
caps = gst_caps_from_string (GST_VIDEO_CAPS_ABGR);
} else if (d->pixel_layout[0] == 'R' && d->pixel_layout[2] == 'G'
&& d->pixel_layout[4] == 'B' && d->pixel_layout[6] == 'A'
caps = gst_caps_from_string (GST_VIDEO_CAPS_RGBA);
&& d->pixel_layout[4] == 'R' && d->pixel_layout[6] == 'A'
caps = gst_caps_from_string (GST_VIDEO_CAPS_BGRA);
GST_ERROR ("Unsupport 4 component pixel layout");
} else {
GST_ERROR ("Pixel layouts with %u components not supported yet",
d->n_pixel_layout);
return caps;
GstCaps *
mxf_up_create_caps (MXFMetadataGenericPackage * package,
MXFMetadataTrack * track, GstTagList ** tags,
MXFMetadataGenericPictureEssenceDescriptor *p = NULL;
MXFMetadataCDCIPictureEssenceDescriptor *c = NULL;
MXFMetadataRGBAPictureEssenceDescriptor *r = NULL;
g_return_val_if_fail (package != NULL, NULL);
g_return_val_if_fail (track != NULL, NULL);
if (track->descriptor == NULL) {
GST_ERROR ("No descriptor found for this track");
if (((MXFMetadataGenericDescriptor *) track->descriptor[i])->type ==
MXF_METADATA_RGBA_PICTURE_ESSENCE_DESCRIPTOR) {
p = (MXFMetadataGenericPictureEssenceDescriptor *) track->descriptor[i];
r = (MXFMetadataRGBAPictureEssenceDescriptor *) track->descriptor[i];
break;
} else if (((MXFMetadataGenericDescriptor *) track->descriptor[i])->type ==
MXF_METADATA_CDCI_PICTURE_ESSENCE_DESCRIPTOR) {
c = (MXFMetadataCDCIPictureEssenceDescriptor *) track->descriptor[i];
if (!p) {
GST_ERROR ("No picture essence descriptor found for this track");
*handler = mxf_up_handle_essence_element;
if (r) {
caps =
mxf_up_rgba_create_caps (package, track, r, tags, handler,
mapping_data);
GST_ERROR ("CDCI uncompressed picture essence not supported yet");
if (caps) {
mxf_metadata_generic_picture_essence_descriptor_set_caps (p, caps);
--- NEW FILE: mxfup.h ---
#ifndef __MXF_UP_H__
#define __MXF_UP_H__
#include "mxfparse.h"
gboolean mxf_is_up_essence_track (const MXFMetadataTrack *track);
mxf_up_create_caps (MXFMetadataGenericPackage *package, MXFMetadataTrack *track, GstTagList **tags, MXFEssenceElementHandler *handler, gpointer *mapping_data);
#endif /* __MXF_UP_H__ */
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose