slomo gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mxf/
[email protected] Mon, 5 Jan 2009 05:41:22 -0800 (PST)
| Newsgroups | gmane.comp.video.gstreamer.cvs |
|---|---|
| Message-ID | <[email protected]> |
--===============5900517219879196020==
CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: slomo
Date: Mon Jan 05 2009 13:41:22 UTC
Log message:
* gst/mxf/Makefile.am:
* gst/mxf/mxfdemux.c:
* gst/mxf/mxfmetadata.c: (mxf_metadata_handle_tag),
(mxf_metadata_preface_handle_tag),
(mxf_metadata_identification_handle_tag),
(mxf_metadata_content_storage_handle_tag),
(mxf_metadata_essence_container_data_handle_tag),
(mxf_metadata_generic_package_handle_tag),
(mxf_metadata_track_handle_tag),
(mxf_metadata_sequence_handle_tag),
(mxf_metadata_structural_component_handle_tag),
(mxf_metadata_generic_descriptor_handle_tag),
(mxf_metadata_locator_handle_tag),
(mxf_metadata_locator_class_init):
* gst/mxf/mxfmetadata.h:
"Generation UID" and "This Generation UID" are different so handle
them different. Also both are not part of every metadata type.
Modified files:
. : ChangeLog
gst/mxf : Makefile.am mxfdemux.c mxfmetadata.c
mxfmetadata.h
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3856&r2=1.3857
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/Makefile.am.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.45&r2=1.46
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.c.diff?r1=1.7&r2=1.8
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.h.diff?r1=1.4&r2=1.5
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3856
retrieving revision 1.3857
diff -u -d -r1.3856 -r1.3857
--- ChangeLog 5 Jan 2009 12:34:17 -0000 1.3856
+++ ChangeLog 5 Jan 2009 13:41:06 -0000 1.3857
@@ -1,5 +1,25 @@
2009-01-05 Sebastian Dröge <[email protected]>
+ * gst/mxf/Makefile.am:
+ * gst/mxf/mxfdemux.c:
+ * gst/mxf/mxfmetadata.c: (mxf_metadata_handle_tag),
+ (mxf_metadata_preface_handle_tag),
+ (mxf_metadata_identification_handle_tag),
+ (mxf_metadata_content_storage_handle_tag),
+ (mxf_metadata_essence_container_data_handle_tag),
+ (mxf_metadata_generic_package_handle_tag),
+ (mxf_metadata_track_handle_tag),
+ (mxf_metadata_sequence_handle_tag),
+ (mxf_metadata_structural_component_handle_tag),
+ (mxf_metadata_generic_descriptor_handle_tag),
+ (mxf_metadata_locator_handle_tag),
+ (mxf_metadata_locator_class_init):
+ * gst/mxf/mxfmetadata.h:
+ "Generation UID" and "This Generation UID" are different so handle
+ them different. Also both are not part of every metadata type.
+
+2009-01-05 Sebastian Dröge <[email protected]>
Patch by: Sascha Hauer <s dot hauer at pengutronix dot de>
Luotao Fu <l dot fu at pengutronix dot de>
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am 18 Dec 2008 17:49:07 -0000 1.8
+++ Makefile.am 5 Jan 2009 13:41:07 -0000 1.9
@@ -12,7 +12,8 @@
mxfd10.c \
mxfup.c \
mxfvc3.c \
- mxfmetadata.c
+ mxfmetadata.c \
+ mxfdms1.c
libgstmxf_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
@@ -31,5 +32,6 @@
mxfup.h \
mxfvc3.h \
mxftypes.h \
- mxfmetadata.h
+ mxfmetadata.h \
+ mxfdms1.h
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- mxfdemux.c 5 Jan 2009 10:34:03 -0000 1.45
+++ mxfdemux.c 5 Jan 2009 13:41:07 -0000 1.46
@@ -35,8 +35,6 @@
* - Differentiate UL and UUIDs, the former can define an object system
* (i.e. mxf_ul_is_a() and friends could be implemented), see SMPTE S336M.
* The latter are just 16 byte unique identifiers
- * - Differentiate between "Generation UID" and "This Generation UID" and move
- * them from MXFMetadataBase to MXFMetadata*.
* - Check everything for correctness vs. SMPTE S336M, some things can probably
* be generalized/simplified
* - Seeking support: IndexTableSegments and skip-to-position seeks, needs correct
@@ -560,11 +558,11 @@
for (i = 0; i < demux->preface->content_storage->n_packages; i++) {
if (demux->preface->content_storage->packages[i] &&
- MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->
- content_storage->packages[i])) {
+ MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->content_storage->
+ packages[i])) {
ret =
- MXF_METADATA_GENERIC_PACKAGE (demux->preface->
- content_storage->packages[i]);
+ MXF_METADATA_GENERIC_PACKAGE (demux->preface->content_storage->
+ packages[i]);
break;
}
}
@@ -977,8 +975,8 @@
GST_DEBUG_OBJECT (demux, "Switching to component %u", pad->current_component);
pad->component =
- MXF_METADATA_SOURCE_CLIP (sequence->
- structural_components[pad->current_component]);
+ MXF_METADATA_SOURCE_CLIP (sequence->structural_components[pad->
+ current_component]);
if (pad->component == NULL) {
GST_ERROR_OBJECT (demux, "No such structural component");
return GST_FLOW_ERROR;
@@ -986,8 +984,8 @@
if (!pad->component->source_package
|| !pad->component->source_package->top_level
- || !MXF_METADATA_GENERIC_PACKAGE (pad->component->source_package)->
- tracks) {
+ || !MXF_METADATA_GENERIC_PACKAGE (pad->component->
+ source_package)->tracks) {
GST_ERROR_OBJECT (demux, "Invalid component");
Index: mxfmetadata.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.c,v
retrieving revision 1.7
diff -u -d -r1.7 -r1.8
--- mxfmetadata.c 5 Jan 2009 10:22:28 -0000 1.7
+++ mxfmetadata.c 5 Jan 2009 13:41:07 -0000 1.8
@@ -151,14 +151,6 @@
GST_DEBUG (" instance uid = %s",
mxf_ul_to_string (&self->parent.instance_uid, str));
- case 0x0102:
- case 0x3c09:
- if (tag_size != 16)
- goto error;
- memcpy (&self->parent.generation_uid, tag_data, 16);
- GST_DEBUG (" generation uid = %s",
- mxf_ul_to_string (&self->parent.generation_uid, str));
- break;
default:
MXF_METADATA_BASE_CLASS (mxf_metadata_parent_class)->handle_tag
@@ -335,6 +327,13 @@
gboolean ret = TRUE;
switch (tag) {
+ case 0x0102:
+ if (tag_size != 16)
+ goto error;
+ memcpy (&self->generation_uid, tag_data, 16);
+ GST_DEBUG (" generation uid = %s",
+ mxf_ul_to_string (&self->generation_uid, str));
+ break;
case 0x3b02:
if (!mxf_timestamp_parse (&self->last_modified_date, tag_data, tag_size))
goto error;
@@ -574,6 +573,13 @@
#endif
+ case 0x3c09:
+ memcpy (&self->this_generation_uid, tag_data, 16);
+ GST_DEBUG (" this generation uid = %s",
+ mxf_ul_to_string (&self->this_generation_uid, str));
case 0x3c01:
self->company_name = mxf_utf16_to_utf8 (tag_data, tag_size);
GST_DEBUG (" company name = %s", GST_STR_NULL (self->company_name));
@@ -695,6 +701,13 @@
case 0x1901:{
guint32 len;
guint i;
@@ -854,6 +867,13 @@
case 0x2701:
if (tag_size != 32)
@@ -976,6 +996,13 @@
case 0x4401:
@@ -1374,6 +1401,13 @@
case 0x4801:
if (tag_size != 4)
@@ -1668,6 +1702,13 @@
case 0x0201:
if (tag_size != 16)
@@ -1796,6 +1837,13 @@
@@ -2270,6 +2318,13 @@
case 0x2f01:{
@@ -3276,6 +3331,41 @@
G_DEFINE_ABSTRACT_TYPE (MXFMetadataLocator, mxf_metadata_locator,
MXF_TYPE_METADATA);
+static gboolean
+mxf_metadata_locator_handle_tag (MXFMetadataBase * metadata,
+ MXFPrimerPack * primer, guint16 tag, const guint8 * tag_data,
+ guint tag_size)
+{
+ MXFMetadataLocator *self = MXF_METADATA_LOCATOR (metadata);
+ gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
+ gchar str[48];
+#endif
+ switch (tag) {
+ default:
+ ret =
+ MXF_METADATA_BASE_CLASS
+ (mxf_metadata_locator_parent_class)->handle_tag (metadata,
+ primer, tag, tag_data, tag_size);
+ }
+ return ret;
+error:
+ GST_ERROR ("Invalid locator local tag 0x%04x of size %u", tag, tag_size);
+ return FALSE;
+}
static void
mxf_metadata_locator_init (MXFMetadataLocator * self)
{
@@ -3284,6 +3374,9 @@
mxf_metadata_locator_class_init (MXFMetadataLocatorClass * klass)
+ MXFMetadataBaseClass *metadata_base_class = (MXFMetadataBaseClass *) klass;
+ metadata_base_class->handle_tag = mxf_metadata_locator_handle_tag;
}
G_DEFINE_TYPE (MXFMetadataTextLocator, mxf_metadata_text_locator,
Index: mxfmetadata.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mxfmetadata.h 22 Dec 2008 20:37:24 -0000 1.4
+++ mxfmetadata.h 5 Jan 2009 13:41:07 -0000 1.5
@@ -343,7 +343,6 @@
GstMiniObject parent;
MXFUL instance_uid;
- MXFUL generation_uid;
MXFMetadataBaseResolveState resolved;
@@ -366,6 +365,8 @@
struct _MXFMetadataPreface {
MXFMetadata parent;
+ MXFUL generation_uid;
MXFTimestamp last_modified_date;
guint16 version;
@@ -393,6 +394,8 @@
struct _MXFMetadataIdentification {
+ MXFUL this_generation_uid;
gchar *company_name;
gchar *product_name;
@@ -412,6 +415,8 @@
struct _MXFMetadataContentStorage {
guint32 n_packages;
MXFUL *packages_uids;
MXFMetadataGenericPackage **packages;
@@ -424,6 +429,8 @@
struct _MXFMetadataEssenceContainerData {
MXFUMID linked_package_uid;
MXFMetadataSourcePackage *linked_package;
@@ -434,6 +441,8 @@
struct _MXFMetadataGenericPackage {
MXFUMID package_uid;
gchar *name;
@@ -477,6 +486,8 @@
struct _MXFMetadataTrack {
guint32 track_id;
guint32 track_number;
@@ -508,6 +519,8 @@
struct _MXFMetadataSequence {
MXFUL data_definition;
gint64 duration;
@@ -520,6 +533,8 @@
struct _MXFMetadataStructuralComponent {
};
@@ -565,6 +580,8 @@
struct _MXFMetadataGenericDescriptor {
guint32 n_locators;
MXFUL *locators_uids;
MXFMetadataLocator **locators;
@@ -681,6 +698,8 @@
struct _MXFMetadataLocator {
struct _MXFMetadataNetworkLocator {
--===============5900517219879196020==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
------------------------------------------------------------------------------
--===============5900517219879196020==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose
--===============5900517219879196020==--