diff options
Diffstat (limited to 'libavcodec/ppc/idctdsp.c')
| -rw-r--r-- | libavcodec/ppc/idctdsp.c | 53 |
1 files changed, 40 insertions, 13 deletions
diff --git a/libavcodec/ppc/idctdsp.c b/libavcodec/ppc/idctdsp.c index c85b58e6ff..80e71fdaf0 100644 --- a/libavcodec/ppc/idctdsp.c +++ b/libavcodec/ppc/idctdsp.c @@ -1,28 +1,28 @@ /* * Copyright (c) 2001 Michel Lespinasse * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* NOTE: This code is based on GPL code from the libmpeg2 project. The * author, Michel Lespinasses, has given explicit permission to release - * under LGPL as part of Libav. + * under LGPL as part of FFmpeg. * - * Libav integration by Dieter Shirley + * FFmpeg integration by Dieter Shirley * * This file is a direct copy of the AltiVec IDCT module from the libmpeg2 * project. I've deleted all of the libmpeg2-specific code, renamed the @@ -43,7 +43,7 @@ #include "libavutil/ppc/types_altivec.h" #include "libavcodec/idctdsp.h" -#if HAVE_ALTIVEC && HAVE_BIGENDIAN +#if HAVE_ALTIVEC #define IDCT_HALF \ /* 1st stage */ \ @@ -153,6 +153,22 @@ static const vec_s16 constants[5] = { { 19266, 26722, 25172, 22654, 19266, 22654, 25172, 26722 } }; +static void idct_altivec(int16_t *blk) +{ + vec_s16 *block = (vec_s16 *) blk; + + IDCT; + + block[0] = vx0; + block[1] = vx1; + block[2] = vx2; + block[3] = vx3; + block[4] = vx4; + block[5] = vx5; + block[6] = vx6; + block[7] = vx7; +} + static void idct_put_altivec(uint8_t *dest, int stride, int16_t *blk) { vec_s16 *block = (vec_s16 *) blk; @@ -193,16 +209,26 @@ static void idct_add_altivec(uint8_t *dest, int stride, int16_t *blk) IDCT; +#if HAVE_BIGENDIAN p0 = vec_lvsl(0, dest); p1 = vec_lvsl(stride, dest); p = vec_splat_u8(-1); perm0 = vec_mergeh(p, p0); perm1 = vec_mergeh(p, p1); +#endif -#define ADD(dest, src, perm) \ - /* *(uint64_t *) &tmp = *(uint64_t *) dest; */ \ +#if HAVE_BIGENDIAN +#define GET_TMP2(dest, prm) \ tmp = vec_ld(0, dest); \ - tmp2 = (vec_s16) vec_perm(tmp, (vec_u8) zero, perm); \ + tmp2 = (vec_s16) vec_perm(tmp, (vec_u8) zero, prm); +#else +#define GET_TMP2(dest, prm) \ + tmp = vec_vsx_ld(0, dest); \ + tmp2 = (vec_s16) vec_mergeh(tmp, (vec_u8) zero) +#endif + +#define ADD(dest, src, perm) \ + GET_TMP2(dest, perm); \ tmp3 = vec_adds(tmp2, src); \ tmp = vec_packsu(tmp3, tmp3); \ vec_ste((vec_u32) tmp, 0, (unsigned int *) dest); \ @@ -230,13 +256,14 @@ static void idct_add_altivec(uint8_t *dest, int stride, int16_t *blk) av_cold void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) { -#if HAVE_ALTIVEC && HAVE_BIGENDIAN +#if HAVE_ALTIVEC if (!PPC_ALTIVEC(av_get_cpu_flags())) return; - if (!high_bit_depth) { - if ((avctx->idct_algo == FF_IDCT_AUTO) || + if (!high_bit_depth && avctx->lowres == 0) { + if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & AV_CODEC_FLAG_BITEXACT)) || (avctx->idct_algo == FF_IDCT_ALTIVEC)) { + c->idct = idct_altivec; c->idct_add = idct_add_altivec; c->idct_put = idct_put_altivec; c->perm_type = FF_IDCT_PERM_TRANSPOSE; |