mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskamux: basic adpcm support

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=664339
This commit is contained in:
Nicola Murino 2012-01-14 19:58:17 +01:00 committed by Sebastian Dröge
parent 371482a90c
commit 00ea1cb003
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/matroska/matroska-mux.c
View file

@ -175,7 +175,11 @@ static GstStaticPadTemplate audiosink_templ =
"audio/x-alaw, " "audio/x-alaw, "
"channels = (int) {1, 2}, " "rate = (int) [ 8000, 192000 ]; " "channels = (int) {1, 2}, " "rate = (int) [ 8000, 192000 ]; "
"audio/x-mulaw, " "audio/x-mulaw, "
"channels = (int) {1, 2}, " "rate = (int) [ 8000, 192000 ]") "channels = (int) {1, 2}, " "rate = (int) [ 8000, 192000 ]; "
"audio/x-adpcm, "
"layout = (string)dvi, "
"block_align = (int)[64, 8096], "
"channels = (int) { 1, 2 }, " "rate = (int) [ 8000, 96000 ]; ")
); );
static GstStaticPadTemplate subtitlesink_templ = static GstStaticPadTemplate subtitlesink_templ =
@ -1872,7 +1876,8 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
} else if (!strcmp (mimetype, "audio/x-wma") } else if (!strcmp (mimetype, "audio/x-wma")
|| !strcmp (mimetype, "audio/x-alaw") || !strcmp (mimetype, "audio/x-alaw")
|| !strcmp (mimetype, "audio/x-mulaw")) { || !strcmp (mimetype, "audio/x-mulaw")
|| !strcmp (mimetype, "audio/x-adpcm")) {
guint8 *codec_priv; guint8 *codec_priv;
guint codec_priv_size; guint codec_priv_size;
guint16 format = 0; guint16 format = 0;
@ -1923,6 +1928,14 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
block_align = channels; block_align = channels;
bitrate = block_align * samplerate; bitrate = block_align * samplerate;
} else if (!strcmp (mimetype, "audio/x-adpcm")) {
if (!gst_structure_get_int (structure, "block_align", &block_align)) {
GST_WARNING_OBJECT (mux, "Missing block_align on adpcm caps");
goto refuse_caps;
}
/*support for IMA/WAV ADPCM */
format = GST_RIFF_WAVE_FORMAT_ADPCM_IMA_WAV;
} }
g_assert (format != 0); g_assert (format != 0);