@@ -35,6 +35,8 @@ ARMV8-OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp.o
# subsystems
NEON-OBJS-$(CONFIG_AAC_DECODER) += aarch64/sbrdsp_neon.o
+NEON-OBJS-$(CONFIG_BLOCKDSP) += aarch64/blockdsp_init_aarch64.o \
+ aarch64/blockdsp_neon.o
NEON-OBJS-$(CONFIG_FFT) += aarch64/fft_neon.o
NEON-OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_neon.o
NEON-OBJS-$(CONFIG_H264CHROMA) += aarch64/h264cmc_neon.o
new file mode 100644
@@ -0,0 +1,42 @@
+/*
+ * AArch64 NEON optimised block operations
+ *
+ * Copyright (c) 2022 Ben Avison <bavison@riscosopen.org>
+ *
+ * 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 <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/arm/cpu.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/blockdsp.h"
+
+void ff_clear_block_neon(int16_t *block);
+void ff_clear_blocks_neon(int16_t *blocks);
+
+av_cold void ff_blockdsp_init_aarch64(BlockDSPContext *c)
+{
+ int cpu_flags = av_get_cpu_flags();
+
+ if (have_neon(cpu_flags)) {
+ c->clear_block = ff_clear_block_neon;
+ c->clear_blocks = ff_clear_blocks_neon;
+ }
+}
new file mode 100644
@@ -0,0 +1,43 @@
+/*
+ * AArch64 NEON optimised block operations
+ *
+ * Copyright (c) 2022 Ben Avison <bavison@riscosopen.org>
+ *
+ * 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_clear_block_neon, export=1
+ movi v0.16b, #0
+ movi v1.16b, #0
+ st1 {v0.16b, v1.16b}, [x0], #32
+ st1 {v0.16b, v1.16b}, [x0], #32
+ st1 {v0.16b, v1.16b}, [x0], #32
+ st1 {v0.16b, v1.16b}, [x0]
+ ret
+endfunc
+
+function ff_clear_blocks_neon, export=1
+ movi v0.16b, #0
+ movi v1.16b, #0
+ .rept 23
+ st1 {v0.16b, v1.16b}, [x0], #32
+ .endr
+ st1 {v0.16b, v1.16b}, [x0]
+ ret
+endfunc
@@ -64,6 +64,8 @@ av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx)
c->fill_block_tab[0] = fill_block16_c;
c->fill_block_tab[1] = fill_block8_c;
+ if (ARCH_AARCH64)
+ ff_blockdsp_init_aarch64(c);
if (ARCH_ALPHA)
ff_blockdsp_init_alpha(c);
if (ARCH_ARM)
@@ -40,6 +40,7 @@ typedef struct BlockDSPContext {
void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx);
+void ff_blockdsp_init_aarch64(BlockDSPContext *c);
void ff_blockdsp_init_alpha(BlockDSPContext *c);
void ff_blockdsp_init_arm(BlockDSPContext *c);
void ff_blockdsp_init_ppc(BlockDSPContext *c);
Signed-off-by: Ben Avison <bavison@riscosopen.org> --- libavcodec/aarch64/Makefile | 2 + libavcodec/aarch64/blockdsp_init_aarch64.c | 42 +++++++++++++++++++++ libavcodec/aarch64/blockdsp_neon.S | 43 ++++++++++++++++++++++ libavcodec/blockdsp.c | 2 + libavcodec/blockdsp.h | 1 + 5 files changed, 90 insertions(+) create mode 100644 libavcodec/aarch64/blockdsp_init_aarch64.c create mode 100644 libavcodec/aarch64/blockdsp_neon.S