diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:23:28 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:24:07 +0400 |
commit | 29daad5b98bc07b9669c22b39113f5568ef1c570 (patch) | |
tree | da5f75b91d52033bcfd57bda471fa119d730701c /libswscale/utils.c | |
parent | 2a60666d1d94cb907060b83a182cb5302a1add4b (diff) | |
parent | f61bece684d9685b07895508e6c1c733b5564ccf (diff) |
Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'
* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
ppc: Add and use convenience macro to check for AltiVec availability
Conflicts:
libavcodec/ppc/dsputil_ppc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 e34188a14a..4c9b4abe68 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -46,6 +46,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" @@ -532,7 +533,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; @@ -990,7 +991,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); } @@ -1412,8 +1413,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, @@ -1440,8 +1440,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), @@ -1592,7 +1591,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"); |