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.

1 files changed, 8 insertions, 0 deletions

diff --git a/gst/mxf/mxfparse.h b/gst/mxf/mxfparse.h
index 94a5d766..730829fe 100644
--- a/gst/mxf/mxfparse.h
+++ b/gst/mxf/mxfparse.h
@@ -20,6 +20,8 @@
 #ifndef __MXF_PARSE_H__
 #define __MXF_PARSE_H__
 
+#include <string.h>
+
 #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);