From b0368839ac6de47dee3e971c709676d9635865e9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 3 Mar 2003 14:54:00 +0000 Subject: MpegEncContext.(i)dct_* -> DspContext.(i)dct_* bitexact cleanup Originally committed as revision 1617 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/armv4l/dsputil_arm.c | 30 ++++++++++++++++++++++++++++-- libavcodec/armv4l/mpegvideo_arm.c | 29 ----------------------------- 2 files changed, 28 insertions(+), 31 deletions(-) (limited to 'libavcodec/armv4l') diff --git a/libavcodec/armv4l/dsputil_arm.c b/libavcodec/armv4l/dsputil_arm.c index e459b33915..e3cc05f638 100644 --- a/libavcodec/armv4l/dsputil_arm.c +++ b/libavcodec/armv4l/dsputil_arm.c @@ -21,7 +21,33 @@ extern void j_rev_dct_ARM(DCTELEM *data); -void dsputil_init_armv4l(DSPContext* c, unsigned mask) +/* XXX: local hack */ +static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); +static void (*ff_add_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); + +/* XXX: those functions should be suppressed ASAP when all IDCTs are + converted */ +static void arm_idct_put(uint8_t *dest, int line_size, DCTELEM *block) +{ + j_rev_dct_ARM (block); + ff_put_pixels_clamped(block, dest, line_size); +} +static void arm_idct_add(uint8_t *dest, int line_size, DCTELEM *block) +{ + j_rev_dct_ARM (block); + ff_add_pixels_clamped(block, dest, line_size); +} + +void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx) { -// ff_idct = j_rev_dct_ARM; + const int idct_algo= avctx->idct_algo; + + ff_put_pixels_clamped = c->put_pixels_clamped; + ff_add_pixels_clamped = c->add_pixels_clamped; + + if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_ARM){ + c->idct_put= arm_idct_put; + c->idct_add= arm_idct_add; + c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */ + } } diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c index 485cb55b83..9c5d8bf862 100644 --- a/libavcodec/armv4l/mpegvideo_arm.c +++ b/libavcodec/armv4l/mpegvideo_arm.c @@ -21,35 +21,6 @@ #include "../mpegvideo.h" #include "../avcodec.h" -extern void j_rev_dct_ARM(DCTELEM *data); -/* XXX: local hack */ -static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); -static void (*ff_add_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); - -/* XXX: those functions should be suppressed ASAP when all IDCTs are - converted */ -static void arm_idct_put(uint8_t *dest, int line_size, DCTELEM *block) -{ - j_rev_dct_ARM (block); - ff_put_pixels_clamped(block, dest, line_size); -} -static void arm_idct_add(uint8_t *dest, int line_size, DCTELEM *block) -{ - j_rev_dct_ARM (block); - ff_add_pixels_clamped(block, dest, line_size); -} - void MPV_common_init_armv4l(MpegEncContext *s) { - int i; - const int idct_algo= s->avctx->idct_algo; - - ff_put_pixels_clamped = s->dsp.put_pixels_clamped; - ff_add_pixels_clamped = s->dsp.add_pixels_clamped; - - if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_ARM){ - s->idct_put= arm_idct_put; - s->idct_add= arm_idct_add; - s->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */ - } } -- cgit v1.2.3