diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2023-09-29 20:10:15 +0300 |
|---|---|---|
| committer | Rémi Denis-Courmont <remi@remlab.net> | 2023-10-02 22:28:25 +0300 |
| commit | c4a144c29d48ac5c1ac336057e3d1f214b1d6bc9 (patch) | |
| tree | d0c9360703d41ba352e6738547bdb9e4ab74352e | |
| parent | cec48e3b321a73dc78b4dec81c0e1e6386761b14 (diff) | |
| download | ffmpeg-c4a144c29d48ac5c1ac336057e3d1f214b1d6bc9.tar.gz | |
swscale/rgb2rgb: add R-V Zbb shuffle_bytes_3210
| -rw-r--r-- | libswscale/riscv/Makefile | 1 | ||||
| -rw-r--r-- | libswscale/riscv/rgb2rgb.c | 7 | ||||
| -rw-r--r-- | libswscale/riscv/rgb2rgb_rvb.S | 30 |
3 files changed, 37 insertions, 1 deletions
diff --git a/libswscale/riscv/Makefile b/libswscale/riscv/Makefile index 214d877b62..7b371d5a86 100644 --- a/libswscale/riscv/Makefile +++ b/libswscale/riscv/Makefile @@ -1,2 +1,3 @@ OBJS += riscv/rgb2rgb.o +OBJS += riscv/rgb2rgb_rvb.o RVV-OBJS += riscv/rgb2rgb_rvv.o diff --git a/libswscale/riscv/rgb2rgb.c b/libswscale/riscv/rgb2rgb.c index 4c2d0f07d2..21baaa21c5 100644 --- a/libswscale/riscv/rgb2rgb.c +++ b/libswscale/riscv/rgb2rgb.c @@ -29,6 +29,7 @@ void ff_shuffle_bytes_0321_rvv(const uint8_t *src, uint8_t *dst, int src_len); void ff_shuffle_bytes_2103_rvv(const uint8_t *src, uint8_t *dst, int src_len); void ff_shuffle_bytes_1230_rvv(const uint8_t *src, uint8_t *dst, int src_len); void ff_shuffle_bytes_3012_rvv(const uint8_t *src, uint8_t *dst, int src_len); +void ff_shuffle_bytes_3210_rvb(const uint8_t *src, uint8_t *dst, int src_len); void ff_shuffle_bytes_3210_rvv(const uint8_t *src, uint8_t *dst, int src_len); void ff_interleave_bytes_rvv(const uint8_t *src1, const uint8_t *src2, uint8_t *dst, int width, int height, int s1stride, @@ -42,9 +43,13 @@ void ff_yuyvtoyuv422_rvv(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, av_cold void rgb2rgb_init_riscv(void) { -#if HAVE_RVV int flags = av_get_cpu_flags(); +#if (__riscv_xlen == 64) + if ((flags & AV_CPU_FLAG_RVB_BASIC) && (flags & AV_CPU_FLAG_RVB_ADDR)) + shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb; +#endif +#if HAVE_RVV if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { shuffle_bytes_0321 = ff_shuffle_bytes_0321_rvv; shuffle_bytes_2103 = ff_shuffle_bytes_2103_rvv; diff --git a/libswscale/riscv/rgb2rgb_rvb.S b/libswscale/riscv/rgb2rgb_rvb.S new file mode 100644 index 0000000000..af127b32ed --- /dev/null +++ b/libswscale/riscv/rgb2rgb_rvb.S @@ -0,0 +1,30 @@ +/* + * Copyright © 2022 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/riscv/asm.S" +#include "libavutil/riscv/bswap_rvb.S" + +#if (__riscv_xlen >= 64) +func ff_shuffle_bytes_3210_rvb, zbb + srli a2, a2, 2 + bswap32_rvb a1, a0, a2 +endfunc +#endif |