diff options
Diffstat (limited to 'ffmpeg/libavcodec/arm/fmtconvert_init_arm.c')
| -rw-r--r-- | ffmpeg/libavcodec/arm/fmtconvert_init_arm.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/ffmpeg/libavcodec/arm/fmtconvert_init_arm.c b/ffmpeg/libavcodec/arm/fmtconvert_init_arm.c index 1d99c97..37319ed 100644 --- a/ffmpeg/libavcodec/arm/fmtconvert_init_arm.c +++ b/ffmpeg/libavcodec/arm/fmtconvert_init_arm.c @@ -25,9 +25,15 @@ #include "libavcodec/avcodec.h" #include "libavcodec/fmtconvert.h" -void ff_int32_to_float_fmul_scalar_neon(float *dst, const int *src, +void ff_int32_to_float_fmul_scalar_neon(float *dst, const int32_t *src, float mul, int len); +void ff_int32_to_float_fmul_scalar_vfp(float *dst, const int32_t *src, + float mul, int len); +void ff_int32_to_float_fmul_array8_vfp(FmtConvertContext *c, float *dst, + const int32_t *src, const float *mul, + int len); + void ff_float_to_int16_neon(int16_t *dst, const float *src, long len); void ff_float_to_int16_interleave_neon(int16_t *, const float **, long, int); @@ -37,8 +43,15 @@ av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx { int cpu_flags = av_get_cpu_flags(); - if (have_vfp(cpu_flags) && have_armv6(cpu_flags)) { - c->float_to_int16 = ff_float_to_int16_vfp; + if (have_vfp(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; + } + + if (have_armv6(cpu_flags)) { + c->float_to_int16 = ff_float_to_int16_vfp; + } } if (have_neon(cpu_flags)) { |