diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-11-28 00:32:24 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-11-28 00:32:24 +0000 |
| commit | 10ac361827dc1f9a2a355f037d40a2912203acd4 (patch) | |
| tree | 59b2f5813cf77957efd91489bf83bd296c9ce9ed /libavcodec/dct-test.c | |
| parent | 2d70cc38c5350a6fe55df594cbd34bea88735559 (diff) | |
Do not duplicate AAN DCT tables in dct-test.c.
Originally committed as revision 15948 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 7a805056e5..e00569c50c 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -35,6 +35,7 @@ #include "libavutil/common.h" #include "simple_idct.h" +#include "aandcttab.h" #include "faandct.h" #include "faanidct.h" #include "i386/idct_xvid.h" @@ -120,17 +121,6 @@ struct algo algos[] = { }; #define AANSCALE_BITS 12 -static const unsigned short aanscales[64] = { - /* precomputed values scaled up by 14 bits */ - 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, - 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270, - 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906, - 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315, - 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, - 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552, - 8867, 12299, 11585, 10426, 8867, 6967, 4799, 2446, - 4520, 6270, 5906, 5315, 4520, 3552, 2446, 1247 -}; uint8_t cropTbl[256 + 2 * MAX_NEG_CROP]; @@ -263,7 +253,7 @@ void dct_error(const char *name, int is_idct, if (form == SCALE_PERM) { for(i=0; i<64; i++) { - scale = 8*(1 << (AANSCALE_BITS + 11)) / aanscales[i]; + scale = 8*(1 << (AANSCALE_BITS + 11)) / ff_aanscales[i]; block[i] = (block[i] * scale /*+ (1<<(AANSCALE_BITS-1))*/) >> AANSCALE_BITS; } } |