mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-06 14:45:54 +00:00
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.
This commit is contained in:
Sebastian Dröge
parent
4317cdbec0
commit
0be1824467
18
ChangeLog
18
ChangeLog
|
|
@ -1,3 +1,21 @@
|
|||
2008-11-26 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
||||
|
||||
* 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 <ds@schleef.org>
|
||||
|
||||
* gst/mpegdemux/gstmpegtsdemux.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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue