diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-01-31 14:25:35 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-02-08 09:56:37 -0800 |
| commit | 314af0ff94255ab5f08790c05b9967c5f960a6e8 (patch) | |
| tree | 6dacf0425c41f1ee752d5fa319c7083a6c075558 | |
| parent | 8ece2662132e3f9eba149ab5f7f02c0dc88c5c8d (diff) | |
| download | ffmpeg-314af0ff94255ab5f08790c05b9967c5f960a6e8.tar.gz | |
aacdec: Use correct speaker order for 7.1.
The spec says the following speaker mapping is default:
center front speaker
left, right center front speakers,
left, right outside front speakers,
left surround, right surround rear speakers,
front low frequency effects speaker
| -rw-r--r-- | libavcodec/aacdectab.h | 4 | ||||
| -rw-r--r-- | libavutil/audioconvert.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index 4f8d84b241..70372adf97 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -87,7 +87,7 @@ static const uint8_t aac_channel_layout_map[7][5][2] = { { { TYPE_CPE, 0 }, { TYPE_SCE, 0 }, { TYPE_SCE, 1 }, }, { { TYPE_CPE, 0 }, { TYPE_SCE, 0 }, { TYPE_CPE, 1 }, }, { { TYPE_CPE, 0 }, { TYPE_SCE, 0 }, { TYPE_LFE, 0 }, { TYPE_CPE, 1 }, }, - { { TYPE_CPE, 0 }, { TYPE_SCE, 0 }, { TYPE_LFE, 0 }, { TYPE_CPE, 2 }, { TYPE_CPE, 1 }, }, + { { TYPE_CPE, 1 }, { TYPE_SCE, 0 }, { TYPE_LFE, 0 }, { TYPE_CPE, 2 }, { TYPE_CPE, 0 }, }, }; static const uint64_t aac_channel_layout[8] = { @@ -97,7 +97,7 @@ static const uint64_t aac_channel_layout[8] = { AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, - AV_CH_LAYOUT_7POINT1_WIDE, + AV_CH_LAYOUT_7POINT1_WIDE_BACK, 0, }; diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h index 00ed0ff7b8..55d79fc97e 100644 --- a/libavutil/audioconvert.h +++ b/libavutil/audioconvert.h @@ -97,6 +97,7 @@ #define AV_CH_LAYOUT_7POINT0_FRONT (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) #define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) #define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) +#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) #define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT) #define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) |