From 88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 20 Jan 2013 01:02:29 +0100 Subject: Drop DCTELEM typedef It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje --- libavcodec/dct-test.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'libavcodec/dct-test.c') diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 3ce0270006..cd6480d381 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -39,6 +39,7 @@ #include "libavutil/lfg.h" #include "libavutil/time.h" +#include "dsputil.h" #include "simple_idct.h" #include "aandcttab.h" #include "faandct.h" @@ -49,24 +50,24 @@ #undef printf // BFIN -void ff_bfin_idct(DCTELEM *block); -void ff_bfin_fdct(DCTELEM *block); +void ff_bfin_idct(int16_t *block); +void ff_bfin_fdct(int16_t *block); // ALTIVEC -void ff_fdct_altivec(DCTELEM *block); +void ff_fdct_altivec(int16_t *block); // ARM -void ff_j_rev_dct_arm(DCTELEM *data); -void ff_simple_idct_arm(DCTELEM *data); -void ff_simple_idct_armv5te(DCTELEM *data); -void ff_simple_idct_armv6(DCTELEM *data); -void ff_simple_idct_neon(DCTELEM *data); +void ff_j_rev_dct_arm(int16_t *data); +void ff_simple_idct_arm(int16_t *data); +void ff_simple_idct_armv5te(int16_t *data); +void ff_simple_idct_armv6(int16_t *data); +void ff_simple_idct_neon(int16_t *data); -void ff_simple_idct_axp(DCTELEM *data); +void ff_simple_idct_axp(int16_t *data); struct algo { const char *name; - void (*func)(DCTELEM *block); + void (*func)(int16_t *block); enum formattag { NO_PERM, MMX_PERM, MMX_SIMPLE_PERM, SCALE_PERM, SSE2_PERM, PARTTRANS_PERM } format; int mm_support; @@ -166,10 +167,10 @@ static void idct_mmx_init(void) } } -DECLARE_ALIGNED(16, static DCTELEM, block)[64]; -DECLARE_ALIGNED(8, static DCTELEM, block1)[64]; +DECLARE_ALIGNED(16, static int16_t, block)[64]; +DECLARE_ALIGNED(8, static int16_t, block1)[64]; -static void init_block(DCTELEM block[64], int test, int is_idct, AVLFG *prng) +static void init_block(int16_t block[64], int test, int is_idct, AVLFG *prng) { int i, j; @@ -197,7 +198,7 @@ static void init_block(DCTELEM block[64], int test, int is_idct, AVLFG *prng) } } -static void permute(DCTELEM dst[64], const DCTELEM src[64], int perm) +static void permute(int16_t dst[64], const int16_t src[64], int perm) { int i; @@ -221,7 +222,7 @@ static void permute(DCTELEM dst[64], const DCTELEM src[64], int perm) static int dct_error(const struct algo *dct, int test, int is_idct, int speed) { - void (*ref)(DCTELEM *block) = is_idct ? ff_ref_idct : ff_ref_fdct; + void (*ref)(int16_t *block) = is_idct ? ff_ref_idct : ff_ref_fdct; int it, i, scale; int err_inf, v; int64_t err2, ti, ti1, it1, err_sum = 0; -- cgit v1.2.1