diff options
| -rw-r--r-- | common/includes/moreuuids.h | 5 | ||||
| -rw-r--r-- | decoder/LAVAudio/Media.cpp | 4 | ||||
| -rw-r--r-- | demuxer/Demuxers/LAVFAudioHelper.cpp | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/common/includes/moreuuids.h b/common/includes/moreuuids.h index 917fffd0..d9b53f2e 100644 --- a/common/includes/moreuuids.h +++ b/common/includes/moreuuids.h @@ -388,6 +388,11 @@ DEFINE_GUID(MEDIASUBTYPE_ATRC, DEFINE_GUID(MEDIASUBTYPE_ATRAC3, WAVE_FORMAT_SONY_SCX, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +#define WAVE_FORMAT_ATRAC3P 0xE923AABF +// E923AABF-CB58-4471-A119-FFFA01E4CE62 +DEFINE_GUID(MEDIASUBTYPE_ATRAC3P, + 0xE923AABF, 0xCB58, 0x4471, 0xA1, 0x19, 0xFF, 0xFA, 0x01, 0xE4, 0xCE, 0x62); + // Haali's video renderer // {760A8F35-97E7-479d-AAF5-DA9EFF95D751} diff --git a/decoder/LAVAudio/Media.cpp b/decoder/LAVAudio/Media.cpp index ac1da411..0a1cb755 100644 --- a/decoder/LAVAudio/Media.cpp +++ b/decoder/LAVAudio/Media.cpp @@ -131,6 +131,7 @@ static const FFMPEG_SUBTYPE_MAP lavc_audio_codecs[] = { { &MEDIASUBTYPE_VOXWARE_RT29, AV_CODEC_ID_METASOUND }, { &MEDIASUBTYPE_ATRAC3, AV_CODEC_ID_ATRAC3 }, { &MEDIASUBTYPE_ATRC, AV_CODEC_ID_ATRAC3 }, + { &MEDIASUBTYPE_ATRAC3P, AV_CODEC_ID_ATRAC3P }, // Special LAVFSplitter interface { &MEDIASUBTYPE_FFMPEG_AUDIO, AV_CODEC_ID_NONE }, @@ -248,6 +249,7 @@ const AMOVIESETUP_MEDIATYPE CLAVAudio::sudPinTypesIn[] = { { &MEDIATYPE_Audio, &MEDIASUBTYPE_VOXWARE_RT29 }, { &MEDIATYPE_Audio, &MEDIASUBTYPE_ATRAC3 }, { &MEDIATYPE_Audio, &MEDIASUBTYPE_ATRC }, + { &MEDIATYPE_Audio, &MEDIASUBTYPE_ATRAC3P }, // Special LAVFSplitter interface { &MEDIATYPE_Audio, &MEDIASUBTYPE_FFMPEG_AUDIO }, @@ -683,7 +685,7 @@ static codec_config_t m_codec_config[] = { { 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 - { 2, { AV_CODEC_ID_ATRAC1, AV_CODEC_ID_ATRAC3 }, "atrac", "ATRAC (Adaptive TRansform Acoustic Coding)"}, // CC_ATRAC + { 3, { AV_CODEC_ID_ATRAC1, AV_CODEC_ID_ATRAC3, AV_CODEC_ID_ATRAC3P }, "atrac", "ATRAC (Adaptive TRansform Acoustic Coding)"}, // CC_ATRAC }; const codec_config_t *get_codec_config(LAVAudioCodec codec) diff --git a/demuxer/Demuxers/LAVFAudioHelper.cpp b/demuxer/Demuxers/LAVFAudioHelper.cpp index d1fad410..7468559f 100644 --- a/demuxer/Demuxers/LAVFAudioHelper.cpp +++ b/demuxer/Demuxers/LAVFAudioHelper.cpp @@ -75,6 +75,7 @@ static FormatMapping audio_map[] = { { AV_CODEC_ID_QDM2, &MEDIASUBTYPE_QDM2, WAVE_FORMAT_QDESIGN_MUSIC, nullptr }, { AV_CODEC_ID_ATRAC1, &MEDIASUBTYPE_ATRC, WAVE_FORMAT_ATRC, nullptr }, { AV_CODEC_ID_ATRAC3, &MEDIASUBTYPE_ATRC, WAVE_FORMAT_ATRC, nullptr }, + { AV_CODEC_ID_ATRAC3P, &MEDIASUBTYPE_ATRAC3P, WAVE_FORMAT_ATRAC3P, nullptr }, }; CMediaType CLAVFAudioHelper::initAudioType(AVCodecID codecId, unsigned int &codecTag, std::string container) |