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.
This commit is contained in:
Wim Taymans 2006-12-13 17:12:22 +00:00
parent d3c0b705eb
commit 22f148e7b8
2 changed files with 17 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2006-12-13 Wim Taymans <wim@fluendo.com>
* 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> 2006-12-12 Tim-Philipp Müller <tim at centricular dot net>
* ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_create), * ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_create),

View file

@ -3632,9 +3632,14 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
stream->sampled = TRUE; stream->sampled = TRUE;
stream->n_channels = 1; stream->n_channels = 1;
stream->rate = 8000; stream->rate = 8000;
} } else if (stream->fourcc == GST_MAKE_FOURCC ('s', 'a', 'w', 'b')) {
if (stream->fourcc == GST_MAKE_FOURCC ('m', 'p', '4', 'a')) /* force mono 16000 Hz for AMR-WB */
stream->sampled = TRUE; 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 */ /* sample to chunk */
stsc = qtdemux_tree_get_child_by_type (stbl, FOURCC_stsc); 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'): case GST_MAKE_FOURCC ('s', 'a', 'm', 'r'):
_codec ("AMR audio"); _codec ("AMR audio");
return gst_caps_new_simple ("audio/AMR", NULL); 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'): case GST_MAKE_FOURCC ('i', 'm', 'a', '4'):
_codec ("Quicktime IMA ADPCM"); _codec ("Quicktime IMA ADPCM");
return gst_caps_new_simple ("audio/x-adpcm", return gst_caps_new_simple ("audio/x-adpcm",