Mercurial > libavcodec.hg
changeset 730:b24ea84b23e2 libavcodec
trying to fix the non-x86 IDCTs (untested)
| author | michaelni |
|---|---|
| date | Sun, 06 Oct 2002 15:27:01 +0000 |
| parents | fb7d96d818cf |
| children | f011a0df269f |
| files | Makefile armv4l/dsputil_arm.c armv4l/mpegvideo_arm.c mlib/dsputil_mlib.c mpegvideo.c |
| diffstat | 5 files changed, 76 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Oct 05 00:57:42 2002 +0000 +++ b/Makefile Sun Oct 06 15:27:01 2002 +0000 @@ -55,7 +55,7 @@ # armv4l specific stuff ifeq ($(TARGET_ARCH_ARMV4L),yes) ASM_OBJS += armv4l/jrevdct_arm.o -OBJS += armv4l/dsputil_arm.o +OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o endif # sun mediaLib specific stuff
--- a/armv4l/dsputil_arm.c Sat Oct 05 00:57:42 2002 +0000 +++ b/armv4l/dsputil_arm.c Sun Oct 06 15:27:01 2002 +0000 @@ -23,5 +23,5 @@ void dsputil_init_armv4l(void) { - ff_idct = j_rev_dct_ARM; +// ff_idct = j_rev_dct_ARM; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/armv4l/mpegvideo_arm.c Sun Oct 06 15:27:01 2002 +0000 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2002 Michael Niedermayer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "../dsputil.h" +#include "../mpegvideo.h" +#include "../avcodec.h" + +extern void j_rev_dct_ARM(DCTELEM *data); + +/* XXX: those functions should be suppressed ASAP when all IDCTs are + converted */ +static void arm_idct_put(UINT8 *dest, int line_size, DCTELEM *block) +{ + j_rev_dct_ARM (block); + put_pixels_clamped(block, dest, line_size); +} +static void arm_idct_add(UINT8 *dest, int line_size, DCTELEM *block) +{ + j_rev_dct_ARM (block); + add_pixels_clamped(block, dest, line_size); +} + +void MPV_common_init_armv4l(MpegEncContext *s) +{ + int i; + const int idct_algo= s->avctx->idct_algo; + + if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_ARM){ + s->idct_put= arm_idct_put; + s->idct_add= arm_idct_add; + for(i=0; i<64; i++) + s->idct_permutation[i]= i; + } +}
--- a/mlib/dsputil_mlib.c Sat Oct 05 00:57:42 2002 +0000 +++ b/mlib/dsputil_mlib.c Sun Oct 06 15:27:01 2002 +0000 @@ -112,12 +112,18 @@ mlib_VideoAddBlock_U8_S16(pixels, (mlib_s16 *)block, line_size); } - -void ff_idct_mlib(DCTELEM *data) +/* XXX: those functions should be suppressed ASAP when all IDCTs are + converted */ +static void mlib_idct_put(UINT8 *dest, int line_size, DCTELEM *block) { mlib_VideoIDCT8x8_S16_S16 (data, data); + put_pixels_clamped(block, dest, line_size); } - +static void mlib_idct_add(UINT8 *dest, int line_size, DCTELEM *block) +{ + mlib_VideoIDCT8x8_S16_S16 (data, data); + add_pixels_clamped(block, dest, line_size); +} void ff_fdct_mlib(DCTELEM *data) { @@ -126,8 +132,6 @@ void dsputil_init_mlib(void) { - ff_idct = ff_idct_mlib; - put_pixels_tab[1][0] = put_pixels_mlib; put_pixels_tab[1][1] = put_pixels_x2_mlib; put_pixels_tab[1][2] = put_pixels_y2_mlib; @@ -145,7 +149,18 @@ void MPV_common_init_mlib(MpegEncContext *s) { + int i; + const int idct_algo= s->avctx->idct_algo; + if(s->avctx->dct_algo==FF_DCT_AUTO || s->avctx->dct_algo==FF_DCT_MLIB){ s->fdct = ff_fdct_mlib; } + + if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_MLIB){ + s->idct_put= mlib_idct_put; + s->idct_add= mlib_idct_add; + for(i=0; i<64; i++) + s->idct_permutation[i]= i; + } + }