diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2023-11-13 21:46:16 +0200 |
|---|---|---|
| committer | Rémi Denis-Courmont <remi@remlab.net> | 2023-11-17 23:59:23 +0200 |
| commit | 6183a69c0b3e920c84d3c526ee8f012c19f63b6e (patch) | |
| tree | 5735b0031bcbb49918b544bff501d97429195b61 | |
| parent | 636ae0e0bc4f7319334528aeecaa9973a01734ab (diff) | |
| download | ffmpeg-6183a69c0b3e920c84d3c526ee8f012c19f63b6e.tar.gz | |
lavc/flacdsp: R-V V decorrelate_ms packed
flac_decorrelate_ms_16_c: 585.5
flac_decorrelate_ms_16_rvv_i32: 263.0
flac_decorrelate_ms_32_c: 584.7
flac_decorrelate_ms_32_rvv_i32: 250.0
| -rw-r--r-- | libavcodec/riscv/flacdsp_init.c | 6 | ||||
| -rw-r--r-- | libavcodec/riscv/flacdsp_rvv.S | 49 |
2 files changed, 55 insertions, 0 deletions
diff --git a/libavcodec/riscv/flacdsp_init.c b/libavcodec/riscv/flacdsp_init.c index 9734805979..c201c6b829 100644 --- a/libavcodec/riscv/flacdsp_init.c +++ b/libavcodec/riscv/flacdsp_init.c @@ -28,10 +28,14 @@ void ff_flac_decorrelate_ls_16_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); void ff_flac_decorrelate_rs_16_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); +void ff_flac_decorrelate_ms_16_rvv(uint8_t **out, int32_t **in, + int channels, int len, int shift); void ff_flac_decorrelate_ls_32_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); void ff_flac_decorrelate_rs_32_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); +void ff_flac_decorrelate_ms_32_rvv(uint8_t **out, int32_t **in, + int channels, int len, int shift); av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt, int channels) @@ -44,10 +48,12 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt, case AV_SAMPLE_FMT_S16: c->decorrelate[1] = ff_flac_decorrelate_ls_16_rvv; c->decorrelate[2] = ff_flac_decorrelate_rs_16_rvv; + c->decorrelate[3] = ff_flac_decorrelate_ms_16_rvv; break; case AV_SAMPLE_FMT_S32: c->decorrelate[1] = ff_flac_decorrelate_ls_32_rvv; c->decorrelate[2] = ff_flac_decorrelate_rs_32_rvv; + c->decorrelate[3] = ff_flac_decorrelate_ms_32_rvv; break; } } diff --git a/libavcodec/riscv/flacdsp_rvv.S b/libavcodec/riscv/flacdsp_rvv.S index c70ad8fcb0..616565ed7e 100644 --- a/libavcodec/riscv/flacdsp_rvv.S +++ b/libavcodec/riscv/flacdsp_rvv.S @@ -69,6 +69,32 @@ func ff_flac_decorrelate_rs_16_rvv, zve32x ret endfunc +func ff_flac_decorrelate_ms_16_rvv, zve32x + ld a0, (a0) + ld a2, 8(a1) + ld a1, (a1) +1: + vsetvli t0, a3, e32, m8, ta, ma + vle32.v v8, (a2) + sub a3, a3, t0 + vle32.v v0, (a1) + sh2add a1, t0, a1 + vsra.vi v16, v8, 1 + sh2add a2, t0, a2 + vsub.vv v24, v0, v16 + vadd.vv v16, v24, v8 + vsll.vx v8, v24, a4 + vsll.vx v0, v16, a4 + vsetvli zero, zero, e16, m4, ta, ma + vncvt.x.x.w v0, v0 + vncvt.x.x.w v4, v8 + vsseg2e16.v v0, (a0) + sh2add a0, t0, a0 + bnez a3, 1b + + ret +endfunc + func ff_flac_decorrelate_ls_32_rvv, zve32x ld a0, (a0) ld a2, 8(a1) @@ -110,4 +136,27 @@ func ff_flac_decorrelate_rs_32_rvv, zve32x ret endfunc + +func ff_flac_decorrelate_ms_32_rvv, zve32x + ld a0, (a0) + ld a2, 8(a1) + ld a1, (a1) +1: + vsetvli t0, a3, e32, m4, ta, ma + vle32.v v4, (a2) + sub a3, a3, t0 + vle32.v v0, (a1) + sh2add a1, t0, a1 + vsra.vi v8, v4, 1 + sh2add a2, t0, a2 + vsub.vv v12, v0, v8 + vadd.vv v8, v12, v4 + vsll.vx v4, v12, a4 + vsll.vx v0, v8, a4 + vsseg2e32.v v0, (a0) + sh3add a0, t0, a0 + bnez a3, 1b + + ret +endfunc #endif |