diff options
| author | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-15 22:58:06 +0000 |
|---|---|---|
| committer | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-15 22:58:06 +0000 |
| commit | d686f4e3cf6f5d88ba7b727dcbbe0cc917a7491a (patch) | |
| tree | fa88d321412389ce4364e0522c902c8d1e2e63ea /liba52/downmix.c | |
| parent | 580302e179f920b9408b9a7c96e5d6e1f12b5d93 (diff) | |
| download | mpv-d686f4e3cf6f5d88ba7b727dcbbe0cc917a7491a.tar.bz2 mpv-d686f4e3cf6f5d88ba7b727dcbbe0cc917a7491a.tar.xz | |
sync with liba52 0.7.4, patch by Emanuele Giaquinta >emanuele.giaquinta ! gmail * com<
part 1: functional changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18723 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52/downmix.c')
| -rw-r--r-- | liba52/downmix.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/liba52/downmix.c b/liba52/downmix.c index 67eee7a89e..5c61cee475 100644 --- a/liba52/downmix.c +++ b/liba52/downmix.c @@ -1,6 +1,6 @@ /* * downmix.c - * Copyright (C) 2000-2001 Michel Lespinasse <walken@zoy.org> + * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org> * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * * This file is part of a52dec, a free ATSC A-52 stream decoder. @@ -40,9 +40,9 @@ #define CONVERT(acmod,output) (((output) << 3) + (acmod)) -void (*downmix)(sample_t * samples, int acmod, int output, sample_t bias, +void (*a52_downmix)(sample_t * samples, int acmod, int output, sample_t bias, sample_t clev, sample_t slev)= NULL; -void (*upmix)(sample_t * samples, int acmod, int output)= NULL; +void (*a52_upmix)(sample_t * samples, int acmod, int output)= NULL; static void downmix_SSE (sample_t * samples, int acmod, int output, sample_t bias, sample_t clev, sample_t slev); @@ -55,16 +55,16 @@ static void upmix_C (sample_t * samples, int acmod, int output); void downmix_accel_init(uint32_t mm_accel) { - upmix= upmix_C; - downmix= downmix_C; + a52_upmix= upmix_C; + a52_downmix= downmix_C; #if defined(ARCH_X86) || defined(ARCH_X86_64) - if(mm_accel & MM_ACCEL_X86_MMX) upmix= upmix_MMX; - if(mm_accel & MM_ACCEL_X86_SSE) downmix= downmix_SSE; - if(mm_accel & MM_ACCEL_X86_3DNOW) downmix= downmix_3dnow; + if(mm_accel & MM_ACCEL_X86_MMX) a52_upmix= upmix_MMX; + if(mm_accel & MM_ACCEL_X86_SSE) a52_downmix= downmix_SSE; + if(mm_accel & MM_ACCEL_X86_3DNOW) a52_downmix= downmix_3dnow; #endif } -int downmix_init (int input, int flags, sample_t * level, +int a52_downmix_init (int input, int flags, sample_t * level, sample_t clev, sample_t slev) { static uint8_t table[11][8] = { @@ -183,7 +183,7 @@ int downmix_init (int input, int flags, sample_t * level, return output; } -int downmix_coeff (sample_t * coeff, int acmod, int output, sample_t level, +int a52_downmix_coeff (sample_t * coeff, int acmod, int output, sample_t level, sample_t clev, sample_t slev) { switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) { @@ -478,7 +478,7 @@ static void zero (sample_t * samples) samples[i] = 0; } -static void downmix_C (sample_t * samples, int acmod, int output, sample_t bias, +void downmix_C (sample_t * samples, int acmod, int output, sample_t bias, sample_t clev, sample_t slev) { switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) { @@ -619,7 +619,7 @@ static void downmix_C (sample_t * samples, int acmod, int output, sample_t bias, } } -static void upmix_C (sample_t * samples, int acmod, int output) +void upmix_C (sample_t * samples, int acmod, int output) { switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) { |