slomo gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mxf/
[email protected] Mon, 15 Dec 2008 10:12:41 -0800 (PST)
| Newsgroups | gmane.comp.video.gstreamer.cvs |
|---|---|
| Message-ID | <[email protected]> |
CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: slomo
Date: Mon Dec 15 2008 18:12:41 UTC
Log message:
* gst/mxf/mxfaes-bwf.c:
(mxf_metadata_wave_audio_essence_descriptor_handle_tag),
(mxf_metadata_aes3_audio_essence_descriptor_handle_tag):
* gst/mxf/mxfmetadata.c:
(mxf_metadata_multiple_descriptor_handle_tag):
Return FALSE when parsing a metadata tag failed.
Remove some useless return value assignments.
Modified files:
. : ChangeLog
gst/mxf : mxfaes-bwf.c mxfmetadata.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3811&r2=1.3812
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfaes-bwf.c.diff?r1=1.10&r2=1.11
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.c.diff?r1=1.1&r2=1.2
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3811
retrieving revision 1.3812
diff -u -d -r1.3811 -r1.3812
--- ChangeLog 15 Dec 2008 17:26:56 -0000 1.3811
+++ ChangeLog 15 Dec 2008 18:12:25 -0000 1.3812
@@ -1,5 +1,15 @@
2008-12-15 Sebastian Dröge <[email protected]>
+ * gst/mxf/mxfaes-bwf.c:
+ (mxf_metadata_wave_audio_essence_descriptor_handle_tag),
+ (mxf_metadata_aes3_audio_essence_descriptor_handle_tag):
+ * gst/mxf/mxfmetadata.c:
+ (mxf_metadata_multiple_descriptor_handle_tag):
+ Return FALSE when parsing a metadata tag failed.
+ Remove some useless return value assignments.
+
+2008-12-15 Sebastian Dröge <[email protected]>
* gst/mxf/Makefile.am:
* gst/mxf/mxf.c: (plugin_init):
* gst/mxf/mxfaes-bwf.c:
Index: mxfaes-bwf.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfaes-bwf.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mxfaes-bwf.c 15 Dec 2008 17:26:58 -0000 1.10
+++ mxfaes-bwf.c 15 Dec 2008 18:12:26 -0000 1.11
@@ -147,8 +147,8 @@
default:
ret =
MXF_METADATA_BASE_CLASS
- (mxf_metadata_wave_audio_essence_descriptor_parent_class)->
- handle_tag (metadata, primer, tag, tag_data, tag_size);
+ (mxf_metadata_wave_audio_essence_descriptor_parent_class)->handle_tag
+ (metadata, primer, tag, tag_data, tag_size);
break;
}
@@ -160,7 +160,7 @@
("Invalid wave audio essence descriptor local tag 0x%04x of size %u", tag,
tag_size);
- return TRUE;
+ return FALSE;
}
static void
@@ -201,8 +201,8 @@
self->fixed_user_data = NULL;
GST_MINI_OBJECT_CLASS
- (mxf_metadata_aes3_audio_essence_descriptor_parent_class)->
- finalize (object);
+ (mxf_metadata_aes3_audio_essence_descriptor_parent_class)->finalize
+ (object);
static gboolean
@@ -220,21 +220,18 @@
goto error;
self->emphasis = GST_READ_UINT8 (tag_data);
GST_DEBUG (" emphasis = %u", self->emphasis);
- ret = TRUE;
case 0x3d0f:
if (tag_size != 2)
self->block_start_offset = GST_READ_UINT16_BE (tag_data);
GST_DEBUG (" block start offset = %u", self->block_start_offset);
case 0x3d08:
if (tag_size != 1)
self->auxiliary_bits_mode = GST_READ_UINT8 (tag_data);
GST_DEBUG (" auxiliary bits mode = %u", self->auxiliary_bits_mode);
case 0x3d10:{
guint32 len;
@@ -267,7 +264,6 @@
tag_size--;
}
}
case 0x3d11:{
@@ -331,7 +327,6 @@
tag_size -= 24;
case 0x3d12:{
@@ -364,7 +359,6 @@
case 0x3d13:{
@@ -426,7 +420,6 @@
/* TODO: linked timecode track / data_stream_number parsing, see
@@ -434,8 +427,8 @@
- (mxf_metadata_aes3_audio_essence_descriptor_parent_class)->
+ (mxf_metadata_aes3_audio_essence_descriptor_parent_class)->handle_tag
@@ -447,7 +440,7 @@
("Invalid AES3 audio essence descriptor local tag 0x%04x of size %u", tag,
@@ -761,8 +754,9 @@
s = (MXFMetadataGenericSoundEssenceDescriptor *) track->descriptor[i];
bwf = TRUE;
- } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->
- descriptor[i])
+ } else
+ if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->descriptor
+ [i])
&& (track->descriptor[i]->essence_container.u[14] == 0x03
|| track->descriptor[i]->essence_container.u[14] == 0x04
|| track->descriptor[i]->essence_container.u[14] == 0x09)) {
Index: mxfmetadata.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mxfmetadata.c 15 Dec 2008 17:26:59 -0000 1.1
+++ mxfmetadata.c 15 Dec 2008 18:12:26 -0000 1.2
@@ -151,8 +151,8 @@
- MXF_METADATA_BASE_CLASS (mxf_metadata_parent_class)->
+ MXF_METADATA_BASE_CLASS (mxf_metadata_parent_class)->handle_tag
@@ -444,8 +444,9 @@
- MXF_METADATA_BASE_CLASS (mxf_metadata_preface_parent_class)->
+ MXF_METADATA_BASE_CLASS
+ (mxf_metadata_preface_parent_class)->handle_tag (metadata, primer,
+ tag, tag_data, tag_size);
@@ -503,8 +504,9 @@
return FALSE;
- return MXF_METADATA_BASE_CLASS (mxf_metadata_preface_parent_class)->
- resolve (m, metadata);
+ return
+ MXF_METADATA_BASE_CLASS (mxf_metadata_preface_parent_class)->resolve (m,
+ metadata);
@@ -798,8 +800,9 @@
- return MXF_METADATA_BASE_CLASS (mxf_metadata_content_storage_parent_class)->
+ MXF_METADATA_BASE_CLASS
+ (mxf_metadata_content_storage_parent_class)->resolve (m, metadata);
@@ -1076,8 +1079,9 @@
- return MXF_METADATA_BASE_CLASS (mxf_metadata_generic_package_parent_class)->
+ (mxf_metadata_generic_package_parent_class)->resolve (m, metadata);
@@ -1105,8 +1109,8 @@
MXFMetadataBase ** metadata)
{
gboolean ret =
- MXF_METADATA_BASE_CLASS (mxf_metadata_material_package_parent_class)->
+ (mxf_metadata_material_package_parent_class)->resolve (m, metadata);
MXFMetadataGenericPackage *self = MXF_METADATA_GENERIC_PACKAGE (m);
guint i;
@@ -1221,8 +1225,9 @@
MXFMetadataGenericDescriptor *d = NULL;
if (mxf_ul_is_zero (&self->descriptors_uid))
- return MXF_METADATA_BASE_CLASS (mxf_metadata_source_package_parent_class)->
- resolve (m, metadata);
+ return
+ MXF_METADATA_BASE_CLASS
+ (mxf_metadata_source_package_parent_class)->resolve (m, metadata);
while (*p) {
current = *p;
@@ -1261,8 +1266,8 @@
ret =
- MXF_METADATA_BASE_CLASS (mxf_metadata_source_package_parent_class)->
+ (mxf_metadata_source_package_parent_class)->resolve (m, metadata);
for (i = 0; i < package->n_tracks; i++) {
guint n_descriptor = 0, k = 0;
@@ -1721,8 +1726,9 @@
- return MXF_METADATA_BASE_CLASS (mxf_metadata_sequence_parent_class)->
+ MXF_METADATA_BASE_CLASS (mxf_metadata_sequence_parent_class)->resolve (m,
@@ -1941,8 +1947,9 @@
p++;
- return MXF_METADATA_BASE_CLASS (mxf_metadata_source_clip_parent_class)->
+ MXF_METADATA_BASE_CLASS (mxf_metadata_source_clip_parent_class)->resolve
+ (m, metadata);
@@ -2173,8 +2180,9 @@
- return MXF_METADATA_BASE_CLASS (mxf_metadata_dm_segment_parent_class)->
+ MXF_METADATA_BASE_CLASS (mxf_metadata_dm_segment_parent_class)->resolve
@@ -2298,8 +2306,8 @@
return
- MXF_METADATA_BASE_CLASS (mxf_metadata_generic_descriptor_parent_class)->
+ (mxf_metadata_generic_descriptor_parent_class)->resolve (m, metadata);
@@ -3064,8 +3072,8 @@
g_free (self->sub_descriptors);
self->sub_descriptors = NULL;
- GST_MINI_OBJECT_CLASS (mxf_metadata_multiple_descriptor_parent_class)->
+ GST_MINI_OBJECT_CLASS
+ (mxf_metadata_multiple_descriptor_parent_class)->finalize (object);
@@ -3125,7 +3133,7 @@
GST_ERROR ("Invalid multiple descriptor local tag 0x%04x of size %u", tag,
@@ -3161,8 +3169,8 @@
- MXF_METADATA_BASE_CLASS (mxf_metadata_multiple_descriptor_parent_class)->
+ (mxf_metadata_multiple_descriptor_parent_class)->resolve (m, metadata);
------------------------------------------------------------------------------
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