virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

mlpdec_parser: fix a few channel layouts.

Browse Source 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
This commit is contained in:
Tim Walker 2012-02-22 16:09:42 +01:00 committed by Justin Ruggles
parent 147715ca10
commit 6bbaf6e0dd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mlp_parser.c
View File

@ -79,13 +79,13 @@ static const uint64_t thd_layout[13] = {
AV_CH_LOW_FREQUENCY, // LFE AV_CH_LOW_FREQUENCY, // LFE
AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRs AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRs
AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT, // LRvh AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT, // LRvh
AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRc AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRc
AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT, // LRrs AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT, // LRrs
AV_CH_BACK_CENTER, // Cs AV_CH_BACK_CENTER, // Cs
AV_CH_TOP_BACK_CENTER, // Ts AV_CH_TOP_BACK_CENTER, // Ts
AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRsd AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRsd
AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRw AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT, // LRw
AV_CH_TOP_BACK_CENTER, // Cvh AV_CH_TOP_FRONT_CENTER, // Cvh
AV_CH_LOW_FREQUENCY // LFE2 AV_CH_LOW_FREQUENCY // LFE2
}; };
@ -109,7 +109,8 @@ static int truehd_channels(int chanmap)
static uint64_t truehd_layout(int chanmap) static uint64_t truehd_layout(int chanmap)
{ {
int layout = 0, i; int i;
uint64_t layout = 0;
for (i = 0; i < 13; i++) for (i = 0; i < 13; i++)
layout |= thd_layout[i] * ((chanmap >> i) & 1); layout |= thd_layout[i] * ((chanmap >> i) & 1);