mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-17 12:55:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtmux: Only accept stream-format='none' aac

Browse source 
Only accept raw aac streams (stream-format=none) to avoid
generating invalid files.

Fixes #604925
This commit is contained in:
Thiago Santos 2010-01-11 10:34:32 -03:00
parent 635b0c1129
commit 5b8b363310
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/qtmux/gstqtmux.c
View file

@ -1717,6 +1717,7 @@ gst_qt_mux_audio_sink_set_caps (GstPad * pad, GstCaps * caps)
AudioSampleEntry entry = { 0, }; AudioSampleEntry entry = { 0, };
AtomInfo *ext_atom = NULL; AtomInfo *ext_atom = NULL;
gint constant_size = 0; gint constant_size = 0;
const gchar *stream_format;
/* find stream data */ /* find stream data */
qtpad = (GstQTPad *) gst_pad_get_element_private (pad); qtpad = (GstQTPad *) gst_pad_get_element_private (pad);
@ -1787,8 +1788,20 @@ gst_qt_mux_audio_sink_set_caps (GstPad * pad, GstCaps * caps)
} }
break; break;
case 4: case 4:
/* AAC */
entry.fourcc = FOURCC_mp4a; /* check stream-format */
stream_format = gst_structure_get_string (structure, "stream-format");
if (stream_format) {
if (strcmp (stream_format, "none") != 0) {
GST_WARNING_OBJECT (qtmux, "Unsupported AAC stream-format %s, "
"please use 'none'", stream_format);
goto refuse_caps;
}
} else {
GST_WARNING_OBJECT (qtmux, "No stream-format present in caps, "
"assuming 'none'");
}
if (!codec_data || GST_BUFFER_SIZE (codec_data) < 2) if (!codec_data || GST_BUFFER_SIZE (codec_data) < 2)
GST_WARNING_OBJECT (qtmux, "no (valid) codec_data for AAC audio"); GST_WARNING_OBJECT (qtmux, "no (valid) codec_data for AAC audio");
else { else {
@ -1800,6 +1813,10 @@ gst_qt_mux_audio_sink_set_caps (GstPad * pad, GstCaps * caps)
GST_WARNING_OBJECT (qtmux, GST_WARNING_OBJECT (qtmux,
"non-LC AAC may not run well on (Apple) QuickTime/iTunes"); "non-LC AAC may not run well on (Apple) QuickTime/iTunes");
} }
/* AAC */
entry.fourcc = FOURCC_mp4a;
if (format == GST_QT_MUX_FORMAT_QT) if (format == GST_QT_MUX_FORMAT_QT)
ext_atom = build_mov_aac_extension (qtpad->trak, codec_data); ext_atom = build_mov_aac_extension (qtpad->trak, codec_data);
else else

1
gst/qtmux/gstqtmuxmap.c
View file

@ -119,6 +119,7 @@
#define AAC_CAPS \ #define AAC_CAPS \
"audio/mpeg, " \ "audio/mpeg, " \
"mpegversion = (int) 4, " \ "mpegversion = (int) 4, " \
"stream-format = (string) none, " \
COMMON_AUDIO_CAPS (8, MAX) COMMON_AUDIO_CAPS (8, MAX)
#define AMR_CAPS \ #define AMR_CAPS \