From 0be182446746b7b03026b6baf667ef5cfe4ef860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 26 Nov 2008 10:37:34 +0000 Subject: [PATCH] gst/mxf/: When memset'ing the descriptors to zeroes only touch the part of this descriptor, not it's parent type. Original commit message from CVS: * gst/mxf/mxfaes-bwf.c: (mxf_metadata_wave_audio_essence_descriptor_reset): * gst/mxf/mxfmpeg.c: (mxf_metadata_mpeg_video_descriptor_reset): * gst/mxf/mxfparse.c: (mxf_metadata_file_descriptor_handle_tag), (mxf_metadata_file_descriptor_reset), (mxf_metadata_generic_sound_essence_descriptor_reset), (mxf_metadata_generic_picture_essence_descriptor_reset), (mxf_metadata_cdci_picture_essence_descriptor_reset), (mxf_metadata_rgba_picture_essence_descriptor_reset), (mxf_metadata_multiple_descriptor_reset): * gst/mxf/mxfparse.h: When memset'ing the descriptors to zeroes only touch the part of this descriptor, not it's parent type. Set correct default values for all metadata fields. --- ChangeLog | 18 ++++++++++++++++++ gst/mxf/mxfaes-bwf.c | 4 +++- gst/mxf/mxfmpeg.c | 3 ++- gst/mxf/mxfparse.c | 32 ++++++++++++++++++++++++-------- gst/mxf/mxfparse.h | 8 ++++++++ 5 files changed, 55 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37dd3744ff..bab11989de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2008-11-26 Sebastian Dröge + + * gst/mxf/mxfaes-bwf.c: + (mxf_metadata_wave_audio_essence_descriptor_reset): + * gst/mxf/mxfmpeg.c: (mxf_metadata_mpeg_video_descriptor_reset): + * gst/mxf/mxfparse.c: (mxf_metadata_file_descriptor_handle_tag), + (mxf_metadata_file_descriptor_reset), + (mxf_metadata_generic_sound_essence_descriptor_reset), + (mxf_metadata_generic_picture_essence_descriptor_reset), + (mxf_metadata_cdci_picture_essence_descriptor_reset), + (mxf_metadata_rgba_picture_essence_descriptor_reset), + (mxf_metadata_multiple_descriptor_reset): + * gst/mxf/mxfparse.h: + When memset'ing the descriptors to zeroes only touch the part + of this descriptor, not it's parent type. + + Set correct default values for all metadata fields. + 2008-11-25 David Schleef * gst/mpegdemux/gstmpegtsdemux.c: diff --git a/gst/mxf/mxfaes-bwf.c b/gst/mxf/mxfaes-bwf.c index 7e7ddf90ed..c121d57d28 100644 --- a/gst/mxf/mxfaes-bwf.c +++ b/gst/mxf/mxfaes-bwf.c @@ -179,7 +179,9 @@ void mxf_metadata_wave_audio_essence_descriptor_reset mxf_metadata_generic_sound_essence_descriptor_reset ( (MXFMetadataGenericSoundEssenceDescriptor *) descriptor); - memset (descriptor, 0, sizeof (MXFMetadataWaveAudioEssenceDescriptor)); + MXF_METADATA_DESCRIPTOR_CLEAR (descriptor, + MXFMetadataWaveAudioEssenceDescriptor, + MXFMetadataGenericSoundEssenceDescriptor); } gboolean diff --git a/gst/mxf/mxfmpeg.c b/gst/mxf/mxfmpeg.c index 18f652ffe5..4c6e730668 100644 --- a/gst/mxf/mxfmpeg.c +++ b/gst/mxf/mxfmpeg.c @@ -190,7 +190,8 @@ void mxf_metadata_mpeg_video_descriptor_reset mxf_metadata_cdci_picture_essence_descriptor_reset ( (MXFMetadataCDCIPictureEssenceDescriptor *) descriptor); - memset (descriptor, 0, sizeof (MXFMetadataMPEGVideoDescriptor)); + MXF_METADATA_DESCRIPTOR_CLEAR (descriptor, MXFMetadataMPEGVideoDescriptor, + MXFMetadataCDCIPictureEssenceDescriptor); } gboolean diff --git a/gst/mxf/mxfparse.c b/gst/mxf/mxfparse.c index efe102b5fa..533e25616d 100644 --- a/gst/mxf/mxfparse.c +++ b/gst/mxf/mxfparse.c @@ -1894,8 +1894,6 @@ mxf_metadata_file_descriptor_handle_tag (MXFMetadataGenericDescriptor * d, gboolean ret = FALSE; gchar str[48]; - descriptor->parent.is_file_descriptor = TRUE; - switch (tag) { case 0x3006: if (tag_size != 4) @@ -1957,7 +1955,10 @@ mxf_metadata_file_descriptor_reset (MXFMetadataFileDescriptor * descriptor) mxf_metadata_generic_descriptor_reset ((MXFMetadataGenericDescriptor *) descriptor); - memset (descriptor, 0, sizeof (MXFMetadataFileDescriptor)); + MXF_METADATA_DESCRIPTOR_CLEAR (descriptor, MXFMetadataFileDescriptor, + MXFMetadataGenericDescriptor); + + descriptor->parent.is_file_descriptor = TRUE; } gboolean @@ -2053,7 +2054,11 @@ void mxf_metadata_generic_sound_essence_descriptor_reset mxf_metadata_file_descriptor_reset ((MXFMetadataFileDescriptor *) descriptor); - memset (descriptor, 0, sizeof (MXFMetadataGenericSoundEssenceDescriptor)); + MXF_METADATA_DESCRIPTOR_CLEAR (descriptor, + MXFMetadataGenericSoundEssenceDescriptor, MXFMetadataFileDescriptor); + + descriptor->audio_sampling_rate.n = 48000; + descriptor->audio_sampling_rate.d = 1; } gboolean @@ -2275,7 +2280,10 @@ void mxf_metadata_generic_picture_essence_descriptor_reset mxf_metadata_file_descriptor_reset ((MXFMetadataFileDescriptor *) descriptor); - memset (descriptor, 0, sizeof (MXFMetadataGenericPictureEssenceDescriptor)); + MXF_METADATA_DESCRIPTOR_CLEAR (descriptor, + MXFMetadataGenericPictureEssenceDescriptor, MXFMetadataFileDescriptor); + + descriptor->signal_standard = 1; } void mxf_metadata_generic_picture_essence_descriptor_set_caps @@ -2412,7 +2420,9 @@ void mxf_metadata_cdci_picture_essence_descriptor_reset mxf_metadata_generic_picture_essence_descriptor_reset ( (MXFMetadataGenericPictureEssenceDescriptor *) descriptor); - memset (descriptor, 0, sizeof (MXFMetadataCDCIPictureEssenceDescriptor)); + MXF_METADATA_DESCRIPTOR_CLEAR (descriptor, + MXFMetadataCDCIPictureEssenceDescriptor, + MXFMetadataGenericPictureEssenceDescriptor); } gboolean @@ -2485,7 +2495,12 @@ void mxf_metadata_rgba_picture_essence_descriptor_reset mxf_metadata_generic_picture_essence_descriptor_reset ( (MXFMetadataGenericPictureEssenceDescriptor *) descriptor); - memset (descriptor, 0, sizeof (MXFMetadataRGBAPictureEssenceDescriptor)); + MXF_METADATA_DESCRIPTOR_CLEAR (descriptor, + MXFMetadataRGBAPictureEssenceDescriptor, + MXFMetadataGenericPictureEssenceDescriptor); + + descriptor->component_max_ref = 255; + descriptor->alpha_max_ref = 255; } gboolean @@ -2550,7 +2565,8 @@ void mxf_metadata_multiple_descriptor_reset mxf_metadata_file_descriptor_reset ((MXFMetadataFileDescriptor *) descriptor); - memset (descriptor, 0, sizeof (MXFMetadataMultipleDescriptor)); + MXF_METADATA_DESCRIPTOR_CLEAR (descriptor, MXFMetadataMultipleDescriptor, + MXFMetadataFileDescriptor); } gboolean diff --git a/gst/mxf/mxfparse.h b/gst/mxf/mxfparse.h index 94a5d766d6..730829fe59 100644 --- a/gst/mxf/mxfparse.h +++ b/gst/mxf/mxfparse.h @@ -20,6 +20,8 @@ #ifndef __MXF_PARSE_H__ #define __MXF_PARSE_H__ +#include + #include "mxftypes.h" typedef GstFlowReturn (*MXFEssenceElementHandler) (const MXFUL *key, GstBuffer *buffer, GstCaps *caps, MXFMetadataGenericPackage *package, MXFMetadataTrack *track, MXFMetadataStructuralComponent *component, gpointer mapping_data, GstBuffer **outbuf); @@ -111,6 +113,12 @@ void mxf_metadata_structural_component_reset (MXFMetadataStructuralComponent *co gboolean mxf_metadata_descriptor_parse (const MXFUL * key, MXFMetadataGenericDescriptor * descriptor, const MXFPrimerPack * primer, guint16 type, const guint8 * data, guint size, MXFMetadataDescriptorHandleTag handle_tag, MXFMetadataDescriptorReset reset); +#define MXF_METADATA_DESCRIPTOR_CLEAR(descriptor, type, parent_type) \ + G_STMT_START { \ + guint8 *___data = (guint8 *) descriptor + sizeof (parent_type); \ + memset (___data, 0, sizeof (type) - sizeof (parent_type)); \ + } G_STMT_END + gboolean mxf_metadata_generic_descriptor_handle_tag (MXFMetadataGenericDescriptor *descriptor, const MXFPrimerPack *primer, guint16 tag, const guint8 *tag_data, guint16 tag_size); void mxf_metadata_generic_descriptor_reset (MXFMetadataGenericDescriptor *descriptor);