[FFmpeg-cvslog] lavc/pixblockdsp: rename unaligned R-V V functions

[Rémi Denis-Courmont]

ffmpeg | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Oct 27 21:22:42 2023 +0300| [722765687b666fe630c5dbc82f39a7035a97edc0] | committer: Rémi Denis-Courmont

lavc/pixblockdsp: rename unaligned R-V V functions

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=722765687b666fe630c5dbc82f39a7035a97edc0
---

 libavcodec/riscv/pixblockdsp_init.c | 26 +++++++++++++++-----------
 libavcodec/riscv/pixblockdsp_rvv.S  |  6 +++---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/libavcodec/riscv/pixblockdsp_init.c b/libavcodec/riscv/pixblockdsp_init.c
index aa39a8a665..8f24281217 100644
--- a/libavcodec/riscv/pixblockdsp_init.c
+++ b/libavcodec/riscv/pixblockdsp_init.c
@@ -32,12 +32,12 @@ void ff_get_pixels_8_rvi(int16_t *block, const uint8_t *pixels,
 void ff_get_pixels_16_rvi(int16_t *block, const uint8_t *pixels,
                           ptrdiff_t stride);
 
-void ff_get_pixels_8_rvv(int16_t *block, const uint8_t *pixels,
-                         ptrdiff_t stride);
-void ff_get_pixels_16_rvv(int16_t *block, const uint8_t *pixels,
-                          ptrdiff_t stride);
-void ff_diff_pixels_rvv(int16_t *block, const uint8_t *s1, const uint8_t *s2,
-                        ptrdiff_t stride);
+void ff_get_pixels_unaligned_8_rvv(int16_t *block, const uint8_t *pixels,
+                                   ptrdiff_t stride);
+void ff_get_pixels_unaligned_16_rvv(int16_t *block, const uint8_t *pixels,
+                                    ptrdiff_t stride);
+void ff_diff_pixels_unaligned_rvv(int16_t *block, const uint8_t *s1,
+                                  const uint8_t *s2, ptrdiff_t stride);
 
 av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c,
                                        AVCodecContext *avctx,
@@ -54,12 +54,16 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c,
 
 #if HAVE_RVV
     if ((cpu_flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16) {
-        if (high_bit_depth)
-            c->get_pixels_unaligned = c->get_pixels = ff_get_pixels_16_rvv;
-        else
-            c->get_pixels_unaligned = c->get_pixels = ff_get_pixels_8_rvv;
+        if (high_bit_depth) {
+            c->get_pixels = ff_get_pixels_unaligned_16_rvv;
+            c->get_pixels_unaligned = ff_get_pixels_unaligned_16_rvv;
+        } else {
+            c->get_pixels = ff_get_pixels_unaligned_8_rvv;
+            c->get_pixels_unaligned = ff_get_pixels_unaligned_8_rvv;
+        }
 
-        c->diff_pixels_unaligned = c->diff_pixels = ff_diff_pixels_rvv;
+        c->diff_pixels = ff_diff_pixels_unaligned_rvv;
+        c->diff_pixels_unaligned = ff_diff_pixels_unaligned_rvv;
     }
 #endif
 }
diff --git a/libavcodec/riscv/pixblockdsp_rvv.S b/libavcodec/riscv/pixblockdsp_rvv.S
index 1a364e6dab..e3a2fcc6ef 100644
--- a/libavcodec/riscv/pixblockdsp_rvv.S
+++ b/libavcodec/riscv/pixblockdsp_rvv.S
@@ -20,7 +20,7 @@
 
 #include "libavutil/riscv/asm.S"
 
-func ff_get_pixels_8_rvv, zve32x
+func ff_get_pixels_unaligned_8_rvv, zve32x
         vsetivli     zero, 8, e8, mf2, ta, ma
         vlsseg8e8.v  v16, (a1), a2
         vwcvtu.x.x.v v8, v16
@@ -35,14 +35,14 @@ func ff_get_pixels_8_rvv, zve32x
         ret
 endfunc
 
-func ff_get_pixels_16_rvv, zve32x
+func ff_get_pixels_unaligned_16_rvv, zve32x
         vsetivli     zero, 8, e16, m1, ta, ma
         vlsseg8e16.v v0, (a1), a2
         vsseg8e16.v  v0, (a0)
         ret
 endfunc
 
-func ff_diff_pixels_rvv, zve32x
+func ff_diff_pixels_unaligned_rvv, zve32x
         vsetivli    zero, 8, e8, mf2, ta, ma
         vlsseg8e8.v v16, (a1), a3
         vlsseg8e8.v v24, (a2), a3