diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-08-20 16:36:47 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-08-28 23:54:15 +0200 |
| commit | f61bece684d9685b07895508e6c1c733b5564ccf (patch) | |
| tree | 3375c204994cab80d06115a141fc3068d26efefa /libswscale/utils.c | |
| parent | 8410d6e93c2e074881f1c7b7e4cdefd2e497d52e (diff) | |
ppc: Add and use convenience macro to check for AltiVec availability
Diffstat (limited to 'libswscale/utils.c')
| -rw-r--r-- | libswscale/utils.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 408859d64a..c47678cdd2 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -45,6 +45,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavutil/ppc/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "rgb2rgb.h" @@ -492,7 +493,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, minFilterSize = min; } - if (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) { + if (PPC_ALTIVEC(cpu_flags)) { // we can handle the special case 4, so we don't want to go the full 8 if (minFilterSize < 5) filterAlign = 4; @@ -805,7 +806,7 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], contrast, saturation); // FIXME factorize - if (HAVE_ALTIVEC && av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) + if (PPC_ALTIVEC(av_get_cpu_flags())) ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness, contrast, saturation); return 0; @@ -1121,8 +1122,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, { const int filterAlign = (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 4 : - (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) ? 8 : - 1; + PPC_ALTIVEC(cpu_flags) ? 8 : 1; if (initFilter(&c->hLumFilter, &c->hLumFilterPos, &c->hLumFilterSize, c->lumXInc, @@ -1145,8 +1145,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, { const int filterAlign = (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 2 : - (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) ? 8 : - 1; + PPC_ALTIVEC(cpu_flags) ? 8 : 1; if (initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize, c->lumYInc, srcH, dstH, filterAlign, (1 << 12), @@ -1283,7 +1282,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, av_log(c, AV_LOG_INFO, "using 3DNOW\n"); else if (INLINE_MMX(cpu_flags)) av_log(c, AV_LOG_INFO, "using MMX\n"); - else if (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) + else if (PPC_ALTIVEC(cpu_flags)) av_log(c, AV_LOG_INFO, "using AltiVec\n"); else av_log(c, AV_LOG_INFO, "using C\n"); |