From 8fcdca999a84f831b2fdd22c6e1b8a0feda11149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 5 Jan 2009 10:22:29 +0000 Subject: [PATCH] gst/mxf/: Fix compilation with debugging disabled. Original commit message from CVS: * 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. --- ChangeLog | 29 +++++++++++++++++++++++++++++ gst/mxf/mxfaes-bwf.c | 20 ++++++++++++-------- gst/mxf/mxfdemux.c | 18 ++++++++++-------- gst/mxf/mxfmetadata.c | 36 ++++++++++++++++++++++++++++++++++++ gst/mxf/mxfparse.c | 8 ++++++++ 5 files changed, 95 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index a24e3bacf4..f1b31e0750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2009-01-05 Sebastian Dröge + + * 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 * configure.ac: diff --git a/gst/mxf/mxfaes-bwf.c b/gst/mxf/mxfaes-bwf.c index 27609b695d..37a21b42fc 100644 --- a/gst/mxf/mxfaes-bwf.c +++ b/gst/mxf/mxfaes-bwf.c @@ -125,7 +125,9 @@ mxf_metadata_wave_audio_essence_descriptor_handle_tag (MXFMetadataBase * 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 @@ mxf_bwf_create_caps (MXFMetadataTimelineTrack * track, { GstCaps *ret = NULL; MXFMetadataWaveAudioEssenceDescriptor *wa_descriptor = NULL; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif gchar *codec_name = NULL; if (MXF_IS_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR (descriptor)) @@ -812,24 +816,24 @@ mxf_aes_bwf_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags, 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. - descriptor[i]) + if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track-> + parent.descriptor[i]) && (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)) { - s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent. - descriptor[i]; + s = (MXFMetadataGenericSoundEssenceDescriptor *) track-> + parent.descriptor[i]; bwf = FALSE; break; } diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c index be6ff40e4d..6b6683c70e 100644 --- a/gst/mxf/mxfdemux.c +++ b/gst/mxf/mxfdemux.c @@ -560,11 +560,11 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux) 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; } } @@ -969,8 +969,8 @@ gst_mxf_demux_pad_next_component (GstMXFDemux * demux, GstMXFDemuxPad * pad) } 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 @@ gst_mxf_demux_pad_next_component (GstMXFDemux * demux, GstMXFDemuxPad * pad) 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"); return GST_FLOW_ERROR; } @@ -1604,7 +1604,9 @@ static GstFlowReturn gst_mxf_demux_handle_klv_packet (GstMXFDemux * demux, const MXFUL * key, GstBuffer * buffer) { +#ifndef GST_DISABLE_GST_DEBUG gchar key_str[48]; +#endif GstFlowReturn ret = GST_FLOW_OK; if (demux->update_metadata diff --git a/gst/mxf/mxfmetadata.c b/gst/mxf/mxfmetadata.c index e924ba69c9..ade8f05652 100644 --- a/gst/mxf/mxfmetadata.c +++ b/gst/mxf/mxfmetadata.c @@ -137,7 +137,9 @@ static gboolean mxf_metadata_handle_tag (MXFMetadataBase * metadata, MXFPrimerPack * primer, guint16 tag, const guint8 * tag_data, guint tag_size) { +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif MXFMetadata *self = MXF_METADATA (metadata); gboolean ret = TRUE; @@ -327,7 +329,9 @@ mxf_metadata_preface_handle_tag (MXFMetadataBase * metadata, guint tag_size) { MXFMetadataPreface *self = MXF_METADATA_PREFACE (metadata); +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif gboolean ret = TRUE; switch (tag) { @@ -565,7 +569,9 @@ mxf_metadata_identification_handle_tag (MXFMetadataBase * metadata, { MXFMetadataIdentification *self = MXF_METADATA_IDENTIFICATION (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x3c01: @@ -684,7 +690,9 @@ mxf_metadata_content_storage_handle_tag (MXFMetadataBase * metadata, { MXFMetadataContentStorage *self = MXF_METADATA_CONTENT_STORAGE (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x1901:{ @@ -841,7 +849,9 @@ mxf_metadata_essence_container_data_handle_tag (MXFMetadataBase * metadata, MXFMetadataEssenceContainerData *self = MXF_METADATA_ESSENCE_CONTAINER_DATA (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[96]; +#endif switch (tag) { case 0x2701: @@ -961,7 +971,9 @@ mxf_metadata_generic_package_handle_tag (MXFMetadataBase * metadata, { MXFMetadataGenericPackage *self = MXF_METADATA_GENERIC_PACKAGE (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[96]; +#endif switch (tag) { case 0x4401: @@ -1191,7 +1203,9 @@ mxf_metadata_source_package_handle_tag (MXFMetadataBase * metadata, { MXFMetadataSourcePackage *self = MXF_METADATA_SOURCE_PACKAGE (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x4701: @@ -1355,7 +1369,9 @@ mxf_metadata_track_handle_tag (MXFMetadataBase * metadata, { MXFMetadataTrack *self = MXF_METADATA_TRACK (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x4801: @@ -1647,7 +1663,9 @@ mxf_metadata_sequence_handle_tag (MXFMetadataBase * metadata, { MXFMetadataSequence *self = MXF_METADATA_SEQUENCE (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x0201: @@ -1773,7 +1791,9 @@ mxf_metadata_structural_component_handle_tag (MXFMetadataBase * metadata, MXFMetadataStructuralComponent *self = MXF_METADATA_STRUCTURAL_COMPONENT (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x0201: @@ -1897,7 +1917,9 @@ mxf_metadata_source_clip_handle_tag (MXFMetadataBase * metadata, { MXFMetadataSourceClip *self = MXF_METADATA_SOURCE_CLIP (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[96]; +#endif switch (tag) { case 0x1201: @@ -2096,7 +2118,9 @@ mxf_metadata_dm_segment_handle_tag (MXFMetadataBase * metadata, { MXFMetadataDMSegment *self = MXF_METADATA_DM_SEGMENT (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x0601: @@ -2241,7 +2265,9 @@ mxf_metadata_generic_descriptor_handle_tag (MXFMetadataBase * metadata, MXFMetadataGenericDescriptor *self = MXF_METADATA_GENERIC_DESCRIPTOR (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x2f01:{ @@ -2351,7 +2377,9 @@ mxf_metadata_file_descriptor_handle_tag (MXFMetadataBase * metadata, { MXFMetadataFileDescriptor *self = MXF_METADATA_FILE_DESCRIPTOR (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x3006: @@ -2430,7 +2458,9 @@ mxf_metadata_generic_picture_essence_descriptor_handle_tag (MXFMetadataBase * MXFMetadataGenericPictureEssenceDescriptor *self = MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x3215: @@ -2692,7 +2722,9 @@ mxf_metadata_generic_sound_essence_descriptor_handle_tag (MXFMetadataBase * MXFMetadataGenericSoundEssenceDescriptor *self = MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x3d03: @@ -3058,7 +3090,9 @@ mxf_metadata_generic_data_essence_descriptor_handle_tag (MXFMetadataBase * MXFMetadataGenericDataEssenceDescriptor *self = MXF_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x3e01: @@ -3130,7 +3164,9 @@ mxf_metadata_multiple_descriptor_handle_tag (MXFMetadataBase * metadata, MXFMetadataMultipleDescriptor *self = MXF_METADATA_MULTIPLE_DESCRIPTOR (metadata); gboolean ret = TRUE; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif switch (tag) { case 0x3f01:{ diff --git a/gst/mxf/mxfparse.c b/gst/mxf/mxfparse.c index 1fc59ba3c3..a3a4aa3d4b 100644 --- a/gst/mxf/mxfparse.c +++ b/gst/mxf/mxfparse.c @@ -441,7 +441,9 @@ mxf_partition_pack_parse (const MXFUL * key, MXFPartitionPack * pack, const guint8 * data, guint size) { guint i; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif g_return_val_if_fail (data != NULL, FALSE); g_return_val_if_fail (size >= 84, FALSE); @@ -632,7 +634,9 @@ mxf_index_table_segment_parse (const MXFUL * key, MXFIndexTableSegment * segment, const MXFPrimerPack * primer, const guint8 * data, guint size) { +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif guint16 tag, tag_size; const guint8 *tag_data; @@ -906,7 +910,9 @@ mxf_primer_pack_parse (const MXFUL * key, MXFPrimerPack * pack, for (i = 0; i < n; i++) { guint local_tag; +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif MXFUL *uid; local_tag = GST_READ_UINT16_BE (data); @@ -998,7 +1004,9 @@ mxf_local_tag_add_to_hash_table (const MXFPrimerPack * primer, GUINT_TO_POINTER (((guint) tag))); if (key) { +#ifndef GST_DISABLE_GST_DEBUG gchar str[48]; +#endif GST_DEBUG ("Adding local tag 0x%04x with UL %s and size %u", tag, mxf_ul_to_string (key, str), tag_size);