From 22f148e7b8b9f18779154ad666f715aac2b34d97 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 13 Dec 2006 17:12:22 +0000 Subject: gst/qtdemux/qtdemux.c: Add AMR-WB to the list of supported formats. Original commit message from CVS: * gst/qtdemux/qtdemux.c: (gst_qtdemux_get_duration), (gst_qtdemux_handle_src_query), (qtdemux_parse_trak), (qtdemux_audio_caps): Add AMR-WB to the list of supported formats. --- ChangeLog | 7 +++++++ gst/qtdemux/qtdemux.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d92d23c..68dcd4fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-13 Wim Taymans + + * gst/qtdemux/qtdemux.c: (gst_qtdemux_get_duration), + (gst_qtdemux_handle_src_query), (qtdemux_parse_trak), + (qtdemux_audio_caps): + Add AMR-WB to the list of supported formats. + 2006-12-12 Tim-Philipp Müller * ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_create), diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index c4ffb99f..21e7a3f2 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -3632,9 +3632,14 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) stream->sampled = TRUE; stream->n_channels = 1; stream->rate = 8000; - } - if (stream->fourcc == GST_MAKE_FOURCC ('m', 'p', '4', 'a')) + } else if (stream->fourcc == GST_MAKE_FOURCC ('s', 'a', 'w', 'b')) { + /* force mono 16000 Hz for AMR-WB */ + stream->sampled = TRUE; + stream->n_channels = 1; + stream->rate = 16000; + } else if (stream->fourcc == GST_MAKE_FOURCC ('m', 'p', '4', 'a')) { stream->sampled = TRUE; + } /* sample to chunk */ stsc = qtdemux_tree_get_child_by_type (stbl, FOURCC_stsc); @@ -4580,6 +4585,9 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, case GST_MAKE_FOURCC ('s', 'a', 'm', 'r'): _codec ("AMR audio"); return gst_caps_new_simple ("audio/AMR", NULL); + case GST_MAKE_FOURCC ('s', 'a', 'w', 'b'): + _codec ("AMR-WB audio"); + return gst_caps_new_simple ("audio/AMR-WB", NULL); case GST_MAKE_FOURCC ('i', 'm', 'a', '4'): _codec ("Quicktime IMA ADPCM"); return gst_caps_new_simple ("audio/x-adpcm", -- cgit v1.2.1