From: <wt...@ke...> - 2006-12-13 17:12:47
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: wtay Date: Wed Dec 13 2006 17:12:34 UTC Log message: * 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. Modified files: . : ChangeLog gst/qtdemux : qtdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.2336&r2=1.2337 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtdemux/qtdemux.c.diff?r1=1.179&r2=1.180 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.2336 retrieving revision 1.2337 diff -u -d -r1.2336 -r1.2337 --- ChangeLog 12 Dec 2006 16:10:21 -0000 1.2336 +++ ChangeLog 13 Dec 2006 17:12:21 -0000 1.2337 @@ -1,3 +1,10 @@ +2006-12-13 Wim Taymans <wi...@fl...> + + * 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 <tim at centricular dot net> * ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_create), Index: qtdemux.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtdemux/qtdemux.c,v retrieving revision 1.179 retrieving revision 1.180 diff -u -d -r1.179 -r1.180 --- qtdemux.c 11 Dec 2006 17:33:26 -0000 1.179 +++ qtdemux.c 13 Dec 2006 17:12:22 -0000 1.180 @@ -3632,9 +3632,14 @@ 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')) { + } /* sample to chunk */ stsc = qtdemux_tree_get_child_by_type (stbl, FOURCC_stsc); @@ -4580,6 +4585,9 @@ 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", |