slomo gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mxf/
[email protected] Mon, 5 Jan 2009 02:22:43 -0800 (PST)
| Newsgroups | gmane.comp.video.gstreamer.cvs |
|---|---|
| Message-ID | <[email protected]> |
--===============4460323459413056067==
CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: slomo
Date: Mon Jan 05 2009 10:22:43 UTC
Log message:
* gst/mxf/mxfaes-bwf.c:
(mxf_metadata_wave_audio_essence_descriptor_handle_tag),
(mxf_bwf_create_caps):
* gst/mxf/mxfdemux.c: (gst_mxf_demux_handle_klv_packet):
* 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_source_package_handle_tag),
(mxf_metadata_track_handle_tag),
(mxf_metadata_sequence_handle_tag),
(mxf_metadata_structural_component_handle_tag),
(mxf_metadata_source_clip_handle_tag),
(mxf_metadata_dm_segment_handle_tag),
(mxf_metadata_generic_descriptor_handle_tag),
(mxf_metadata_file_descriptor_handle_tag),
(mxf_metadata_generic_picture_essence_descriptor_handle_tag),
(mxf_metadata_generic_sound_essence_descriptor_handle_tag),
(mxf_metadata_generic_data_essence_descriptor_handle_tag),
(mxf_metadata_multiple_descriptor_handle_tag):
* gst/mxf/mxfparse.c: (mxf_partition_pack_parse),
(mxf_index_table_segment_parse), (mxf_primer_pack_parse),
(mxf_local_tag_add_to_hash_table):
Fix compilation with debugging disabled.
Modified files:
. : ChangeLog
gst/mxf : mxfaes-bwf.c mxfdemux.c mxfmetadata.c mxfparse.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3851&r2=1.3852
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfaes-bwf.c.diff?r1=1.14&r2=1.15
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.43&r2=1.44
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.c.diff?r1=1.6&r2=1.7
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfparse.c.diff?r1=1.23&r2=1.24
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3851
retrieving revision 1.3852
diff -u -d -r1.3851 -r1.3852
--- ChangeLog 5 Jan 2009 10:00:20 -0000 1.3851
+++ ChangeLog 5 Jan 2009 10:22:27 -0000 1.3852
@@ -1,3 +1,32 @@
+2009-01-05 Sebastian Dröge <[email protected]>
+
+ * gst/mxf/mxfaes-bwf.c:
+ (mxf_metadata_wave_audio_essence_descriptor_handle_tag),
+ (mxf_bwf_create_caps):
+ * gst/mxf/mxfdemux.c: (gst_mxf_demux_handle_klv_packet):
+ * 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_source_package_handle_tag),
+ (mxf_metadata_track_handle_tag),
+ (mxf_metadata_sequence_handle_tag),
+ (mxf_metadata_structural_component_handle_tag),
+ (mxf_metadata_source_clip_handle_tag),
+ (mxf_metadata_dm_segment_handle_tag),
+ (mxf_metadata_generic_descriptor_handle_tag),
+ (mxf_metadata_file_descriptor_handle_tag),
+ (mxf_metadata_generic_picture_essence_descriptor_handle_tag),
+ (mxf_metadata_generic_sound_essence_descriptor_handle_tag),
+ (mxf_metadata_generic_data_essence_descriptor_handle_tag),
+ (mxf_metadata_multiple_descriptor_handle_tag):
+ * gst/mxf/mxfparse.c: (mxf_partition_pack_parse),
+ (mxf_index_table_segment_parse), (mxf_primer_pack_parse),
+ (mxf_local_tag_add_to_hash_table):
+ Fix compilation with debugging disabled.
2009-01-05 Mark Nauwelaerts <[email protected]>
* configure.ac:
Index: mxfaes-bwf.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfaes-bwf.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mxfaes-bwf.c 31 Dec 2008 08:53:00 -0000 1.14
+++ mxfaes-bwf.c 5 Jan 2009 10:22:28 -0000 1.15
@@ -125,7 +125,9 @@
MXFMetadataWaveAudioEssenceDescriptor *self =
MXF_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x3d0a:
@@ -634,7 +636,9 @@
{
GstCaps *ret = NULL;
MXFMetadataWaveAudioEssenceDescriptor *wa_descriptor = NULL;
gchar *codec_name = NULL;
if (MXF_IS_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR (descriptor))
@@ -812,24 +816,24 @@
if (!track->parent.descriptor[i])
continue;
- if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.
- descriptor[i])
+ if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->
+ parent.descriptor[i])
&& (track->parent.descriptor[i]->essence_container.u[14] == 0x01
|| track->parent.descriptor[i]->essence_container.u[14] == 0x02
|| track->parent.descriptor[i]->essence_container.u[14] == 0x08)) {
- s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent.
- descriptor[i];
+ s = (MXFMetadataGenericSoundEssenceDescriptor *) track->
+ parent.descriptor[i];
bwf = TRUE;
break;
} else
- if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.
+ if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->
&& (track->parent.descriptor[i]->essence_container.u[14] == 0x03
|| track->parent.descriptor[i]->essence_container.u[14] == 0x04
|| track->parent.descriptor[i]->essence_container.u[14] == 0x09)) {
bwf = FALSE;
}
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- mxfdemux.c 31 Dec 2008 08:53:01 -0000 1.43
+++ mxfdemux.c 5 Jan 2009 10:22:28 -0000 1.44
@@ -560,11 +560,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]);
}
@@ -969,8 +969,8 @@
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;
@@ -978,8 +978,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");
@@ -1604,7 +1604,9 @@
gst_mxf_demux_handle_klv_packet (GstMXFDemux * demux, const MXFUL * key,
GstBuffer * buffer)
gchar key_str[48];
GstFlowReturn ret = GST_FLOW_OK;
if (demux->update_metadata
Index: mxfmetadata.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfmetadata.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mxfmetadata.c 31 Dec 2008 08:53:01 -0000 1.6
+++ mxfmetadata.c 5 Jan 2009 10:22:28 -0000 1.7
@@ -137,7 +137,9 @@
mxf_metadata_handle_tag (MXFMetadataBase * metadata, MXFPrimerPack * primer,
guint16 tag, const guint8 * tag_data, guint tag_size)
MXFMetadata *self = MXF_METADATA (metadata);
@@ -327,7 +329,9 @@
guint tag_size)
MXFMetadataPreface *self = MXF_METADATA_PREFACE (metadata);
@@ -565,7 +569,9 @@
MXFMetadataIdentification *self = MXF_METADATA_IDENTIFICATION (metadata);
case 0x3c01:
@@ -684,7 +690,9 @@
MXFMetadataContentStorage *self = MXF_METADATA_CONTENT_STORAGE (metadata);
case 0x1901:{
@@ -841,7 +849,9 @@
MXFMetadataEssenceContainerData *self =
MXF_METADATA_ESSENCE_CONTAINER_DATA (metadata);
gchar str[96];
case 0x2701:
@@ -961,7 +971,9 @@
MXFMetadataGenericPackage *self = MXF_METADATA_GENERIC_PACKAGE (metadata);
case 0x4401:
@@ -1191,7 +1203,9 @@
MXFMetadataSourcePackage *self = MXF_METADATA_SOURCE_PACKAGE (metadata);
case 0x4701:
@@ -1355,7 +1369,9 @@
MXFMetadataTrack *self = MXF_METADATA_TRACK (metadata);
case 0x4801:
@@ -1647,7 +1663,9 @@
MXFMetadataSequence *self = MXF_METADATA_SEQUENCE (metadata);
case 0x0201:
@@ -1773,7 +1791,9 @@
MXFMetadataStructuralComponent *self =
MXF_METADATA_STRUCTURAL_COMPONENT (metadata);
@@ -1897,7 +1917,9 @@
MXFMetadataSourceClip *self = MXF_METADATA_SOURCE_CLIP (metadata);
case 0x1201:
@@ -2096,7 +2118,9 @@
MXFMetadataDMSegment *self = MXF_METADATA_DM_SEGMENT (metadata);
case 0x0601:
@@ -2241,7 +2265,9 @@
MXFMetadataGenericDescriptor *self =
MXF_METADATA_GENERIC_DESCRIPTOR (metadata);
case 0x2f01:{
@@ -2351,7 +2377,9 @@
MXFMetadataFileDescriptor *self = MXF_METADATA_FILE_DESCRIPTOR (metadata);
case 0x3006:
@@ -2430,7 +2458,9 @@
MXFMetadataGenericPictureEssenceDescriptor *self =
MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (metadata);
case 0x3215:
@@ -2692,7 +2722,9 @@
MXFMetadataGenericSoundEssenceDescriptor *self =
MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (metadata);
case 0x3d03:
@@ -3058,7 +3090,9 @@
MXFMetadataGenericDataEssenceDescriptor *self =
MXF_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (metadata);
case 0x3e01:
@@ -3130,7 +3164,9 @@
MXFMetadataMultipleDescriptor *self =
MXF_METADATA_MULTIPLE_DESCRIPTOR (metadata);
case 0x3f01:{
Index: mxfparse.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfparse.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mxfparse.c 16 Dec 2008 12:30:33 -0000 1.23
+++ mxfparse.c 5 Jan 2009 10:22:29 -0000 1.24
@@ -441,7 +441,9 @@
const guint8 * data, guint size)
guint i;
g_return_val_if_fail (data != NULL, FALSE);
g_return_val_if_fail (size >= 84, FALSE);
@@ -632,7 +634,9 @@
MXFIndexTableSegment * segment, const MXFPrimerPack * primer,
guint16 tag, tag_size;
const guint8 *tag_data;
@@ -906,7 +910,9 @@
for (i = 0; i < n; i++) {
guint local_tag;
gchar str[48];
MXFUL *uid;
local_tag = GST_READ_UINT16_BE (data);
@@ -998,7 +1004,9 @@
GUINT_TO_POINTER (((guint) tag)));
if (key) {
GST_DEBUG ("Adding local tag 0x%04x with UL %s and size %u", tag,
mxf_ul_to_string (key, str), tag_size);
--===============4460323459413056067==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
------------------------------------------------------------------------------
--===============4460323459413056067==
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
--===============4460323459413056067==--