Commit 31c6f6f6 authored by Ben Avison's avatar Ben Avison Committed by Martin Storsjö

fmtconvert: Add a new method, int32_to_float_fmul_array8

This is similar to int32_to_float_fmul_scalar, but
loads a new scalar multiplier every 8 input samples.
This enables the use of much larger input arrays, which
is important for pipelining on some CPUs (such as
ARMv6).
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent ce9ed10a
...@@ -32,6 +32,15 @@ static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src, ...@@ -32,6 +32,15 @@ static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src,
dst[i] = src[i] * mul; dst[i] = src[i] * mul;
} }
static void int32_to_float_fmul_array8_c(FmtConvertContext *c, float *dst,
const int32_t *src, const float *mul,
int len)
{
int i;
for (i = 0; i < len; i += 8)
c->int32_to_float_fmul_scalar(&dst[i], &src[i], *mul++, 8);
}
static av_always_inline int float_to_int16_one(const float *src){ static av_always_inline int float_to_int16_one(const float *src){
return av_clip_int16(lrintf(*src)); return av_clip_int16(lrintf(*src));
} }
...@@ -81,6 +90,7 @@ void ff_float_interleave_c(float *dst, const float **src, unsigned int len, ...@@ -81,6 +90,7 @@ void ff_float_interleave_c(float *dst, const float **src, unsigned int len,
av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx) av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx)
{ {
c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c; c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c;
c->int32_to_float_fmul_array8 = int32_to_float_fmul_array8_c;
c->float_to_int16 = float_to_int16_c; c->float_to_int16 = float_to_int16_c;
c->float_to_int16_interleave = float_to_int16_interleave_c; c->float_to_int16_interleave = float_to_int16_interleave_c;
c->float_interleave = ff_float_interleave_c; c->float_interleave = ff_float_interleave_c;
......
...@@ -38,6 +38,22 @@ typedef struct FmtConvertContext { ...@@ -38,6 +38,22 @@ typedef struct FmtConvertContext {
void (*int32_to_float_fmul_scalar)(float *dst, const int32_t *src, void (*int32_to_float_fmul_scalar)(float *dst, const int32_t *src,
float mul, int len); float mul, int len);
/**
* Convert an array of int32_t to float and multiply by a float value from another array,
* stepping along the float array once for each 8 integers.
* @param c pointer to FmtConvertContext.
* @param dst destination array of float.
* constraints: 16-byte aligned
* @param src source array of int32_t.
* constraints: 16-byte aligned
* @param mul source array of float multipliers.
* @param len number of elements to convert.
* constraints: multiple of 8
*/
void (*int32_to_float_fmul_array8)(struct FmtConvertContext *c,
float *dst, const int32_t *src,
const float *mul, int len);
/** /**
* Convert an array of float to an array of int16_t. * Convert an array of float to an array of int16_t.
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment