Mercurial > mplayer.hg
diff liba52/downmix.c @ 18721:722ac20fac5f
sync with liba52 0.7.4, patch by Emanuele Giaquinta >emanuele.giaquinta ! gmail * com<
part 2: cosmetic changes
author | rathann |
---|---|
date | Thu, 15 Jun 2006 22:59:40 +0000 |
parents | 4bad7f00556e |
children | 0783dd397f74 |
line wrap: on
line diff
--- a/liba52/downmix.c Thu Jun 15 22:58:06 2006 +0000 +++ b/liba52/downmix.c Thu Jun 15 22:59:40 2006 +0000 @@ -63,9 +63,9 @@ if(mm_accel & MM_ACCEL_X86_3DNOW) a52_downmix= downmix_3dnow; #endif } - + int a52_downmix_init (int input, int flags, sample_t * level, - sample_t clev, sample_t slev) + sample_t clev, sample_t slev) { static uint8_t table[11][8] = { {A52_CHANNEL, A52_DOLBY, A52_STEREO, A52_STEREO, @@ -96,7 +96,7 @@ output = flags & A52_CHANNEL_MASK; if (output > A52_DOLBY) return -1; - + output = table[output][input & 7]; if ((output == A52_STEREO) && @@ -180,11 +180,12 @@ *level *= 1 / (1 + 3 * LEVEL_3DB); break; } + return output; } int a52_downmix_coeff (sample_t * coeff, int acmod, int output, sample_t level, - sample_t clev, sample_t slev) + sample_t clev, sample_t slev) { switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) { @@ -474,12 +475,13 @@ static void zero (sample_t * samples) { int i; + for (i = 0; i < 256; i++) samples[i] = 0; } void downmix_C (sample_t * samples, int acmod, int output, sample_t bias, - sample_t clev, sample_t slev) + sample_t clev, sample_t slev) { switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) {