diff --git a/libavcodec/lossless_videodsp.c b/libavcodec/lossless_videodsp.c index 359606981c..876decb1e6 100644 --- a/libavcodec/lossless_videodsp.c +++ b/libavcodec/lossless_videodsp.c @@ -121,6 +121,8 @@ void ff_llviddsp_init(LLVidDSPContext *c) #if ARCH_PPC ff_llviddsp_init_ppc(c); +#elif ARCH_RISCV + ff_llviddsp_init_riscv(c); #elif ARCH_X86 ff_llviddsp_init_x86(c); #endif diff --git a/libavcodec/lossless_videodsp.h b/libavcodec/lossless_videodsp.h index da4baa1414..5309ce4be7 100644 --- a/libavcodec/lossless_videodsp.h +++ b/libavcodec/lossless_videodsp.h @@ -40,6 +40,7 @@ typedef struct LLVidDSPContext { } LLVidDSPContext; void ff_llviddsp_init(LLVidDSPContext *llviddsp); +void ff_llviddsp_init_riscv(LLVidDSPContext *llviddsp); void ff_llviddsp_init_x86(LLVidDSPContext *llviddsp); void ff_llviddsp_init_ppc(LLVidDSPContext *llviddsp); diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index d34dc77458..8f2a519827 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -28,6 +28,8 @@ OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o RVV-OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_rvv.o OBJS-$(CONFIG_LLAUDDSP) += riscv/llauddsp_init.o RVV-OBJS-$(CONFIG_LLAUDDSP) += riscv/llauddsp_rvv.o +OBJS-$(CONFIG_LLVIDDSP) += riscv/llviddsp_init.o +RVV-OBJS-$(CONFIG_LLVIDDSP) += riscv/llviddsp_rvv.o OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \ diff --git a/libavcodec/riscv/llviddsp_init.c b/libavcodec/riscv/llviddsp_init.c new file mode 100644 index 0000000000..f042eeab32 --- /dev/null +++ b/libavcodec/riscv/llviddsp_init.c @@ -0,0 +1,38 @@ +/* + * Copyright © 2023 Rémi Denis-Courmont. + * + * 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/attributes.h" +#include "libavutil/cpu.h" +#include "libavcodec/lossless_videodsp.h" + +void ff_llvid_add_bytes_rvv(uint8_t *, uint8_t *src, ptrdiff_t w); + +av_cold void ff_llviddsp_init_riscv(LLVidDSPContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVV_I32) { + c->add_bytes = ff_llvid_add_bytes_rvv; + } +#endif +} diff --git a/libavcodec/riscv/llviddsp_rvv.S b/libavcodec/riscv/llviddsp_rvv.S new file mode 100644 index 0000000000..a4814837b9 --- /dev/null +++ b/libavcodec/riscv/llviddsp_rvv.S @@ -0,0 +1,36 @@ +/* + * Copyright © 2023 Rémi Denis-Courmont. + * + * 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/riscv/asm.S" + +func ff_llvid_add_bytes_rvv, zve32x +1: + vsetvli t0, a2, e8, m8, ta, ma + vle8.v v0, (a1) + sub a2, a2, t0 + vle8.v v8, (a0) + add a1, t0, a1 + vadd.vv v8, v0, v8 + vse8.v v8, (a0) + add a0, t0, a0 + bnez a2, 1b + + ret +endfunc