diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-29 14:27:03 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-06-01 15:45:13 +0100 |
| commit | 8e112df409061034202b98fcc6ce2c1c670c0dda (patch) | |
| tree | eca4056af36f4aae78cbdf66664abf2c7388797b | |
| parent | bde2c1c7fe175c5c857a8d9a8ae05f31ace0b94f (diff) | |
| download | ffmpeg-8e112df409061034202b98fcc6ce2c1c670c0dda.tar.gz | |
ARM: ac3dsp: optimised update_bap_counts()
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/arm/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/arm/ac3dsp_arm.S | 35 | ||||
| -rw-r--r-- | libavcodec/arm/ac3dsp_init_arm.c | 4 |
3 files changed, 39 insertions, 1 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index a5a5dfab64..a5abfdd128 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -1,4 +1,5 @@ OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \ + arm/ac3dsp_arm.o OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o \ diff --git a/libavcodec/arm/ac3dsp_arm.S b/libavcodec/arm/ac3dsp_arm.S new file mode 100644 index 0000000000..545714cff1 --- /dev/null +++ b/libavcodec/arm/ac3dsp_arm.S @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2011 Mans Rullgard <mans@mansr.com> + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "asm.S" + +function ff_ac3_update_bap_counts_arm, export=1 + push {lr} + ldrb lr, [r1], #1 +1: + lsl r3, lr, #1 + ldrh r12, [r0, r3] + subs r2, r2, #1 + ldrbgt lr, [r1], #1 + add r12, r12, #1 + strh r12, [r0, r3] + bgt 1b + pop {pc} +endfunc diff --git a/libavcodec/arm/ac3dsp_init_arm.c b/libavcodec/arm/ac3dsp_init_arm.c index 4414dc8170..aed11f4bb8 100644 --- a/libavcodec/arm/ac3dsp_init_arm.c +++ b/libavcodec/arm/ac3dsp_init_arm.c @@ -35,10 +35,12 @@ void ff_ac3_bit_alloc_calc_bap_armv6(int16_t *mask, int16_t *psd, int snr_offset, int floor, const uint8_t *bap_tab, uint8_t *bap); -int ff_ac3_compute_mantissa_size_arm(int cnt[5], uint8_t *bap, int nb_coefs); +void ff_ac3_update_bap_counts_arm(uint16_t mant_cnt[16], uint8_t *bap, int len); av_cold void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact) { + c->update_bap_counts = ff_ac3_update_bap_counts_arm; + if (HAVE_ARMV6) { c->bit_alloc_calc_bap = ff_ac3_bit_alloc_calc_bap_armv6; } |