diff options
| author | Lucien <astrataro@gmail.com> | 2012-11-01 22:02:33 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-11-01 22:02:33 +0400 |
| commit | db41affe87e66b8394bc6b0888baacf3a9b72864 (patch) | |
| tree | fa99d14fdf5a7750130e8a3f9830aebcdb3228a6 /decoder/LAVAudio | |
| parent | 1e0520a3d390b05f701b8384f92b34c558cbd12f (diff) | |
Add support for TAK
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'decoder/LAVAudio')
| -rw-r--r-- | decoder/LAVAudio/LAVAudioSettings.h | 1 | ||||
| -rw-r--r-- | decoder/LAVAudio/Media.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/decoder/LAVAudio/LAVAudioSettings.h b/decoder/LAVAudio/LAVAudioSettings.h index 260d74e8..90b0fb3d 100644 --- a/decoder/LAVAudio/LAVAudioSettings.h +++ b/decoder/LAVAudio/LAVAudioSettings.h @@ -54,6 +54,7 @@ typedef enum LAVAudioCodec { Codec_Nellymoser, Codec_MSPCM, Codec_Truespeech, + Codec_TAK, Codec_NB // Number of entrys (do not use when dynamically linking) }; diff --git a/decoder/LAVAudio/Media.cpp b/decoder/LAVAudio/Media.cpp index a9623d9a..32d69a76 100644 --- a/decoder/LAVAudio/Media.cpp +++ b/decoder/LAVAudio/Media.cpp @@ -78,6 +78,7 @@ static const FFMPEG_SUBTYPE_MAP lavc_audio_codecs[] = { { &MEDIASUBTYPE_WAVPACK4, AV_CODEC_ID_WAVPACK }, { &MEDIASUBTYPE_MLP, AV_CODEC_ID_MLP }, { &MEDIASUBTYPE_ALAC, AV_CODEC_ID_ALAC }, + { &MEDIASUBTYPE_TAK, AV_CODEC_ID_TAK }, // BluRay LPCM { &MEDIASUBTYPE_DVD_LPCM_AUDIO, AV_CODEC_ID_PCM_DVD }, @@ -189,6 +190,7 @@ const AMOVIESETUP_MEDIATYPE CLAVAudio::sudPinTypesIn[] = { { &MEDIATYPE_Audio, &MEDIASUBTYPE_WAVPACK4 }, { &MEDIATYPE_Audio, &MEDIASUBTYPE_MLP }, { &MEDIATYPE_Audio, &MEDIASUBTYPE_ALAC }, + { &MEDIATYPE_Audio, &MEDIASUBTYPE_TAK }, // BluRay LPCM { &MEDIATYPE_Audio, &MEDIASUBTYPE_DVD_LPCM_AUDIO }, @@ -642,6 +644,7 @@ static codec_config_t m_codec_config[] = { { 1, { AV_CODEC_ID_NELLYMOSER }}, // CC_Nellymoser { 4, { AV_CODEC_ID_PCM_ALAW, AV_CODEC_ID_PCM_MULAW, AV_CODEC_ID_GSM_MS, AV_CODEC_ID_ADPCM_MS }, "mspcm", "Microsoft PCM (A-Law, muLaw, MS-GSM, MS ADPCM)" }, // CC_MSPCM { 1, { AV_CODEC_ID_TRUESPEECH }}, // CC_Truespeech + { 1, { AV_CODEC_ID_TAK }}, // CC_TAK }; const codec_config_t *get_codec_config(LAVAudioCodec codec) |