[FFmpeg-devel] [PATCH 1/6] lavu/riscv: depend on RVB and simplify accordingly

[Rémi Denis-Courmont]

---
 libavutil/riscv/fixed_dsp_init.c | 2 +-
 libavutil/riscv/float_dsp_init.c | 2 +-
 libavutil/riscv/lls_init.c       | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavutil/riscv/fixed_dsp_init.c b/libavutil/riscv/fixed_dsp_init.c
index cd318af486..36612d49e4 100644
--- a/libavutil/riscv/fixed_dsp_init.c
+++ b/libavutil/riscv/fixed_dsp_init.c
@@ -45,7 +45,7 @@ av_cold void ff_fixed_dsp_init_riscv(AVFixedDSPContext *fdsp)
 #if HAVE_RVV
     int flags = av_get_cpu_flags();
 
-    if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {
+    if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) {
         if (flags & AV_CPU_FLAG_RVV_I64) {
             fdsp->vector_fmul_window_scaled = ff_vector_fmul_window_scaled_rvv;
             fdsp->vector_fmul_window = ff_vector_fmul_window_fixed_rvv;
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index 155496fa6b..91fd9982ea 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -54,7 +54,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
 #if HAVE_RVV
     int flags = av_get_cpu_flags();
 
-    if (flags & AV_CPU_FLAG_RVB_ADDR) {
+    if (flags & AV_CPU_FLAG_RVB) {
         if (flags & AV_CPU_FLAG_RVV_F32) {
             fdsp->vector_fmul = ff_vector_fmul_rvv;
             fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv;
diff --git a/libavutil/riscv/lls_init.c b/libavutil/riscv/lls_init.c
index b1317dc925..d6ba319552 100644
--- a/libavutil/riscv/lls_init.c
+++ b/libavutil/riscv/lls_init.c
@@ -47,9 +47,8 @@ av_cold void ff_init_lls_riscv(LLSModel *m)
 #if HAVE_RVV
     int flags = av_get_cpu_flags();
 
-    if ((flags & AV_CPU_FLAG_RVB_ADDR) && (flags & AV_CPU_FLAG_RVV_F64)) {
-        if ((flags & AV_CPU_FLAG_RVB_BASIC) &&
-            ff_get_rv_vlenb() > m->indep_count)
+    if ((flags & AV_CPU_FLAG_RVB) && (flags & AV_CPU_FLAG_RVV_F64)) {
+        if (ff_get_rv_vlenb() > m->indep_count)
             m->update_lls = ff_lls_update_rvv;
         m->evaluate_lls = ff_lls_evaluate_rvv;
     }
-- 
2.45.2