diff --git a/libavcodec/exrdsp.c b/libavcodec/exrdsp.c index 8259da4841..752e1eb553 100644 --- a/libavcodec/exrdsp.c +++ b/libavcodec/exrdsp.c @@ -51,7 +51,9 @@ av_cold void ff_exrdsp_init(ExrDSPContext *c) c->reorder_pixels = reorder_pixels_scalar; c->predictor = predictor_scalar; -#if ARCH_X86 +#if ARCH_RISCV + ff_exrdsp_init_riscv(c); +#elif ARCH_X86 ff_exrdsp_init_x86(c); #endif } diff --git a/libavcodec/exrdsp.h b/libavcodec/exrdsp.h index aba3d3cf51..ea37c8b08e 100644 --- a/libavcodec/exrdsp.h +++ b/libavcodec/exrdsp.h @@ -28,6 +28,7 @@ typedef struct ExrDSPContext { } ExrDSPContext; void ff_exrdsp_init(ExrDSPContext *c); +void ff_exrdsp_init_riscv(ExrDSPContext *c); void ff_exrdsp_init_x86(ExrDSPContext *c); #endif /* AVCODEC_EXRDSP_H */ diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index cc9c13e6b6..31ad493cd3 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -10,6 +10,8 @@ RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o \ riscv/bswapdsp_rvb.o RVV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvv.o +OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_init.o +RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o OBJS-$(CONFIG_G722DSP) += riscv/g722dsp_init.o diff --git a/libavcodec/riscv/exrdsp_init.c b/libavcodec/riscv/exrdsp_init.c new file mode 100644 index 0000000000..690a2231c5 --- /dev/null +++ b/libavcodec/riscv/exrdsp_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 + +#include "libavutil/cpu.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/exrdsp.h" + +void ff_reorder_pixels_rvv(uint8_t *dst, const uint8_t *src, ptrdiff_t size); + +av_cold void ff_exrdsp_init_riscv(ExrDSPContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + c->reorder_pixels = ff_reorder_pixels_rvv; + } +#endif +} diff --git a/libavcodec/riscv/exrdsp_rvv.S b/libavcodec/riscv/exrdsp_rvv.S new file mode 100644 index 0000000000..f4a35f58ff --- /dev/null +++ b/libavcodec/riscv/exrdsp_rvv.S @@ -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 "libavutil/riscv/asm.S" + +func ff_reorder_pixels_rvv, zve32x + srai a2, a2, 1 + add t1, a1, a2 +1: + vsetvli t0, a2, e8, m4, ta, ma + vle8.v v0, (a1) + sub a2, a2, t0 + vle8.v v4, (t1) + add a1, t0, a1 + vsseg2e8.v v0, (a0) + add t1, t0, t1 + sh1add a0, t0, a0 + bnez a2, 1b + + ret +endfunc