mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/mxf/: Add mxf_metadata_generic_sound_essence_descriptor_set_caps() to set rate and channels and use this for all ...

Browse source 
Original commit message from CVS:
* gst/mxf/mxfaes-bwf.c: (mxf_bwf_create_caps),
(mxf_aes3_create_caps):
* gst/mxf/mxfalaw.c: (mxf_alaw_create_caps):
* gst/mxf/mxfd10.c: (mxf_d10_create_caps):
* gst/mxf/mxfdemux.c:
* gst/mxf/mxfmetadata.c: (mxf_metadata_source_package_resolve),
(mxf_metadata_generic_picture_essence_descriptor_set_caps),
(mxf_metadata_generic_sound_essence_descriptor_set_caps):
* gst/mxf/mxfmetadata.h:
* gst/mxf/mxfmpeg.c: (mxf_mpeg_es_create_caps):
Add mxf_metadata_generic_sound_essence_descriptor_set_caps() to
set rate and channels and use this for all sound essence.
Give some debug output when setting picture essence caps with
invalid descriptor values.
Fix height calculation from the frame layout a bit more and
add a TODO to check if it's really correct now or if it needs
more fixing (especially, does the framerate need adjustments?).
This commit is contained in:
Sebastian Dröge 2008-12-19 10:06:24 +00:00
parent ecc0e9221f
commit 083d8c7018
8 changed files with 115 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ChangeLog
View file

@ -1,3 +1,25 @@
2008-12-19 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/mxf/mxfaes-bwf.c: (mxf_bwf_create_caps),
(mxf_aes3_create_caps):
* gst/mxf/mxfalaw.c: (mxf_alaw_create_caps):
* gst/mxf/mxfd10.c: (mxf_d10_create_caps):
* gst/mxf/mxfdemux.c:
* gst/mxf/mxfmetadata.c: (mxf_metadata_source_package_resolve),
(mxf_metadata_generic_picture_essence_descriptor_set_caps),
(mxf_metadata_generic_sound_essence_descriptor_set_caps):
* gst/mxf/mxfmetadata.h:
* gst/mxf/mxfmpeg.c: (mxf_mpeg_es_create_caps):
Add mxf_metadata_generic_sound_essence_descriptor_set_caps() to
set rate and channels and use this for all sound essence.
Give some debug output when setting picture essence caps with
invalid descriptor values.
Fix height calculation from the frame layout a bit more and
add a TODO to check if it's really correct now or if it needs
more fixing (especially, does the framerate need adjustments?).
2008-12-18 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-12-18 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/mxf/Makefile.am: * gst/mxf/Makefile.am:

44
gst/mxf/mxfaes-bwf.c
View file

@ -664,14 +664,13 @@ mxf_bwf_create_caps (MXFMetadataTimelineTrack * track,
descriptor->channel_count) / 8; descriptor->channel_count) / 8;
ret = gst_caps_new_simple ("audio/x-raw-int", ret = gst_caps_new_simple ("audio/x-raw-int",
"rate", G_TYPE_INT, "signed", G_TYPE_BOOLEAN,
(gint) (((gdouble) descriptor->audio_sampling_rate.n) /
((gdouble) descriptor->audio_sampling_rate.d) + 0.5), "channels",
G_TYPE_INT, descriptor->channel_count, "signed", G_TYPE_BOOLEAN,
(block_align != 1), "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, "depth", (block_align != 1), "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, "depth",
G_TYPE_INT, (block_align / descriptor->channel_count) * 8, "width", G_TYPE_INT, (block_align / descriptor->channel_count) * 8, "width",
G_TYPE_INT, (block_align / descriptor->channel_count) * 8, NULL); G_TYPE_INT, (block_align / descriptor->channel_count) * 8, NULL);
mxf_metadata_generic_sound_essence_descriptor_set_caps (descriptor, ret);
codec_name = codec_name =
g_strdup_printf ("Uncompressed %u-bit little endian integer PCM audio", g_strdup_printf ("Uncompressed %u-bit little endian integer PCM audio",
(block_align / descriptor->channel_count) * 8); (block_align / descriptor->channel_count) * 8);
@ -695,14 +694,13 @@ mxf_bwf_create_caps (MXFMetadataTimelineTrack * track,
descriptor->channel_count) / 8; descriptor->channel_count) / 8;
ret = gst_caps_new_simple ("audio/x-raw-int", ret = gst_caps_new_simple ("audio/x-raw-int",
"rate", G_TYPE_INT, "signed", G_TYPE_BOOLEAN,
(gint) (((gdouble) descriptor->audio_sampling_rate.n) /
((gdouble) descriptor->audio_sampling_rate.d) + 0.5), "channels",
G_TYPE_INT, descriptor->channel_count, "signed", G_TYPE_BOOLEAN,
(block_align != 1), "endianness", G_TYPE_INT, G_BIG_ENDIAN, "depth", (block_align != 1), "endianness", G_TYPE_INT, G_BIG_ENDIAN, "depth",
G_TYPE_INT, (block_align / descriptor->channel_count) * 8, "width", G_TYPE_INT, (block_align / descriptor->channel_count) * 8, "width",
G_TYPE_INT, (block_align / descriptor->channel_count) * 8, NULL); G_TYPE_INT, (block_align / descriptor->channel_count) * 8, NULL);
mxf_metadata_generic_sound_essence_descriptor_set_caps (descriptor, ret);
codec_name = codec_name =
g_strdup_printf ("Uncompressed %u-bit big endian integer PCM audio", g_strdup_printf ("Uncompressed %u-bit big endian integer PCM audio",
(block_align / descriptor->channel_count) * 8); (block_align / descriptor->channel_count) * 8);
@ -715,10 +713,9 @@ mxf_bwf_create_caps (MXFMetadataTimelineTrack * track,
GST_ERROR ("Invalid descriptor"); GST_ERROR ("Invalid descriptor");
return NULL; return NULL;
} }
ret = gst_caps_new_simple ("audio/x-alaw", "rate", G_TYPE_INT, ret = gst_caps_new_simple ("audio/x-alaw", NULL);
(gint) (((gdouble) descriptor->audio_sampling_rate.n) / mxf_metadata_generic_sound_essence_descriptor_set_caps (descriptor, ret);
((gdouble) descriptor->audio_sampling_rate.d) + 0.5),
"channels", G_TYPE_INT, descriptor->channel_count);
codec_name = g_strdup ("A-law encoded audio"); codec_name = g_strdup ("A-law encoded audio");
} else { } else {
GST_ERROR ("Unsupported sound essence compression: %s", GST_ERROR ("Unsupported sound essence compression: %s",
@ -773,14 +770,13 @@ mxf_aes3_create_caps (MXFMetadataTimelineTrack * track,
descriptor->channel_count) / 8; descriptor->channel_count) / 8;
ret = gst_caps_new_simple ("audio/x-raw-int", ret = gst_caps_new_simple ("audio/x-raw-int",
"rate", G_TYPE_INT, "signed", G_TYPE_BOOLEAN,
(gint) (((gdouble) descriptor->audio_sampling_rate.n) /
((gdouble) descriptor->audio_sampling_rate.d) + 0.5), "channels",
G_TYPE_INT, descriptor->channel_count, "signed", G_TYPE_BOOLEAN,
(block_align != 1), "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, "depth", (block_align != 1), "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, "depth",
G_TYPE_INT, (block_align / descriptor->channel_count) * 8, "width", G_TYPE_INT, (block_align / descriptor->channel_count) * 8, "width",
G_TYPE_INT, (block_align / descriptor->channel_count) * 8, NULL); G_TYPE_INT, (block_align / descriptor->channel_count) * 8, NULL);
mxf_metadata_generic_sound_essence_descriptor_set_caps (descriptor, ret);
codec_name = codec_name =
g_strdup_printf ("Uncompressed %u-bit AES3 audio", g_strdup_printf ("Uncompressed %u-bit AES3 audio",
(block_align / descriptor->channel_count) * 8); (block_align / descriptor->channel_count) * 8);
@ -816,24 +812,24 @@ mxf_aes_bwf_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
if (!track->parent.descriptor[i]) if (!track->parent.descriptor[i])
continue; continue;
if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent. if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->
descriptor[i]) parent.descriptor[i])
&& (track->parent.descriptor[i]->essence_container.u[14] == 0x01 && (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] == 0x02
|| track->parent.descriptor[i]->essence_container.u[14] == 0x08)) { || track->parent.descriptor[i]->essence_container.u[14] == 0x08)) {
s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent. s = (MXFMetadataGenericSoundEssenceDescriptor *) track->
descriptor[i]; parent.descriptor[i];
bwf = TRUE; bwf = TRUE;
break; break;
} else } else
if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent. if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->
descriptor[i]) parent.descriptor[i])
&& (track->parent.descriptor[i]->essence_container.u[14] == 0x03 && (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] == 0x04
|| track->parent.descriptor[i]->essence_container.u[14] == 0x09)) { || track->parent.descriptor[i]->essence_container.u[14] == 0x09)) {
s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent. s = (MXFMetadataGenericSoundEssenceDescriptor *) track->
descriptor[i]; parent.descriptor[i];
bwf = FALSE; bwf = FALSE;
break; break;
} }

14
gst/mxf/mxfalaw.c
View file

@ -100,10 +100,10 @@ mxf_alaw_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
if (!track->parent.descriptor[i]) if (!track->parent.descriptor[i])
continue; continue;
if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent. if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->
descriptor[i])) { parent.descriptor[i])) {
s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent. s = (MXFMetadataGenericSoundEssenceDescriptor *) track->
descriptor[i]; parent.descriptor[i];
break; break;
} }
} }
@ -118,10 +118,8 @@ mxf_alaw_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
if (s && s->audio_sampling_rate.n != 0 && s->audio_sampling_rate.d != 0 && if (s && s->audio_sampling_rate.n != 0 && s->audio_sampling_rate.d != 0 &&
s->channel_count != 0) { s->channel_count != 0) {
caps = gst_caps_new_simple ("audio/x-alaw", "rate", G_TYPE_INT, caps = gst_caps_new_simple ("audio/x-alaw", NULL);
(gint) (((gdouble) s->audio_sampling_rate.n) / mxf_metadata_generic_sound_essence_descriptor_set_caps (s, caps);
((gdouble) s->audio_sampling_rate.d) + 0.5),
"channels", G_TYPE_INT, s->channel_count, NULL);
/* TODO: Handle channel layout somehow? /* TODO: Handle channel layout somehow?
* Or is alaw limited to two channels? */ * Or is alaw limited to two channels? */

23
gst/mxf/mxfd10.c
View file

@ -175,15 +175,15 @@ mxf_d10_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
if (!track->parent.descriptor[i]) if (!track->parent.descriptor[i])
continue; continue;
if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track-> if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[i])) { descriptor[i])) {
p = (MXFMetadataGenericPictureEssenceDescriptor *) track->parent. p = (MXFMetadataGenericPictureEssenceDescriptor *) track->
descriptor[i]; parent.descriptor[i];
break; break;
} else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track-> } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[i])) { descriptor[i])) {
s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent. s = (MXFMetadataGenericSoundEssenceDescriptor *) track->
descriptor[i]; parent.descriptor[i];
break; break;
} }
} }
@ -214,14 +214,13 @@ mxf_d10_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
/* FIXME: set channel layout */ /* FIXME: set channel layout */
caps = gst_caps_new_simple ("audio/x-raw-int", caps = gst_caps_new_simple ("audio/x-raw-int",
"rate", G_TYPE_INT, "signed", G_TYPE_BOOLEAN,
(gint) (((gdouble) s->audio_sampling_rate.n) /
((gdouble) s->audio_sampling_rate.d) + 0.5), "channels",
G_TYPE_INT, s->channel_count, "signed", G_TYPE_BOOLEAN,
(s->quantization_bits != 8), "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, (s->quantization_bits != 8), "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
"depth", G_TYPE_INT, s->quantization_bits, "width", G_TYPE_INT, "depth", G_TYPE_INT, s->quantization_bits, "width", G_TYPE_INT,
s->quantization_bits, NULL); s->quantization_bits, NULL);
mxf_metadata_generic_sound_essence_descriptor_set_caps (s, caps);
*handler = mxf_d10_sound_handle_essence_element; *handler = mxf_d10_sound_handle_essence_element;
data = g_new0 (MXFD10AudioMappingData, 1); data = g_new0 (MXFD10AudioMappingData, 1);

9
gst/mxf/mxfdemux.c
View file

@ -54,6 +54,7 @@
* - Multichannel audio needs channel layouts, define them (SMPTE S320M?). * - Multichannel audio needs channel layouts, define them (SMPTE S320M?).
* - Correctly handle the different rectangles and aspect-ratio for video * - Correctly handle the different rectangles and aspect-ratio for video
* - Add support for non-standard MXF used by Avid (bug #561922). * - Add support for non-standard MXF used by Avid (bug #561922).
* - Fix frame layout stuff, i.e. interlaced/progressive
* *
* - Implement SMPTE D11 essence and the digital cinema/MXF specs * - Implement SMPTE D11 essence and the digital cinema/MXF specs
* *
@ -554,11 +555,11 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux)
for (i = 0; i < demux->preface->content_storage->n_packages; i++) { for (i = 0; i < demux->preface->content_storage->n_packages; i++) {
if (demux->preface->content_storage->packages[i] && if (demux->preface->content_storage->packages[i] &&
MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->content_storage-> MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->
packages[i])) { content_storage->packages[i])) {
ret = ret =
MXF_METADATA_GENERIC_PACKAGE (demux->preface->content_storage-> MXF_METADATA_GENERIC_PACKAGE (demux->preface->
packages[i]); content_storage->packages[i]);
break; break;
} }
} }

42
gst/mxf/mxfmetadata.c
View file

@ -1301,6 +1301,10 @@ mxf_metadata_source_package_resolve (MXFMetadataBase * m,
} }
} }
/* TODO: Check if there is a EssenceContainerData for this source package
* and store this in the source package instance. Without
* EssenceContainerData this package must be external */
return ret; return ret;
} }
@ -2628,8 +2632,12 @@ void mxf_metadata_generic_picture_essence_descriptor_set_caps
g_return_if_fail (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (self)); g_return_if_fail (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (self));
g_return_if_fail (GST_IS_CAPS (caps)); g_return_if_fail (GST_IS_CAPS (caps));
if (f->sample_rate.d == 0) {
GST_ERROR ("Invalid framerate");
} else {
gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION, f->sample_rate.n, gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION, f->sample_rate.n,
f->sample_rate.d, NULL); f->sample_rate.d, NULL);
}
width = self->stored_width; width = self->stored_width;
height = self->stored_height; height = self->stored_height;
@ -2640,17 +2648,22 @@ void mxf_metadata_generic_picture_essence_descriptor_set_caps
* *
* See SMPTE 377M E2.2 and E1.2 * See SMPTE 377M E2.2 and E1.2
*/ */
if (self->frame_layout != 0) if (self->frame_layout == 1 || self->frame_layout == 2
|| self->frame_layout == 4)
height *= 2; height *= 2;
if (width == 0 || height == 0) if (width == 0 || height == 0) {
GST_ERROR ("Invalid width/height");
return; return;
}
gst_caps_set_simple (caps, "width", G_TYPE_INT, width, "height", G_TYPE_INT, gst_caps_set_simple (caps, "width", G_TYPE_INT, width, "height", G_TYPE_INT,
height, NULL); height, NULL);
if (self->aspect_ratio.n == 0 || self->aspect_ratio.d == 0) if (self->aspect_ratio.n == 0 || self->aspect_ratio.d == 0) {
GST_ERROR ("Invalid aspect ratio");
return; return;
}
par_n = height * self->aspect_ratio.n; par_n = height * self->aspect_ratio.n;
par_d = width * self->aspect_ratio.d; par_d = width * self->aspect_ratio.d;
@ -2761,6 +2774,29 @@ static void
mxf_metadata_generic_sound_essence_descriptor_handle_tag; mxf_metadata_generic_sound_essence_descriptor_handle_tag;
} }
void mxf_metadata_generic_sound_essence_descriptor_set_caps
(MXFMetadataGenericSoundEssenceDescriptor * self, GstCaps * caps)
{
g_return_if_fail (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (self));
g_return_if_fail (GST_IS_CAPS (caps));
if (self->audio_sampling_rate.n == 0 || self->audio_sampling_rate.d == 0) {
GST_ERROR ("Invalid audio sampling rate");
} else {
gst_caps_set_simple (caps,
"rate", G_TYPE_INT,
(gint) ((((gdouble) self->audio_sampling_rate.n) /
((gdouble) self->audio_sampling_rate.d)) + 0.5), NULL);
}
if (self->channel_count == 0) {
GST_ERROR ("Invalid number of channels (0)");
} else {
gst_caps_set_simple (caps, "channels", G_TYPE_INT, self->channel_count,
NULL);
}
}
G_DEFINE_TYPE (MXFMetadataCDCIPictureEssenceDescriptor, G_DEFINE_TYPE (MXFMetadataCDCIPictureEssenceDescriptor,
mxf_metadata_cdci_picture_essence_descriptor, mxf_metadata_cdci_picture_essence_descriptor,
MXF_TYPE_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR); MXF_TYPE_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR);

1
gst/mxf/mxfmetadata.h
View file

@ -699,5 +699,6 @@ void mxf_metadata_init_types (void);
MXFMetadataTrackType mxf_metadata_track_identifier_parse (const MXFUL * track_identifier); MXFMetadataTrackType mxf_metadata_track_identifier_parse (const MXFUL * track_identifier);
void mxf_metadata_generic_picture_essence_descriptor_set_caps (MXFMetadataGenericPictureEssenceDescriptor * self, GstCaps * caps); void mxf_metadata_generic_picture_essence_descriptor_set_caps (MXFMetadataGenericPictureEssenceDescriptor * self, GstCaps * caps);
void mxf_metadata_generic_sound_essence_descriptor_set_caps (MXFMetadataGenericSoundEssenceDescriptor * self, GstCaps * caps);
#endif /* __MXF_METADATA_H__ */ #endif /* __MXF_METADATA_H__ */

25
gst/mxf/mxfmpeg.c
View file

@ -435,14 +435,7 @@ mxf_mpeg_es_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
} }
if (caps) { if (caps) {
if (s->audio_sampling_rate.n != 0 && s->audio_sampling_rate.d != 0) mxf_metadata_generic_sound_essence_descriptor_set_caps (s, caps);
gst_caps_set_simple (caps, "rate", G_TYPE_INT,
(gint) (((gdouble) s->audio_sampling_rate.n) /
((gdouble) s->audio_sampling_rate.d) + 0.5), NULL);
if (s->channel_count != 0)
gst_caps_set_simple (caps, "channels", G_TYPE_INT, s->channel_count,
NULL);
*handler = mxf_mpeg_audio_handle_essence_element; *handler = mxf_mpeg_audio_handle_essence_element;
} }
} }
@ -479,17 +472,17 @@ mxf_mpeg_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
if (!track->parent.descriptor[i]) if (!track->parent.descriptor[i])
continue; continue;
if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track-> if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[i])) { descriptor[i])) {
f = track->parent.descriptor[i]; f = track->parent.descriptor[i];
p = (MXFMetadataGenericPictureEssenceDescriptor *) track->parent. p = (MXFMetadataGenericPictureEssenceDescriptor *) track->
descriptor[i]; parent.descriptor[i];
break; break;
} else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track-> } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[i])) { descriptor[i])) {
f = track->parent.descriptor[i]; f = track->parent.descriptor[i];
s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent. s = (MXFMetadataGenericSoundEssenceDescriptor *) track->
descriptor[i]; parent.descriptor[i];
break; break;
} }
} }