diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-08-11 13:42:55 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-08-11 13:57:30 +0400 |
| commit | bacb7df8bc81abcb78dbad164beded3f690b66db (patch) | |
| tree | 52402724d674ed5b1c5e023d8ed19ef615728037 /decoder/LAVAudio | |
| parent | 87e98af68dc1366be98c95547d68cf4249719c14 (diff) | |
Add Opus decoding via libopus
Diffstat (limited to 'decoder/LAVAudio')
| -rw-r--r-- | decoder/LAVAudio/LAVAudioSettings.h | 1 | ||||
| -rw-r--r-- | decoder/LAVAudio/Media.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/decoder/LAVAudio/LAVAudioSettings.h b/decoder/LAVAudio/LAVAudioSettings.h index e0274971..66ff22cb 100644 --- a/decoder/LAVAudio/LAVAudioSettings.h +++ b/decoder/LAVAudio/LAVAudioSettings.h @@ -49,6 +49,7 @@ typedef enum LAVAudioCodec { Codec_RealAudio, Codec_WMALL, Codec_ALAC, + Codec_Opus, Codec_NB // Number of entrys (do not use when dynamically linking) }; diff --git a/decoder/LAVAudio/Media.cpp b/decoder/LAVAudio/Media.cpp index 59e59f14..b985f9c5 100644 --- a/decoder/LAVAudio/Media.cpp +++ b/decoder/LAVAudio/Media.cpp @@ -117,6 +117,7 @@ static const FFMPEG_SUBTYPE_MAP lavc_audio_codecs[] = { // Misc { &MEDIASUBTYPE_SPEEX, CODEC_ID_SPEEX }, + { &MEDIASUBTYPE_OPUS, CODEC_ID_OPUS }, // Special LAVFSplitter interface { &MEDIASUBTYPE_FFMPEG_AUDIO, CODEC_ID_NONE }, @@ -220,6 +221,7 @@ const AMOVIESETUP_MEDIATYPE CLAVAudio::sudPinTypesIn[] = { // Misc { &MEDIATYPE_Audio, &MEDIASUBTYPE_SPEEX }, + { &MEDIATYPE_Audio, &MEDIASUBTYPE_OPUS }, // Special LAVFSplitter interface { &MEDIATYPE_Audio, &MEDIASUBTYPE_FFMPEG_AUDIO }, @@ -620,7 +622,8 @@ static codec_config_t m_codec_config[] = { { 1, { CODEC_ID_COOK }}, // CC_COOK { 5, { CODEC_ID_SIPR, CODEC_ID_ATRAC3, CODEC_ID_RA_144, CODEC_ID_RA_288, CODEC_ID_RALF }, "realaudio", "Real Audio (ATRAC, SIPR, RALF, 14.4 28.8)" }, // CC_REAL { 1, { CODEC_ID_WMALOSSLESS }}, // CC_WMALL - { 1, { CODEC_ID_ALAC }}, + { 1, { CODEC_ID_ALAC }}, // CC_ALAC + { 1, { CODEC_ID_OPUS }, "opus", "Opus Audio Codec"}, // CC_OPUS }; const codec_config_t *get_codec_config(LAVAudioCodec codec) |