Mercurial > libavcodec.hg
changeset 10203:0905f8eed0a9 libavcodec
ARM: remove broken IPP support
| author | mru |
|---|---|
| date | Mon, 21 Sep 2009 01:40:08 +0000 |
| parents | d0456fd306d2 |
| children | db033d1fbf44 |
| files | arm/dsputil_arm.c |
| diffstat | 1 files changed, 1 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/arm/dsputil_arm.c Mon Sep 21 01:37:50 2009 +0000 +++ b/arm/dsputil_arm.c Mon Sep 21 01:40:08 2009 +0000 @@ -20,9 +20,6 @@ */ #include "libavcodec/dsputil.h" -#if HAVE_IPP -#include <ipp.h> -#endif void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx); void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx); @@ -97,29 +94,6 @@ ff_add_pixels_clamped(block, dest, line_size); } -#if HAVE_IPP -static void simple_idct_ipp(DCTELEM *block) -{ - ippiDCT8x8Inv_Video_16s_C1I(block); -} -static void simple_idct_ipp_put(uint8_t *dest, int line_size, DCTELEM *block) -{ - ippiDCT8x8Inv_Video_16s8u_C1R(block, dest, line_size); -} - -void add_pixels_clamped_iwmmxt(const DCTELEM *block, uint8_t *pixels, int line_size); - -static void simple_idct_ipp_add(uint8_t *dest, int line_size, DCTELEM *block) -{ - ippiDCT8x8Inv_Video_16s_C1I(block); -#if HAVE_IWMMXT - add_pixels_clamped_iwmmxt(block, dest, line_size); -#else - ff_add_pixels_clamped_ARM(block, dest, line_size); -#endif -} -#endif - int mm_support(void) { return HAVE_IWMMXT * FF_MM_IWMMXT; @@ -134,9 +108,7 @@ if (avctx->lowres == 0) { if(idct_algo == FF_IDCT_AUTO){ -#if HAVE_IPP - idct_algo = FF_IDCT_IPP; -#elif HAVE_NEON +#if HAVE_NEON idct_algo = FF_IDCT_SIMPLENEON; #elif HAVE_ARMV6 idct_algo = FF_IDCT_SIMPLEARMV6; @@ -171,13 +143,6 @@ c->idct = simple_idct_armv5te; c->idct_permutation_type = FF_NO_IDCT_PERM; #endif -#if HAVE_IPP - } else if (idct_algo==FF_IDCT_IPP){ - c->idct_put= simple_idct_ipp_put; - c->idct_add= simple_idct_ipp_add; - c->idct = simple_idct_ipp; - c->idct_permutation_type= FF_NO_IDCT_PERM; -#endif #if HAVE_NEON } else if (idct_algo==FF_IDCT_SIMPLENEON){ c->idct_put= ff_simple_idct_put_neon;