slomo gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mxf/
[email protected] Tue, 16 Dec 2008 00:21: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: Tue Dec 16 2008 08:21:43 UTC
Log message:
* gst/mxf/mxfdemux.c:
(gst_mxf_demux_handle_header_metadata_resolve_references):
* gst/mxf/mxfmetadata.c: (mxf_metadata_base_resolve_default),
(mxf_metadata_base_class_init), (mxf_metadata_base_parse),
(mxf_metadata_base_resolve), (mxf_metadata_new),
(mxf_metadata_preface_resolve),
(mxf_metadata_content_storage_resolve),
(mxf_metadata_essence_container_data_resolve),
(mxf_metadata_generic_package_resolve),
(mxf_metadata_source_package_resolve),
(mxf_metadata_track_resolve), (mxf_metadata_sequence_resolve),
(mxf_metadata_dm_segment_resolve),
(mxf_metadata_generic_descriptor_resolve),
(mxf_metadata_multiple_descriptor_resolve):
* gst/mxf/mxfmetadata.h:
Rename MXFMetadataBase methods to reflect that they belong to
MXFMetadataBase and not MXFMetadata.
Modified files:
. : ChangeLog
gst/mxf : mxfdemux.c mxfmetadata.c mxfmetadata.h
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3812&r2=1.3813
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.37&r2=1.38
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.c.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.h.diff?r1=1.1&r2=1.2
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3812
retrieving revision 1.3813
diff -u -d -r1.3812 -r1.3813
--- ChangeLog 15 Dec 2008 18:12:25 -0000 1.3812
+++ ChangeLog 16 Dec 2008 08:21:26 -0000 1.3813
@@ -1,3 +1,23 @@
+2008-12-16 Sebastian Dröge <[email protected]>
+
+ * gst/mxf/mxfdemux.c:
+ (gst_mxf_demux_handle_header_metadata_resolve_references):
+ * gst/mxf/mxfmetadata.c: (mxf_metadata_base_resolve_default),
+ (mxf_metadata_base_class_init), (mxf_metadata_base_parse),
+ (mxf_metadata_base_resolve), (mxf_metadata_new),
+ (mxf_metadata_preface_resolve),
+ (mxf_metadata_content_storage_resolve),
+ (mxf_metadata_essence_container_data_resolve),
+ (mxf_metadata_generic_package_resolve),
+ (mxf_metadata_source_package_resolve),
+ (mxf_metadata_track_resolve), (mxf_metadata_sequence_resolve),
+ (mxf_metadata_dm_segment_resolve),
+ (mxf_metadata_generic_descriptor_resolve),
+ (mxf_metadata_multiple_descriptor_resolve):
+ * gst/mxf/mxfmetadata.h:
+ Rename MXFMetadataBase methods to reflect that they belong to
+ MXFMetadataBase and not MXFMetadata.
2008-12-15 Sebastian Dröge <[email protected]>
* gst/mxf/mxfaes-bwf.c:
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- mxfdemux.c 15 Dec 2008 17:26:58 -0000 1.37
+++ mxfdemux.c 16 Dec 2008 08:21:28 -0000 1.38
@@ -457,7 +457,8 @@
gboolean resolved;
resolved =
- mxf_metadata_resolve (m, (MXFMetadataBase **) demux->metadata->pdata);
+ mxf_metadata_base_resolve (m,
+ (MXFMetadataBase **) demux->metadata->pdata);
/* Resolving can fail for anything but the preface, as the preface
* will resolve everything required */
@@ -545,11 +546,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;
}
}
Index: mxfmetadata.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mxfmetadata.c 15 Dec 2008 18:12:26 -0000 1.2
+++ mxfmetadata.c 16 Dec 2008 08:21:28 -0000 1.3
@@ -55,7 +55,8 @@
}
static gboolean
-mxf_metadata_base_resolve (MXFMetadataBase * self, MXFMetadataBase ** metadata)
+mxf_metadata_base_resolve_default (MXFMetadataBase * self,
+ MXFMetadataBase ** metadata)
{
return TRUE;
@@ -73,11 +74,11 @@
miniobject_class->finalize = mxf_metadata_base_finalize;
klass->handle_tag = mxf_metadata_base_handle_tag;
- klass->resolve = mxf_metadata_base_resolve;
+ klass->resolve = mxf_metadata_base_resolve_default;
gboolean
-mxf_metadata_parse (MXFMetadataBase * self, MXFPrimerPack * primer,
+mxf_metadata_base_parse (MXFMetadataBase * self, MXFPrimerPack * primer,
const guint8 * data, guint size)
guint16 tag, tag_size;
@@ -103,7 +104,7 @@
-mxf_metadata_resolve (MXFMetadataBase * self, MXFMetadataBase ** metadata)
+mxf_metadata_base_resolve (MXFMetadataBase * self, MXFMetadataBase ** metadata)
MXFMetadataBaseClass *klass;
@@ -281,7 +282,7 @@
ret = (MXFMetadata *) g_type_create_instance (t);
- if (!mxf_metadata_parse (MXF_METADATA_BASE (ret), primer, data, size)) {
+ if (!mxf_metadata_base_parse (MXF_METADATA_BASE (ret), primer, data, size)) {
GST_ERROR ("Parsing metadata failed");
gst_mini_object_unref ((GstMiniObject *) ret);
return NULL;
@@ -471,11 +472,11 @@
if (MXF_IS_METADATA_GENERIC_PACKAGE (current) &&
mxf_ul_is_equal (&self->primary_package_uid, ¤t->instance_uid)) {
- if (mxf_metadata_resolve (current, metadata))
+ if (mxf_metadata_base_resolve (current, metadata))
self->primary_package = MXF_METADATA_GENERIC_PACKAGE (current);
} else if (MXF_IS_METADATA_CONTENT_STORAGE (current) &&
mxf_ul_is_equal (&self->content_storage_uid, ¤t->instance_uid)) {
self->content_storage = MXF_METADATA_CONTENT_STORAGE (current);
p++;
@@ -491,7 +492,7 @@
if (MXF_IS_METADATA_IDENTIFICATION (current) &&
mxf_ul_is_equal (&self->identifications_uids[i],
¤t->instance_uid)) {
- if (mxf_metadata_resolve (current, metadata))
+ if (mxf_metadata_base_resolve (current, metadata))
self->identifications[i] = MXF_METADATA_IDENTIFICATION (current);
break;
}
@@ -761,7 +762,7 @@
current = *p;
if (MXF_IS_METADATA_GENERIC_PACKAGE (current) &&
mxf_ul_is_equal (¤t->instance_uid, &self->packages_uids[i])) {
- if (mxf_metadata_resolve (current, metadata)) {
+ if (mxf_metadata_base_resolve (current, metadata)) {
self->packages[i] = MXF_METADATA_GENERIC_PACKAGE (current);
have_package = TRUE;
}
@@ -781,7 +782,7 @@
if (MXF_IS_METADATA_ESSENCE_CONTAINER_DATA (current) &&
mxf_ul_is_equal (¤t->instance_uid,
&self->essence_container_data_uids[i])) {
self->essence_container_data[i] =
MXF_METADATA_ESSENCE_CONTAINER_DATA (current);
have_ecd = TRUE;
@@ -889,7 +890,7 @@
if (mxf_umid_is_equal (&package->parent.package_uid,
&self->linked_package_uid)) {
self->linked_package = package;
@@ -1052,7 +1053,7 @@
MXFMetadataTrack *track = MXF_METADATA_TRACK (current);
if (mxf_ul_is_equal (¤t->instance_uid, &self->tracks_uids[i])) {
- if (mxf_metadata_resolve (current, metadata)) {
+ if (mxf_metadata_base_resolve (current, metadata)) {
self->tracks[i] = track;
have_track = TRUE;
@@ -1240,7 +1241,7 @@
- if (!d || !mxf_metadata_resolve (MXF_METADATA_BASE (d), metadata)) {
+ if (!d || !mxf_metadata_base_resolve (MXF_METADATA_BASE (d), metadata)) {
GST_ERROR ("Couldn't resolve descriptor");
return FALSE;
@@ -1403,7 +1404,8 @@
if (!self->sequence
- || !mxf_metadata_resolve (MXF_METADATA_BASE (self->sequence), metadata)) {
+ || !mxf_metadata_base_resolve (MXF_METADATA_BASE (self->sequence),
+ metadata)) {
GST_ERROR ("Couldn't resolve sequence");
@@ -1710,7 +1712,7 @@
if (MXF_IS_METADATA_STRUCTURAL_COMPONENT (current)
&& mxf_ul_is_equal (¤t->instance_uid,
&self->structural_components_uids[i])) {
self->structural_components[i] =
MXF_METADATA_STRUCTURAL_COMPONENT (current);
have_sc++;
@@ -2166,7 +2168,7 @@
/* TODO: if (MXF_IS_DM_FRAMEWORK (current) && */
if (mxf_ul_is_equal (¤t->instance_uid, &self->dm_framework_uid)) {
- if (mxf_metadata_resolve (current, metadata)) {
+ if (mxf_metadata_base_resolve (current, metadata)) {
self->dm_framework = current;
@@ -2290,7 +2292,7 @@
if (MXF_IS_METADATA_LOCATOR (current) &&
mxf_ul_is_equal (¤t->instance_uid, &self->locators_uids[i])) {
self->locators[i] = MXF_METADATA_LOCATOR (current);
have_locator = TRUE;
@@ -3153,7 +3155,7 @@
if (MXF_IS_METADATA_GENERIC_DESCRIPTOR (current) &&
&self->sub_descriptors_uids[i])) {
self->sub_descriptors[i] = MXF_METADATA_GENERIC_DESCRIPTOR (current);
have_subdescriptors++;
Index: mxfmetadata.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.h,v
retrieving revision 1.1
diff -u -d -r1.1 -r1.2
--- mxfmetadata.h 15 Dec 2008 17:26:59 -0000 1.1
+++ mxfmetadata.h 16 Dec 2008 08:21:29 -0000 1.2
@@ -689,8 +689,8 @@
gchar *locator_name;
};
-gboolean mxf_metadata_parse (MXFMetadataBase *self, MXFPrimerPack *primer, const guint8 *data, guint size);
-gboolean mxf_metadata_resolve (MXFMetadataBase *self, MXFMetadataBase **metadata);
+gboolean mxf_metadata_base_parse (MXFMetadataBase *self, MXFPrimerPack *primer, const guint8 *data, guint size);
+gboolean mxf_metadata_base_resolve (MXFMetadataBase *self, MXFMetadataBase **metadata);
MXFMetadata *mxf_metadata_new (guint16 type, MXFPrimerPack *primer, const guint8 *data, guint size);
void mxf_metadata_register (guint16 type_id, GType type);
------------------------------------------------------------------------------
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