From: <sl...@ke...> - 2008-12-04 08:37:37
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Thu Dec 04 2008 08:37:32 UTC Log message: * gst/mxf/Makefile.am: * gst/mxf/mxfd10.c: (mxf_is_d10_essence_track), (mxf_d10_picture_handle_essence_element), (mxf_d10_sound_handle_essence_element), (mxf_d10_create_caps): * gst/mxf/mxfd10.h: * gst/mxf/mxfdemux.c: (gst_mxf_demux_handle_header_metadata_update_streams): Add support for SMPTE D10 essence (SMPTE 386M). * gst/mxf/mxfparse.c: (mxf_metadata_generic_picture_essence_descriptor_set_caps): Don't set width/height and PAR on the caps as those values are wrong for most files (height is sometimes the height of a field and aspect ratio is some random value). * gst/mxf/mxfaes-bwf.c: (mxf_bwf_create_caps), (mxf_aes3_create_caps): Fix calculation of block align if it isn't set in the descriptor. Modified files: . : ChangeLog gst/mxf : Makefile.am mxfaes-bwf.c mxfdemux.c mxfparse.c Added files: gst/mxf : mxfd10.c mxfd10.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3783&r2=1.3784 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/Makefile.am.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfaes-bwf.c.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfd10.c?rev=1.1&content-type=text/vnd.viewcvs-markup http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfd10.h?rev=1.1&content-type=text/vnd.viewcvs-markup http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.25&r2=1.26 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfparse.c.diff?r1=1.15&r2=1.16 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3783 retrieving revision 1.3784 diff -u -d -r1.3783 -r1.3784 --- ChangeLog 3 Dec 2008 16:08:26 -0000 1.3783 +++ ChangeLog 4 Dec 2008 08:37:16 -0000 1.3784 @@ -1,3 +1,24 @@ +2008-12-04 Sebastian Dröge <seb...@co...> + + * gst/mxf/Makefile.am: + * gst/mxf/mxfd10.c: (mxf_is_d10_essence_track), + (mxf_d10_picture_handle_essence_element), + (mxf_d10_sound_handle_essence_element), (mxf_d10_create_caps): + * gst/mxf/mxfd10.h: + * gst/mxf/mxfdemux.c: + (gst_mxf_demux_handle_header_metadata_update_streams): + Add support for SMPTE D10 essence (SMPTE 386M). + * gst/mxf/mxfparse.c: + (mxf_metadata_generic_picture_essence_descriptor_set_caps): + Don't set width/height and PAR on the caps as those values are + wrong for most files (height is sometimes the height of a field + and aspect ratio is some random value). + * gst/mxf/mxfaes-bwf.c: (mxf_bwf_create_caps), + (mxf_aes3_create_caps): + Fix calculation of block align if it isn't set in the descriptor. 2008-12-03 Sebastian Dröge <seb...@co...> * gst/mxf/mxfaes-bwf.c: Index: Makefile.am RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 29 Nov 2008 20:25:05 -0000 1.4 +++ Makefile.am 4 Dec 2008 08:37:18 -0000 1.5 @@ -8,7 +8,8 @@ mxfmpeg.c \ mxfdv-dif.c \ mxfalaw.c \ - mxfjpeg2000.c + mxfjpeg2000.c \ + mxfd10.c libgstmxf_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) @@ -22,5 +23,6 @@ mxfdv-dif.h \ mxfalaw.h \ mxfjpeg2000.h \ + mxfd10.h \ mxftypes.h Index: mxfaes-bwf.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfaes-bwf.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mxfaes-bwf.c 3 Dec 2008 16:08:28 -0000 1.7 +++ mxfaes-bwf.c 4 Dec 2008 08:37:18 -0000 1.8 @@ -570,7 +570,9 @@ if (wa_descriptor && wa_descriptor->block_align != 0) block_align = wa_descriptor->block_align; else - block_align = GST_ROUND_UP_8 (descriptor->quantization_bits) / 8; + block_align = + (GST_ROUND_UP_8 (descriptor->quantization_bits) * + descriptor->channel_count) / 8; ret = gst_caps_new_simple ("audio/x-raw-int", "rate", G_TYPE_INT, @@ -599,7 +601,9 @@ @@ -679,7 +683,9 @@ if (wa_descriptor && wa_descriptor->block_align != 0) block_align = wa_descriptor->block_align; else - block_align = GST_ROUND_UP_8 (descriptor->quantization_bits) / 8; + block_align = + (GST_ROUND_UP_8 (descriptor->quantization_bits) * + descriptor->channel_count) / 8; ret = gst_caps_new_simple ("audio/x-raw-int", "rate", G_TYPE_INT, --- NEW FILE: mxfd10.c --- /* GStreamer * Copyright (C) 2008 Sebastian Dröge <seb...@co...> * * 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 386M - Mapping Type-D10 essence data into the MXF * Generic Container #ifdef HAVE_CONFIG_H #include "config.h" #endif #include <gst/gst.h> #include <string.h> #include "mxfd10.h" #include "mxfmpeg.h" #include "mxfaes-bwf.h" GST_DEBUG_CATEGORY_EXTERN (mxf_debug); #define GST_CAT_DEFAULT mxf_debug gboolean mxf_is_d10_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 386M 5.1 */ if (mxf_is_generic_container_essence_container_label (key) && key->u[12] == 0x02 && key->u[13] == 0x01 && (key->u[14] >= 0x01 && key->u[14] <= 0x06) && (key->u[15] == 0x01 || key->u[15] == 0x02)) return TRUE; } return FALSE; } static GstFlowReturn mxf_d10_picture_handle_essence_element (const MXFUL * key, GstBuffer * buffer, GstCaps * caps, MXFMetadataGenericPackage * package, MXFMetadataTrack * track, MXFMetadataStructuralComponent * component, gpointer mapping_data, GstBuffer ** outbuf) *outbuf = buffer; /* SMPTE 386M 5.2.1 */ if (key->u[12] != 0x05 || key->u[13] != 0x01 || key->u[14] != 0x01) { GST_ERROR ("Invalid D10 picture essence element"); return GST_FLOW_ERROR; return GST_FLOW_OK; mxf_d10_sound_handle_essence_element (const MXFUL * key, GstBuffer * buffer, guint i, j, nsamples; gint width, channels; GstStructure *s = gst_caps_get_structure (caps, 0); const guint8 *indata; guint8 *outdata; if (!gst_structure_get_int (s, "width", &width) || !gst_structure_get_int (s, "channels", &channels)) { GST_ERROR ("Invalid caps"); width /= 8; /* SMPTE 386M 5.3.1 */ if (key->u[12] != 0x06 || key->u[13] != 0x01 || key->u[14] != 0x10) { GST_ERROR ("Invalid D10 sound essence element"); /* Now transform raw AES3 into raw audio, see SMPTE 331M */ if ((GST_BUFFER_SIZE (buffer) - 4) % 32 != 0) { GST_ERROR ("Invalid D10 sound essence buffer size"); nsamples = ((GST_BUFFER_SIZE (buffer) - 4) / 4) / 8; *outbuf = gst_buffer_new_and_alloc (nsamples * width * channels); gst_buffer_copy_metadata (*outbuf, buffer, GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_CAPS); indata = GST_BUFFER_DATA (buffer); outdata = GST_BUFFER_DATA (*outbuf); for (i = 0; i < nsamples; i++) { for (j = 0; j < channels; j++) { guint32 in = GST_READ_UINT32_LE (indata); if (width == 2) { in = (in >> 12) & 0xffff; GST_WRITE_UINT16_LE (outdata, in); } else if (width == 3) { in = (in >> 4) & 0xffffff; GST_WRITE_UINT24_LE (outdata, in); } indata += 4; outdata += width; } indata += 4 * (8 - channels); gst_buffer_unref (buffer); GstCaps * mxf_d10_create_caps (MXFMetadataGenericPackage * package, MXFMetadataTrack * track, GstTagList ** tags, MXFEssenceElementHandler * handler, gpointer * mapping_data) MXFMetadataGenericPictureEssenceDescriptor *p = NULL; MXFMetadataGenericSoundEssenceDescriptor *s = NULL; 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; if (((MXFMetadataGenericDescriptor *) track->descriptor[i])->type == MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR || ((MXFMetadataGenericDescriptor *) track->descriptor[i])->type == MXF_METADATA_MPEG_VIDEO_DESCRIPTOR || MXF_METADATA_CDCI_PICTURE_ESSENCE_DESCRIPTOR) { p = (MXFMetadataGenericPictureEssenceDescriptor *) track->descriptor[i]; break; } else if (((MXFMetadataGenericDescriptor *) track->descriptor[i])->type == MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR || MXF_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR || MXF_METADATA_AES3_AUDIO_ESSENCE_DESCRIPTOR) { s = (MXFMetadataGenericSoundEssenceDescriptor *) track->descriptor[i]; if (!s && !p) { if (!*tags) *tags = gst_tag_list_new (); if (s) { if (s->channel_count == 0 || s->quantization_bits == 0 || s->audio_sampling_rate.n == 0 || s->audio_sampling_rate.d == 0) { GST_ERROR ("Invalid descriptor"); return NULL; if (s->quantization_bits != 16 && s->quantization_bits != 24) { GST_ERROR ("Invalid width %u", s->quantization_bits); /* FIXME: set channel layout */ caps = gst_caps_new_simple ("audio/x-raw-int", "rate", G_TYPE_INT, (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, "depth", G_TYPE_INT, s->quantization_bits, "width", G_TYPE_INT, s->quantization_bits, NULL); *handler = mxf_d10_sound_handle_essence_element; gst_tag_list_add (*tags, GST_TAG_MERGE_APPEND, GST_TAG_VIDEO_CODEC, "SMPTE D-10 Audio", NULL); } else if (p) { caps = gst_caps_new_simple ("video/mpeg", "systemstream", G_TYPE_BOOLEAN, FALSE, "mpegversion", G_TYPE_INT, 2, NULL); mxf_metadata_generic_picture_essence_descriptor_set_caps (p, caps); *handler = mxf_d10_picture_handle_essence_element; "SMPTE D-10 Video", NULL); return caps; --- NEW FILE: mxfd10.h --- #ifndef __MXF_D10_H__ #define __MXF_D10_H__ #include "mxfparse.h" gboolean mxf_is_d10_essence_track (const MXFMetadataTrack *track); mxf_d10_create_caps (MXFMetadataGenericPackage *package, MXFMetadataTrack *track, GstTagList **tags, MXFEssenceElementHandler *handler, gpointer *mapping_data); #endif /* __MXF_D10_H__ */ Index: mxfdemux.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- mxfdemux.c 3 Dec 2008 16:08:28 -0000 1.25 +++ mxfdemux.c 4 Dec 2008 08:37:18 -0000 1.26 @@ -36,6 +36,7 @@ #include "mxfdv-dif.h" #include "mxfalaw.h" #include "mxfjpeg2000.h" +#include "mxfd10.h" #include <string.h> @@ -1346,9 +1347,8 @@ 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; } @@ -1907,6 +1907,10 @@ caps = mxf_jpeg2000_create_caps (source_package, source_track, &pad->tags, &pad->handle_essence_element, &pad->mapping_data); + else if (mxf_is_d10_essence_track (source_track)) + caps = + mxf_d10_create_caps (source_package, source_track, + &pad->tags, &pad->handle_essence_element, &pad->mapping_data); break; case MXF_METADATA_TRACK_SOUND_ESSENCE: if (mxf_is_aes_bwf_essence_track (source_track)) @@ -1925,12 +1929,24 @@ mxf_mpeg_create_caps (source_package, source_track, case MXF_METADATA_TRACK_DATA_ESSENCE: if (mxf_is_dv_dif_essence_track (source_track)) mxf_dv_dif_create_caps (source_package, source_track, + else if (mxf_is_mpeg_essence_track (source_track)) + mxf_mpeg_create_caps (source_package, source_track, default: g_assert_not_reached (); Index: mxfparse.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfparse.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- mxfparse.c 3 Dec 2008 10:15:27 -0000 1.15 +++ mxfparse.c 4 Dec 2008 08:37:18 -0000 1.16 @@ -2610,8 +2610,8 @@ void mxf_metadata_generic_picture_essence_descriptor_set_caps (MXFMetadataGenericPictureEssenceDescriptor * descriptor, GstCaps * caps) { - guint par_n, par_d; - guint width, height; + /*guint par_n, par_d; + guint width, height; */ MXFMetadataFileDescriptor *f = (MXFMetadataFileDescriptor *) descriptor; g_return_if_fail (descriptor != NULL); @@ -2620,6 +2620,10 @@ gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION, f->sample_rate.n, f->sample_rate.d, NULL); + return; +/* FIXME: This sets wrong values for most (all?) files */ +#if 0 width = descriptor->stored_width; height = descriptor->stored_height; @@ -2632,11 +2636,12 @@ if (descriptor->aspect_ratio.n == 0 || descriptor->aspect_ratio.d == 0) return; - par_n = height * descriptor->aspect_ratio.n; - par_d = width * descriptor->aspect_ratio.d; + par_n = height * descriptor->aspect_ratio.d; + par_d = width * descriptor->aspect_ratio.n; gst_caps_set_simple (caps, "pixel-aspect-ratio", GST_TYPE_FRACTION, par_n, par_d, NULL); +#endif } gboolean |