From fd872d5f12daa80884b1202f7207a2f3eacb2764 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Fri, 14 Nov 2008 20:17:10 +0000 Subject: gst/qtmux/: Cut detour in sample description extension construction. Original commit message from CVS: * gst/qtmux/atoms.c: (build_esds_extension), (build_mov_aac_extension), (build_jp2h_extension), (build_codec_data_extension): * gst/qtmux/atoms.h: * gst/qtmux/fourcc.h: * gst/qtmux/gstqtmux.c: (gst_qt_mux_audio_sink_set_caps), (gst_qt_mux_video_sink_set_caps): * gst/qtmux/gstqtmuxmap.c: (gst_qt_mux_map_format_to_header): Cut detour in sample description extension construction. Also actually implement ISO JPEG2000 mj2 format. --- gst/qtmux/atoms.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gst/qtmux/atoms.h') diff --git a/gst/qtmux/atoms.h b/gst/qtmux/atoms.h index f469abc1..22451e61 100644 --- a/gst/qtmux/atoms.h +++ b/gst/qtmux/atoms.h @@ -595,10 +595,6 @@ typedef struct GstBuffer *codec_data; } AudioSampleEntry; -AtomInfo* build_sample_entry_extension (AtomTRAK * trak, AtomsTreeFlavor flavor, - guint32 fourcc, guint esds_type, - const GstBuffer * codec_data); - void atom_trak_set_audio_type (AtomTRAK * trak, AtomsContext * context, AudioSampleEntry * entry, guint32 scale, AtomInfo * ext, gint sample_size); @@ -606,6 +602,13 @@ void atom_trak_set_video_type (AtomTRAK * trak, AtomsContext * context, VisualSampleEntry * entry, guint32 rate, AtomInfo * ext); +AtomInfo * build_codec_data_extension (guint32 fourcc, const GstBuffer * codec_data); +AtomInfo * build_mov_aac_extension (AtomTRAK * trak, const GstBuffer * codec_data); +AtomInfo * build_esds_extension (AtomTRAK * trak, guint8 object_type, + guint8 stream_type, const GstBuffer * codec_data); +AtomInfo * build_jp2h_extension (AtomTRAK * trak, gint width, gint height, + guint32 fourcc); + /* * Meta tags functions -- cgit v1.2.1