diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 11:11:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 11:11:08 +0200 |
| commit | d8cae42d72092501be880348ae0c223d2ea220a2 (patch) | |
| tree | 9f5cd163810d5e7babd864637b10968c99814ab8 /libavcodec/ac3enc_fixed.c | |
| parent | d3d97d43d51840086d86728bbfcd072eea7a5b85 (diff) | |
| parent | 9d4bbf6d4f3a0b78c4ec7a1f366adf5c3cc8ea1a (diff) | |
| download | ffmpeg-d8cae42d72092501be880348ae0c223d2ea220a2.tar.gz | |
Merge remote-tracking branch 'mans/ac3'
* mans/ac3:
ac3enc: slightly faster quantize_mantissas_blk_ch()
ac3enc: NEON optimised sum_square_butterfly_float
ac3enc: neon optimised sum_square_butterfly_int32
ac3enc: move inner loop of compute_rematrixing_strategy to ac3dsp
Conflicts:
libavcodec/ac3enc_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_fixed.c')
| -rw-r--r-- | libavcodec/ac3enc_fixed.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 0c7f81b7d3..46d971ddf7 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -103,6 +103,12 @@ static void scale_coefficients(AC3EncodeContext *s) } } +static void sum_square_butterfly(AC3EncodeContext *s, int64_t sum[4], + const int32_t *coef0, const int32_t *coef1, + int len) +{ + s->ac3dsp.sum_square_butterfly_int32(sum, coef0, coef1, len); +} /** * Clip MDCT coefficients to allowable range. |