@@ -2,4 +2,5 @@ OBJS += riscv/rgb2rgb.o \
riscv/swscale.o
RV-OBJS += riscv/rgb2rgb_rvb.o
RVV-OBJS += riscv/input_rvv.o \
+ riscv/range_rvv.o \
riscv/rgb2rgb_rvv.o
new file mode 100644
@@ -0,0 +1,114 @@
+/*
+ * Copyright © 2024 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_range_lum_to_jpeg_16_rvv, zve32x
+ li t1, 30189
+ li t2, 19077
+ li t3, -39057361
+1:
+ vsetvli t0, a1, e16, m4, ta, ma
+ vle16.v v0, (a0)
+ sub a1, a1, t0
+ vmin.vx v0, v0, t1
+ vwmul.vx v8, v0, t2
+ vsetvli zero, zero, e32, m8, ta, ma
+ vadd.vx v8, v8, t3
+ vsetvli zero, zero, e16, m4, ta, ma
+ vnsra.wi v0, v8, 14
+ vse16.v v0, (a0)
+ sh1add a0, t0, a0
+ bnez a1, 1b
+
+ ret
+endfunc
+
+func ff_range_lum_from_jpeg_16_rvv, zve32x
+ li t1, 14071
+ li t2, 33561947
+1:
+ vsetvli t0, a1, e16, m4, ta, ma
+ vle16.v v0, (a0)
+ sub a1, a1, t0
+ vwmul.vx v8, v0, t1
+ vsetvli zero, zero, e32, m8, ta, ma
+ vadd.vx v8, v8, t2
+ vsetvli zero, zero, e16, m4, ta, ma
+ vnsra.wi v0, v8, 14
+ vse16.v v0, (a0)
+ sh1add a0, t0, a0
+ bnez a1, 1b
+
+ ret
+endfunc
+
+func ff_range_chr_to_jpeg_16_rvv, zve32x
+ li t1, 30775
+ li t2, 4663
+ li t3, -9289992
+1:
+ vsetvli t0, a2, e16, m4, ta, ma
+ vle16.v v0, (a0)
+ sub a2, a2, t0
+ vle16.v v4, (a1)
+ vmin.vx v0, v0, t1
+ vmin.vx v4, v4, t1
+ vwmul.vx v8, v0, t2
+ vwmul.vx v16, v4, t2
+ vsetvli zero, zero, e32, m8, ta, ma
+ vadd.vx v8, v8, t3
+ vadd.vx v16, v16, t3
+ vsetvli zero, zero, e16, m4, ta, ma
+ vnsra.wi v0, v8, 12
+ vnsra.wi v4, v16, 12
+ vse16.v v0, (a0)
+ sh1add a0, t0, a0
+ vse16.v v4, (a1)
+ sh1add a1, t0, a1
+ bnez a2, 1b
+
+ ret
+endfunc
+
+func ff_range_chr_from_jpeg_16_rvv, zve32x
+ li t1, 1799
+ li t2, 4081085
+1:
+ vsetvli t0, a2, e16, m4, ta, ma
+ vle16.v v0, (a0)
+ sub a2, a2, t0
+ vle16.v v4, (a1)
+ vwmul.vx v8, v0, t1
+ vwmul.vx v16, v4, t1
+ vsetvli zero, zero, e32, m8, ta, ma
+ vadd.vx v8, v8, t2
+ vadd.vx v16, v16, t2
+ vsetvli zero, zero, e16, m4, ta, ma
+ vnsra.wi v0, v8, 11
+ vnsra.wi v4, v16, 11
+ vse16.v v0, (a0)
+ sh1add a0, t0, a0
+ vse16.v v0, (a1)
+ sh1add a1, t0, a1
+ bnez a2, 1b
+
+ ret
+endfunc
@@ -21,6 +21,33 @@
#include "libavutil/riscv/cpu.h"
#include "libswscale/swscale_internal.h"
+void ff_range_lum_to_jpeg_16_rvv(int16_t *, int);
+void ff_range_chr_to_jpeg_16_rvv(int16_t *, int16_t *, int);
+void ff_range_lum_from_jpeg_16_rvv(int16_t *, int);
+void ff_range_chr_from_jpeg_16_rvv(int16_t *, int16_t *, int);
+
+av_cold static void ff_sws_init_range_convert_riscv(SwsContext *c, int flags)
+{
+#if HAVE_RVV
+ static const struct {
+ void (*lum)(int16_t *, int);
+ void (*chr)(int16_t *, int16_t *, int);
+ } convs[2] = {
+ { ff_range_lum_to_jpeg_16_rvv, ff_range_chr_to_jpeg_16_rvv },
+ { ff_range_lum_from_jpeg_16_rvv, ff_range_chr_from_jpeg_16_rvv },
+ };
+
+ if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat) &&
+ c->dstBpc <= 14 &&
+ (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {
+ bool from = c->srcRange != 0;
+
+ c->lumConvertRange = convs[from].lum;
+ c->chrConvertRange = convs[from].chr;
+ }
+#endif
+}
+
#define RVV_INPUT(name) \
void ff_##name##ToY_rvv(uint8_t *dst, const uint8_t *src, const uint8_t *, \
const uint8_t *, int w, uint32_t *coeffs, void *); \
@@ -40,9 +67,9 @@ RVV_INPUT(rgba32);
av_cold void ff_sws_init_swscale_riscv(SwsContext *c)
{
-#if HAVE_RVV
int flags = av_get_cpu_flags();
+#if HAVE_RVV
if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {
switch (c->srcFormat) {
case AV_PIX_FMT_ABGR:
@@ -95,4 +122,5 @@ av_cold void ff_sws_init_swscale_riscv(SwsContext *c)
}
}
#endif
+ ff_sws_init_range_convert_riscv(c, flags);
}