diff --git a/ChangeLog b/ChangeLog index 64760331e7..1b76298eb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-11-28 Sebastian Dröge + + * gst/mxf/Makefile.am: + * gst/mxf/mxfaes-bwf.c: (mxf_bwf_create_caps): + * gst/mxf/mxfalaw.c: (mxf_is_alaw_audio_essence_track), + (mxf_alaw_handle_essence_element), (mxf_alaw_create_caps): + * gst/mxf/mxfalaw.h: + * gst/mxf/mxfdemux.c: + (gst_mxf_demux_handle_header_metadata_update_streams): + Add support for A-Law encoded audio essence (SMPTE 388M and 382M). + 2008-11-28 Sebastian Dröge * gst/mxf/mxfdemux.c: (gst_mxf_demux_reset), diff --git a/gst/mxf/Makefile.am b/gst/mxf/Makefile.am index 6b1529f590..61f15456ed 100644 --- a/gst/mxf/Makefile.am +++ b/gst/mxf/Makefile.am @@ -6,7 +6,8 @@ libgstmxf_la_SOURCES = \ mxfparse.c \ mxfaes-bwf.c \ mxfmpeg.c \ - mxfdv-dif.c + mxfdv-dif.c \ + mxfalaw.c libgstmxf_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) @@ -18,5 +19,6 @@ noinst_HEADERS = \ mxfaes-bwf.h \ mxfmpeg.h \ mxfdv-dif.h \ + mxfalaw.h \ mxftypes.h diff --git a/gst/mxf/mxfaes-bwf.c b/gst/mxf/mxfaes-bwf.c index c121d57d28..ba2bc2efeb 100644 --- a/gst/mxf/mxfaes-bwf.c +++ b/gst/mxf/mxfaes-bwf.c @@ -244,6 +244,11 @@ static const MXFUL mxf_sound_essence_compression_aiff = 0x7E, 0x00, 0x00, 0x00} }; +static const MXFUL mxf_sound_essence_compression_alaw = + { {0x06, 0x0E, 0x2B, 0x34, 0x04, 0x01, 0x01, 0x03, 0x04, 0x02, 0x02, 0x02, + 0x03, 0x01, 0x01, 0x00} +}; + static GstCaps * mxf_bwf_create_caps (MXFMetadataGenericPackage * package, MXFMetadataTrack * track, @@ -313,6 +318,19 @@ mxf_bwf_create_caps (MXFMetadataGenericPackage * package, (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, NULL); + } else if (mxf_ul_is_equal (&descriptor->sound_essence_compression, + &mxf_sound_essence_compression_alaw)) { + + if (descriptor->audio_sampling_rate.n != 0 || + descriptor->audio_sampling_rate.d != 0 || + descriptor->channel_count != 0) { + GST_ERROR ("Invalid descriptor"); + return NULL; + } + ret = gst_caps_new_simple ("audio/x-alaw", "rate", G_TYPE_INT, + (gint) (((gdouble) descriptor->audio_sampling_rate.n) / + ((gdouble) descriptor->audio_sampling_rate.d) + 0.5), + "channels", G_TYPE_INT, descriptor->channel_count); } else { GST_ERROR ("Unsupported sound essence compression: %s", mxf_ul_to_string (&descriptor->sound_essence_compression, str)); diff --git a/gst/mxf/mxfalaw.c b/gst/mxf/mxfalaw.c new file mode 100644 index 0000000000..d0bb113f5e --- /dev/null +++ b/gst/mxf/mxfalaw.c @@ -0,0 +1,134 @@ +/* GStreamer + * Copyright (C) 2008 Sebastian Dröge + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* Implementation of SMPTE 388M - Mapping A-Law coded audio into the MXF + * Generic Container + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include + +#include "mxfalaw.h" + +GST_DEBUG_CATEGORY_EXTERN (mxf_debug); +#define GST_CAT_DEFAULT mxf_debug + +gboolean +mxf_is_alaw_audio_essence_track (const MXFMetadataTrack * track) +{ + guint i; + + g_return_val_if_fail (track != NULL, FALSE); + + if (track->descriptor == NULL) + return FALSE; + + for (i = 0; i < track->n_descriptor; i++) { + MXFMetadataFileDescriptor *d = track->descriptor[i]; + MXFUL *key = &d->essence_container; + /* SMPTE 388M 6.1 */ + if (mxf_is_generic_container_essence_container_label (key) && + key->u[12] == 0x02 && key->u[13] == 0x0a && + (key->u[14] == 0x01 || key->u[14] == 0x02 || key->u[14] == 0x03)) + return TRUE; + } + + return FALSE; +} + +static GstFlowReturn +mxf_alaw_handle_essence_element (const MXFUL * key, GstBuffer * buffer, + GstCaps * caps, MXFMetadataGenericPackage * package, + MXFMetadataTrack * track, MXFMetadataStructuralComponent * component, + gpointer mapping_data, GstBuffer ** outbuf) +{ + *outbuf = buffer; + + /* SMPTE 388M 5.1 */ + if (key->u[12] != 0x16 || (key->u[14] != 0x08 && key->u[14] != 0x09 + && key->u[14] != 0x0a)) { + GST_ERROR ("Invalid A-Law essence element"); + return GST_FLOW_ERROR; + } + + return GST_FLOW_OK; +} + + +GstCaps * +mxf_alaw_create_caps (MXFMetadataGenericPackage * package, + MXFMetadataTrack * track, GstTagList ** tags, + MXFEssenceElementHandler * handler, gpointer * mapping_data) +{ + MXFMetadataFileDescriptor *f = NULL; + MXFMetadataGenericSoundEssenceDescriptor *s = NULL; + guint i; + GstCaps *caps = NULL; + + g_return_val_if_fail (package != NULL, NULL); + g_return_val_if_fail (track != NULL, NULL); + + if (track->descriptor == NULL) { + GST_ERROR ("No descriptor found for this track"); + return NULL; + } + + for (i = 0; i < track->n_descriptor; i++) { + if (((MXFMetadataGenericDescriptor *) track->descriptor[i])->type == + MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR) { + s = (MXFMetadataGenericSoundEssenceDescriptor *) track->descriptor[i]; + f = track->descriptor[i]; + break; + } else if (((MXFMetadataGenericDescriptor *) track-> + descriptor[i])->is_file_descriptor + && ((MXFMetadataGenericDescriptor *) track->descriptor[i])->type != + MXF_METADATA_MULTIPLE_DESCRIPTOR) { + f = track->descriptor[i]; + } + } + + if (!f) { + GST_ERROR ("No descriptor found for this track"); + return NULL; + } + + *handler = mxf_alaw_handle_essence_element; + + caps = gst_caps_new_simple ("audio/x-alaw", NULL); + if (s) { + if (s->audio_sampling_rate.n != 0 && s->audio_sampling_rate.d != 0) + 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); + + /* TODO: Handle channel layout somehow? */ + } else { + GST_WARNING ("Only a generic sound essence descriptor found"); + } + + return caps; +} diff --git a/gst/mxf/mxfalaw.h b/gst/mxf/mxfalaw.h new file mode 100644 index 0000000000..5c19a30915 --- /dev/null +++ b/gst/mxf/mxfalaw.h @@ -0,0 +1,36 @@ +/* GStreamer + * Copyright (C) 2008 Sebastian Dröge + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* Implementation of SMPTE 388M - Mapping A-Law coded audio into the MXF + * Generic Container + */ + +#ifndef __MXF_ALAW_H__ +#define __MXF_ALAW_H__ + +#include + +#include "mxfparse.h" + +gboolean mxf_is_alaw_audio_essence_track (const MXFMetadataTrack *track); + +GstCaps * +mxf_alaw_create_caps (MXFMetadataGenericPackage *package, MXFMetadataTrack *track, GstTagList **tags, MXFEssenceElementHandler *handler, gpointer *mapping_data); + +#endif /* __MXF_ALAW_H__ */ diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c index 9813b3a3b3..9814e733f3 100644 --- a/gst/mxf/mxfdemux.c +++ b/gst/mxf/mxfdemux.c @@ -34,6 +34,7 @@ #include "mxfaes-bwf.h" #include "mxfmpeg.h" #include "mxfdv-dif.h" +#include "mxfalaw.h" #include @@ -1291,8 +1292,9 @@ gst_mxf_demux_handle_header_metadata_resolve_references (GstMXFDemux * demux) MXFMetadataEssenceContainerData, i); for (j = 0; j < demux->content_storage.n_essence_container_data; j++) { - if (mxf_ul_is_equal (&demux->content_storage. - essence_container_data_uids[j], &data->instance_uid)) { + if (mxf_ul_is_equal (&demux-> + content_storage.essence_container_data_uids[j], + &data->instance_uid)) { demux->content_storage.essence_container_data[j] = data; break; } @@ -1842,6 +1844,10 @@ choose_package: caps = mxf_dv_dif_create_caps (source_package, source_track, &pad->tags, &pad->handle_essence_element, &pad->mapping_data); + else if (mxf_is_alaw_audio_essence_track (source_track)) + caps = + mxf_alaw_create_caps (source_package, source_track, + &pad->tags, &pad->handle_essence_element, &pad->mapping_data); break; case MXF_METADATA_TRACK_DATA_ESSENCE: if (mxf_is_dv_dif_essence_track (source_track))