mirror of https://github.com/FFmpeg/FFmpeg.git
This patch supplies handwritten NEON code for AAC. The benchmarks below were collected by invoking these two commands on each of my boards, A78, A72 and Thinkpad x13s: 1) ./tests/checkasm/checkasm --test=aacencdsp --bench --runs=12 2) ./ffmpeg -y -t 10:00 -f lavfi -i sine /tmp/foo.aac (the first line is speed without the patch, second, with) - A78 abs_pow34_c: 4161.5 ( 1.00x) abs_pow34_neon: 3586.2 ( 1.16x) quant_bands_signed_c: 5548.0 ( 1.00x) quant_bands_signed_neon: 1126.8 ( 4.92x) quant_bands_unsigned_c: 3979.2 ( 1.00x) quant_bands_unsigned_neon: 800.2 ( 4.97x) size= 5251KiB time=00:10:00.00 bitrate= 71.7kbits/s speed=71.6x size= 5251KiB time=00:10:00.00 bitrate= 71.7kbits/s speed=82.3x - A72 abs_pow34_c: 15362.2 ( 1.00x) abs_pow34_neon: 15382.5 ( 1.00x) quant_bands_signed_c: 9926.5 ( 1.00x) quant_bands_signed_neon: 2467.8 ( 4.02x) quant_bands_unsigned_c: 5469.8 ( 1.00x) quant_bands_unsigned_neon: 2089.5 ( 2.62x) size= 5251KiB time=00:10:00.00 bitrate= 71.7kbits/s speed=34.3x size= 5251KiB time=00:10:00.00 bitrate= 71.7kbits/s speed=37.8 - x13s abs_pow34_c: 2413.4 ( 1.00x) abs_pow34_neon: 1796.2 ( 1.34x) quant_bands_signed_c: 2968.9 ( 1.00x) quant_bands_signed_neon: 675.6 ( 4.39x) quant_bands_unsigned_c: 2311.9 ( 1.00x) quant_bands_unsigned_neon: 477.1 ( 4.85x) size= 5251KiB time=00:10:00.00 bitrate= 71.7kbits/s speed= 135x size= 5251KiB time=00:10:00.00 bitrate= 71.7kbits/s speed= 159x Signed-off-by: Martin Storsjö <martin@martin.st>master
parent
959b799c8d
commit
83e4b068d9
4 changed files with 106 additions and 0 deletions
@ -0,0 +1,38 @@ |
||||
/*
|
||||
* Copyright (c) 2025 Krzysztof Aleksander Pyrkosz |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg 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. |
||||
* |
||||
* FFmpeg 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 FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#include "config.h" |
||||
|
||||
#include "libavutil/arm/cpu.h" |
||||
#include "libavutil/attributes.h" |
||||
#include "libavcodec/aacencdsp.h" |
||||
|
||||
void ff_abs_pow34_neon(float *out, const float *in, const int size); |
||||
void ff_aac_quant_bands_neon(int *, const float *, const float *, int, int, |
||||
int, const float, const float); |
||||
|
||||
av_cold void ff_aacenc_dsp_init_aarch64(AACEncDSPContext *s) |
||||
{ |
||||
int cpu_flags = av_get_cpu_flags(); |
||||
if (!have_neon(cpu_flags)) return; |
||||
|
||||
s->abs_pow34 = ff_abs_pow34_neon; |
||||
s->quant_bands = ff_aac_quant_bands_neon; |
||||
} |
@ -0,0 +1,63 @@ |
||||
/* |
||||
* Copyright (c) 2025 Krzysztof Aleksander Pyrkosz |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg 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. |
||||
* |
||||
* FFmpeg 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 FFmpeg; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#include "libavutil/aarch64/asm.S" |
||||
|
||||
function ff_abs_pow34_neon, export=1 |
||||
1: |
||||
ld1 {v0.4s}, [x1], #16 |
||||
subs w2, w2, #4 |
||||
fabs v0.4s, v0.4s |
||||
fsqrt v2.4s, v0.4s |
||||
fmul v0.4s, v2.4s, v0.4s |
||||
fsqrt v0.4s, v0.4s |
||||
st1 {v0.4s}, [x0], #16 |
||||
b.ne 1b |
||||
ret |
||||
endfunc |
||||
|
||||
function ff_aac_quant_bands_neon, export=1 |
||||
scvtf s2, w5 |
||||
dup v1.4s, v1.s[0] |
||||
dup v2.4s, v2.s[0] |
||||
cbz w4, 0f |
||||
movi v5.4s, 0x80, lsl #24 |
||||
.irp signed,1,0 |
||||
\signed: |
||||
ld1 {v3.4s}, [x2], #16 |
||||
subs w3, w3, #4 |
||||
fmul v3.4s, v3.4s, v0.s[0] |
||||
.if \signed |
||||
ld1 {v4.4s}, [x1], #16 |
||||
.endif |
||||
fadd v3.4s, v3.4s, v1.4s |
||||
.if \signed |
||||
and v4.16b, v4.16b, v5.16b |
||||
.endif |
||||
fmin v3.4s, v3.4s, v2.4s |
||||
.if \signed |
||||
eor v3.16b, v4.16b, v3.16b |
||||
.endif |
||||
fcvtzs v3.4s, v3.4s |
||||
st1 {v3.4s}, [x0], #16 |
||||
b.ne \signed\()b |
||||
ret |
||||
.endr |
||||
endfunc |
Loading…
Reference in new issue