xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-08 19:59:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: remove broken IPP support

Browse Source 
Originally committed as revision 19935 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2009-09-21 01:40:08 +00:00
parent ee3d7f5852
commit 3572b281c8
1 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/arm/dsputil_arm.c
View File

@ -20,9 +20,6 @@
*/ */
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#if HAVE_IPP
#include <ipp.h>
#endif
void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx); void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx);
void ff_float_init_arm_vfp(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); 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) int mm_support(void)
{ {
return HAVE_IWMMXT * FF_MM_IWMMXT; return HAVE_IWMMXT * FF_MM_IWMMXT;
@ -134,9 +108,7 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
if (avctx->lowres == 0) { if (avctx->lowres == 0) {
if(idct_algo == FF_IDCT_AUTO){ if(idct_algo == FF_IDCT_AUTO){
#if HAVE_IPP #if HAVE_NEON
idct_algo = FF_IDCT_IPP;
#elif HAVE_NEON
idct_algo = FF_IDCT_SIMPLENEON; idct_algo = FF_IDCT_SIMPLENEON;
#elif HAVE_ARMV6 #elif HAVE_ARMV6
idct_algo = FF_IDCT_SIMPLEARMV6; idct_algo = FF_IDCT_SIMPLEARMV6;
@ -171,13 +143,6 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
c->idct = simple_idct_armv5te; c->idct = simple_idct_armv5te;
c->idct_permutation_type = FF_NO_IDCT_PERM; c->idct_permutation_type = FF_NO_IDCT_PERM;
#endif #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 #if HAVE_NEON
} else if (idct_algo==FF_IDCT_SIMPLENEON){ } else if (idct_algo==FF_IDCT_SIMPLENEON){
c->idct_put= ff_simple_idct_put_neon; c->idct_put= ff_simple_idct_put_neon;