aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Denis-Courmont <remi@remlab.net>2024-05-12 19:40:30 +0300
committerRémi Denis-Courmont <remi@remlab.net>2024-05-15 20:04:08 +0300
commit7b47099bc080ee597327476c0df44d527c349862 (patch)
treeac03378276daf5f6e1230f46beea8ac848bb2ca3
parent83e5fdd3f4fba46df23e870ee963b3935ea33343 (diff)
downloadffmpeg-7b47099bc080ee597327476c0df44d527c349862.tar.gz
lavc/flacdsp: R-V V flac_wasted32
T-Head C908: flac_wasted_32_c: 949.0 flac_wasted_32_rvv_i32: 278.7
-rw-r--r--libavcodec/riscv/flacdsp_init.c7
-rw-r--r--libavcodec/riscv/flacdsp_rvv.S15
2 files changed, 21 insertions, 1 deletions
diff --git a/libavcodec/riscv/flacdsp_init.c b/libavcodec/riscv/flacdsp_init.c
index 66eb062620..454787470b 100644
--- a/libavcodec/riscv/flacdsp_init.c
+++ b/libavcodec/riscv/flacdsp_init.c
@@ -31,6 +31,7 @@ void ff_flac_lpc32_rvv(int32_t *decoded, const int coeffs[32],
int pred_order, int qlevel, int len);
void ff_flac_lpc32_rvv_simple(int32_t *decoded, const int coeffs[32],
int pred_order, int qlevel, int len);
+void ff_flac_wasted32_rvv(int32_t *, int shift, int len);
void ff_flac_decorrelate_indep2_16_rvv(uint8_t **out, int32_t **in,
int channels, int len, int shift);
void ff_flac_decorrelate_indep4_16_rvv(uint8_t **out, int32_t **in,
@@ -79,7 +80,11 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt,
else
c->lpc32 = ff_flac_lpc32_rvv;
}
+# endif
+
+ c->wasted32 = ff_flac_wasted32_rvv;
+# if (__riscv_xlen >= 64)
switch (fmt) {
case AV_SAMPLE_FMT_S16:
switch (channels) {
@@ -119,8 +124,8 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt,
c->decorrelate[2] = ff_flac_decorrelate_rs_32_rvv;
c->decorrelate[3] = ff_flac_decorrelate_ms_32_rvv;
break;
-# endif
}
+# endif
}
#endif
}
diff --git a/libavcodec/riscv/flacdsp_rvv.S b/libavcodec/riscv/flacdsp_rvv.S
index 25803f00f8..d7009cdec2 100644
--- a/libavcodec/riscv/flacdsp_rvv.S
+++ b/libavcodec/riscv/flacdsp_rvv.S
@@ -100,7 +100,22 @@ func ff_flac_lpc32_rvv_simple, zve64x
ret
endfunc
+#endif
+
+func ff_flac_wasted32_rvv, zve32x
+1:
+ vsetvli t0, a2, e32, m8, ta, ma
+ vle32.v v8, (a0)
+ sub a2, a2, t0
+ vsll.vx v8, v8, a1
+ vse32.v v8, (a0)
+ sh2add a0, t0, a0
+ bnez a2, 1b
+ ret
+endfunc
+
+#if (__riscv_xlen == 64)
func ff_flac_decorrelate_indep2_16_rvv, zve32x
ld a0, (a0)
ld a2, 8(a1)