Commit 06f93d74 authored by Paul B Mahol's avatar Paul B Mahol Committed by Jean-Baptiste Kempf

add QDMC decoding support

Signed-off-by: default avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 2a695b7b
......@@ -75,7 +75,7 @@ Decoder:
* New BPG decoder based on libbpg
* Fixed uncompressed DVD-Audio (AOB) LPCM decoding
* Rewrite WPL playlists and add ZPL playlists support (Zune)
* Support TDSC, Canopus HQX, Cineform, SpeedHQ, Pixlet codecs
* Support TDSC, Canopus HQX, Cineform, SpeedHQ, Pixlet and QDMC codecs
* TTML subtitles support, including EBU-TT-D variant
* Support 9-bit and 10-bit GBR planar formats
* New hardware accelerated decoder for OS X and and iOS based on Video Toolbox
......
......@@ -440,6 +440,7 @@
#define VLC_CODEC_AMR_WB VLC_FOURCC('s','a','w','b')
#define VLC_CODEC_ALAC VLC_FOURCC('a','l','a','c')
#define VLC_CODEC_QDM2 VLC_FOURCC('Q','D','M','2')
#define VLC_CODEC_QDMC VLC_FOURCC('Q','D','M','C')
#define VLC_CODEC_COOK VLC_FOURCC('c','o','o','k')
#define VLC_CODEC_SIPR VLC_FOURCC('s','i','p','r')
#define VLC_CODEC_TTA VLC_FOURCC('T','T','A','1')
......
......@@ -398,6 +398,9 @@ static const struct
/* AV_CODEC_ID_WESTWOOD_SND1 */
{ VLC_CODEC_GSM, AV_CODEC_ID_GSM, AUDIO_ES },
{ VLC_CODEC_QDM2, AV_CODEC_ID_QDM2, AUDIO_ES },
#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 )
{ VLC_CODEC_QDMC, AV_CODEC_ID_QDMC, AUDIO_ES },
#endif
{ VLC_CODEC_COOK, AV_CODEC_ID_COOK, AUDIO_ES },
{ VLC_CODEC_TRUESPEECH, AV_CODEC_ID_TRUESPEECH, AUDIO_ES },
{ VLC_CODEC_TTA, AV_CODEC_ID_TTA, AUDIO_ES },
......
......@@ -1105,7 +1105,7 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
case VLC_CODEC_AMR_WB:
p_track->fmt.audio.i_rate = 16000;
break;
case VLC_FOURCC( 'Q', 'D', 'M', 'C' ):
case VLC_CODEC_QDMC:
case VLC_CODEC_QDM2:
case VLC_CODEC_ALAC:
{
......
......@@ -1322,6 +1322,10 @@ static const staticentry_t p_list_audio[] = {
B(VLC_CODEC_QDM2, "QDM2 Audio"),
A("QDM2"),
/* QDMC */
B(VLC_CODEC_QDMC, "QDMC Audio"),
A("QDMC"),
/* COOK */
B(VLC_CODEC_COOK, "Cook Audio"),
A("cook"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment