mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/qtdemux/qtdemux.c: Add mapping for IMA Loki SDL MJPEG ADPCM codec.

Browse source 
Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
Add mapping for IMA Loki SDL MJPEG ADPCM codec.
Add some alternative byteswapped mappings that seem to pop up sometimes.
Fixes #550288.
This commit is contained in:
Wim Taymans 2008-09-02 15:27:49 +00:00
parent cb434b2bce
commit 105e002337
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-09-02 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
Add mapping for IMA Loki SDL MJPEG ADPCM codec.
Add some alternative byteswapped mappings that seem to pop up sometimes.
Fixes #550288.
2008-09-02 Tim-Philipp Müller <tim.muller at collabora co uk> 2008-09-02 Tim-Philipp Müller <tim.muller at collabora co uk>
* po/LINGUAS: * po/LINGUAS:

13
gst/qtdemux/qtdemux.c
View file

@ -4673,6 +4673,8 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
const GstStructure *s; const GstStructure *s;
const gchar *name; const gchar *name;
GST_DEBUG_OBJECT (qtdemux, "resolve fourcc %08x", fourcc);
switch (fourcc) { switch (fourcc) {
case GST_MAKE_FOURCC ('N', 'O', 'N', 'E'): case GST_MAKE_FOURCC ('N', 'O', 'N', 'E'):
case GST_MAKE_FOURCC ('r', 'a', 'w', ' '): case GST_MAKE_FOURCC ('r', 'a', 'w', ' '):
@ -4745,22 +4747,31 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
/* FIXME */ /* FIXME */
caps = gst_caps_from_string ("audio/x-alaw"); caps = gst_caps_from_string ("audio/x-alaw");
break; break;
case 0x0200736d:
case 0x6d730002: case 0x6d730002:
_codec ("Microsoft ADPCM"); _codec ("Microsoft ADPCM");
/* Microsoft ADPCM-ACM code 2 */ /* Microsoft ADPCM-ACM code 2 */
caps = gst_caps_from_string ("audio/x-adpcm, " caps = gst_caps_from_string ("audio/x-adpcm, "
"layout = (string) microsoft"); "layout = (string) microsoft");
break; break;
case 0x1100736d:
case 0x6d730011: case 0x6d730011:
_codec ("IMA Loki SDL MJPEG ADPCM");
/* Loki ADPCM, See #550288 for a file that only decodes
* with the smjpeg variant of the ADPCM decoder. */
caps = gst_caps_from_string ("audio/x-adpcm, "
"layout = (string) smjpeg");
break;
case 0x1700736d:
case 0x6d730017: case 0x6d730017:
_codec ("DVI/Intel IMA ADPCM"); _codec ("DVI/Intel IMA ADPCM");
/* FIXME DVI/Intel IMA ADPCM/ACM code 17 */ /* FIXME DVI/Intel IMA ADPCM/ACM code 17 */
caps = gst_caps_from_string ("audio/x-adpcm, " caps = gst_caps_from_string ("audio/x-adpcm, "
"layout = (string) quicktime"); "layout = (string) quicktime");
break; break;
case 0x5500736d:
case 0x6d730055: case 0x6d730055:
/* MPEG layer 3, CBR only (pre QT4.1) */ /* MPEG layer 3, CBR only (pre QT4.1) */
case 0x5500736d:
case GST_MAKE_FOURCC ('.', 'm', 'p', '3'): case GST_MAKE_FOURCC ('.', 'm', 'p', '3'):
_codec ("MPEG-1 layer 3"); _codec ("MPEG-1 layer 3");
/* MPEG layer 3, CBR & VBR (QT4.1 and later) */ /* MPEG layer 3, CBR & VBR (QT4.1 and later) */