diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2015-12-09 22:28:36 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2015-12-14 16:42:35 +0100 |
| commit | e2710e790c09e49e86baa58c6063af0097cc8cb0 (patch) | |
| tree | 4bf42a3192ea353305d8409d085522100a16b350 /libavcodec | |
| parent | 5dfe4edad63971d669ae456b0bc40ef9364cca80 (diff) | |
| download | ffmpeg-e2710e790c09e49e86baa58c6063af0097cc8cb0.tar.gz | |
arm: add a cpu flag for the VFPv2 vector mode
The vector mode was deprecated in ARMv7-A/VFPv3 and various cpu
implementations do not support it in hardware. Vector mode code will
depending the OS either be emulated in software or result in an illegal
instruction on cpus which does not support it. This was not really
problem in practice since NEON implementations of the same functions are
preferred. It will however become a problem for checkasm which tests
every cpu flag separately.
Since this is a cpu feature newer cpu do not support anymore the
behaviour of this flag differs from the other flags. It can be only
activated by runtime cpu feature selection.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/arm/dcadsp_init_arm.c | 4 | ||||
| -rw-r--r-- | libavcodec/arm/fft_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/fmtconvert_init_arm.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/arm/dcadsp_init_arm.c b/libavcodec/arm/dcadsp_init_arm.c index 540048415f..252f4aeadd 100644 --- a/libavcodec/arm/dcadsp_init_arm.c +++ b/libavcodec/arm/dcadsp_init_arm.c @@ -59,7 +59,7 @@ av_cold void ff_dcadsp_init_arm(DCADSPContext *s) { int cpu_flags = av_get_cpu_flags(); - if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) { + if (have_vfp_vm(cpu_flags)) { s->lfe_fir[0] = ff_dca_lfe_fir32_vfp; s->lfe_fir[1] = ff_dca_lfe_fir64_vfp; s->qmf_32_subbands = ff_dca_qmf_32_subbands_vfp; @@ -75,7 +75,7 @@ av_cold void ff_synth_filter_init_arm(SynthFilterContext *s) { int cpu_flags = av_get_cpu_flags(); - if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) + if (have_vfp_vm(cpu_flags)) s->synth_filter_float = ff_synth_filter_float_vfp; if (have_neon(cpu_flags)) s->synth_filter_float = ff_synth_filter_float_neon; diff --git a/libavcodec/arm/fft_init_arm.c b/libavcodec/arm/fft_init_arm.c index bc143c10fb..6d6fa220a5 100644 --- a/libavcodec/arm/fft_init_arm.c +++ b/libavcodec/arm/fft_init_arm.c @@ -40,7 +40,7 @@ av_cold void ff_fft_init_arm(FFTContext *s) { int cpu_flags = av_get_cpu_flags(); - if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) { + if (have_vfp_vm(cpu_flags)) { s->fft_calc = ff_fft_calc_vfp; #if CONFIG_MDCT s->imdct_half = ff_imdct_half_vfp; diff --git a/libavcodec/arm/fmtconvert_init_arm.c b/libavcodec/arm/fmtconvert_init_arm.c index 27d3c88011..6a80bfb6b3 100644 --- a/libavcodec/arm/fmtconvert_init_arm.c +++ b/libavcodec/arm/fmtconvert_init_arm.c @@ -38,7 +38,7 @@ av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx { int cpu_flags = av_get_cpu_flags(); - if (have_vfp(cpu_flags)) { + if (have_vfp_vm(cpu_flags)) { if (!have_vfpv3(cpu_flags)) { c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_vfp; c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_vfp; |