diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 12:46:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 12:46:13 +0200 |
| commit | 7cdb3b2b79d78b7b3e686b3a53e904b4656d461f (patch) | |
| tree | 385b6b788702258652331c138d1e9717087e4253 | |
| parent | 135ea609cebb5a5d331a2550caebe161d163c190 (diff) | |
| parent | 6869612f5c7d4d2f20f69a5658328a761deadb1c (diff) | |
| download | ffmpeg-7cdb3b2b79d78b7b3e686b3a53e904b4656d461f.tar.gz | |
Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'
* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
arm: Macroize the test for 'setend' CPU instruction support
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 6 | ||||
| -rw-r--r-- | libavutil/arm/cpu.h | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 3999e993ab..2027d1861e 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -108,12 +108,8 @@ av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, { int cpu_flags = av_get_cpu_flags(); - if (have_armv6(cpu_flags) && !(have_vfpv3(cpu_flags) || have_neon(cpu_flags))) { - // This function uses the 'setend' instruction which is deprecated - // on ARMv8. This instruction is serializing on some ARMv7 cores as - // well. Therefore, only use the function on ARMv6. + if (have_setend(cpu_flags)) c->h264_find_start_code_candidate = ff_startcode_find_candidate_armv6; - } if (have_neon(cpu_flags)) h264dsp_init_neon(c, bit_depth, chroma_format_idc); } diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index c54558912c..f056a91ca5 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -30,4 +30,10 @@ #define have_vfpv3(flags) CPUEXT(flags, VFPV3) #define have_neon(flags) CPUEXT(flags, NEON) +/* Some functions use the 'setend' instruction which is deprecated on ARMv8 + * and serializing on some ARMv7 cores. This macro ensures such functions + * are only enabled on ARMv6. */ +#define have_setend(flags) \ + (have_armv6(flags) && !(have_vfpv3(flags) || have_neon(flags))) + #endif /* AVUTIL_ARM_CPU_H */ |