+2009-01-05 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * 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 <mark.nauwelaerts@collabora.co.uk>
* configure.ac:
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:
{
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))
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;
}
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;
}
}
}
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;
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;
}
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
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;
guint tag_size)
{
MXFMetadataPreface *self = MXF_METADATA_PREFACE (metadata);
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
gboolean ret = TRUE;
switch (tag) {
{
MXFMetadataIdentification *self = MXF_METADATA_IDENTIFICATION (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x3c01:
{
MXFMetadataContentStorage *self = MXF_METADATA_CONTENT_STORAGE (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x1901:{
MXFMetadataEssenceContainerData *self =
MXF_METADATA_ESSENCE_CONTAINER_DATA (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[96];
+#endif
switch (tag) {
case 0x2701:
{
MXFMetadataGenericPackage *self = MXF_METADATA_GENERIC_PACKAGE (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[96];
+#endif
switch (tag) {
case 0x4401:
{
MXFMetadataSourcePackage *self = MXF_METADATA_SOURCE_PACKAGE (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x4701:
{
MXFMetadataTrack *self = MXF_METADATA_TRACK (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x4801:
{
MXFMetadataSequence *self = MXF_METADATA_SEQUENCE (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x0201:
MXFMetadataStructuralComponent *self =
MXF_METADATA_STRUCTURAL_COMPONENT (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x0201:
{
MXFMetadataSourceClip *self = MXF_METADATA_SOURCE_CLIP (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[96];
+#endif
switch (tag) {
case 0x1201:
{
MXFMetadataDMSegment *self = MXF_METADATA_DM_SEGMENT (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x0601:
MXFMetadataGenericDescriptor *self =
MXF_METADATA_GENERIC_DESCRIPTOR (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x2f01:{
{
MXFMetadataFileDescriptor *self = MXF_METADATA_FILE_DESCRIPTOR (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x3006:
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:
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:
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:
MXFMetadataMultipleDescriptor *self =
MXF_METADATA_MULTIPLE_DESCRIPTOR (metadata);
gboolean ret = TRUE;
+#ifndef GST_DISABLE_GST_DEBUG
gchar str[48];
+#endif
switch (tag) {
case 0x3f01:{
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);
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;
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);
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);