diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-09-21 05:40:08 +0400 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-09-21 05:40:08 +0400 |
| commit | 3572b281c8900a7eb7db8326d2a7d394cd6a8c9b (patch) | |
| tree | f76c27aa72ca4416c8efbac667fcdf4d455e51c3 /libavcodec/arm | |
| parent | ee3d7f585215458246c2dd971c2afdd2642a5ca8 (diff) | |
ARM: remove broken IPP support
Originally committed as revision 19935 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/dsputil_arm.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/libavcodec/arm/dsputil_arm.c b/libavcodec/arm/dsputil_arm.c index 3bc2d62d02..79b484b69e 100644 --- a/libavcodec/arm/dsputil_arm.c +++ b/libavcodec/arm/dsputil_arm.c @@ -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 @@ static void simple_idct_ARM_add(uint8_t *dest, int line_size, DCTELEM *block) 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 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx) 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 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx) 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; |