Browse Source

arm: Macroize the test for 'setend' CPU instruction support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
tags/n2.4
Ben Avison Diego Biurrun 11 years ago
parent
commit
6869612f5c
2 changed files with 7 additions and 5 deletions
  1. +1
    -5
      libavcodec/arm/h264dsp_init_arm.c
  2. +6
    -0
      libavutil/arm/cpu.h

+ 1
- 5
libavcodec/arm/h264dsp_init_arm.c View File

@@ -104,12 +104,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_h264_find_start_code_candidate_armv6;
}
if (have_neon(cpu_flags))
h264dsp_init_neon(c, bit_depth, chroma_format_idc);
}

+ 6
- 0
libavutil/arm/cpu.h View File

@@ -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 */

Loading…
Cancel
Save