diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-28 20:27:56 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-28 20:27:56 +0000 |
| commit | 6ee05b430232df905b3413bcf20fe2c60da024fd (patch) | |
| tree | d2ac4921038a5871d2859b17071fd24774b42ee3 /src/liba52/downmix.c | |
| parent | b5ccc95d14f0937c3096c536165af0e2dbfc10ee (diff) | |
| download | xine-lib-6ee05b430232df905b3413bcf20fe2c60da024fd.tar.gz xine-lib-6ee05b430232df905b3413bcf20fe2c60da024fd.tar.bz2 | |
sync to latest liba52 release (0.7.4)
CVS patchset: 2543
CVS date: 2002/08/28 20:27:56
Diffstat (limited to 'src/liba52/downmix.c')
| -rw-r--r-- | src/liba52/downmix.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/liba52/downmix.c b/src/liba52/downmix.c index 6feeab433..b9ac1fdea 100644 --- a/src/liba52/downmix.c +++ b/src/liba52/downmix.c @@ -1,8 +1,10 @@ /* * downmix.c - * Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> + * 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. + * See http://liba52.sourceforge.net/ for updates. * * a52dec is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,16 +23,16 @@ #include "config.h" -#include <inttypes.h> #include <string.h> +#include <inttypes.h> #include "a52.h" #include "a52_internal.h" #define CONVERT(acmod,output) (((output) << 3) + (acmod)) -int downmix_init (int input, int flags, sample_t * level, - sample_t clev, sample_t slev) +int a52_downmix_init (int input, int flags, sample_t * level, + sample_t clev, sample_t slev) { static uint8_t table[11][8] = { {A52_CHANNEL, A52_DOLBY, A52_STEREO, A52_STEREO, @@ -149,8 +151,8 @@ 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, - sample_t clev, sample_t slev) +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)) { @@ -445,8 +447,8 @@ static void zero (sample_t * samples) samples[i] = 0; } -void downmix (sample_t * samples, int acmod, int output, sample_t bias, - sample_t clev, sample_t slev) +void a52_downmix (sample_t * samples, int acmod, int output, sample_t bias, + sample_t clev, sample_t slev) { switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) { @@ -586,7 +588,7 @@ void downmix (sample_t * samples, int acmod, int output, sample_t bias, } } -void upmix (sample_t * samples, int acmod, int output) +void a52_upmix (sample_t * samples, int acmod, int output) { switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) { |