RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/vp9dsp: R-V V rename ff_avg to ff_vp9_avg 

Avoid potential naming conflicts

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
This commit is contained in:
sunyuechi 2024-05-30 01:15:36 +08:00 committed by Rémi Denis-Courmont
parent 8a96495fef
commit 544acfa2c0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/riscv/vp9_mc_rvv.S
View File

@ -37,9 +37,9 @@
.endm
.macro copy_avg len
func ff_avg\len\()_rvv, zve32x
func ff_vp9_avg\len\()_rvv, zve32x
csrwi vxrm, 0
vsetvlstatic8 \len t0 64
vsetvlstatic8 \len, t0, 64
1:
vle8.v v8, (a2)
vle8.v v16, (a0)

4
libavcodec/riscv/vp9dsp.h
View File

@ -138,11 +138,11 @@ void ff_avg_bilin_##SIZE##hv_rvv(uint8_t *dst, ptrdiff_t dststride, \
int h, int mx, int my);
#define VP9_COPY_AVG_RISCV_RVV_FUNC(SIZE) \
void ff_copy##SIZE##_rvv(uint8_t *dst, ptrdiff_t dststride, \
void ff_vp9_copy##SIZE##_rvv(uint8_t *dst, ptrdiff_t dststride, \
const uint8_t *src, ptrdiff_t srcstride, \
int h, int mx, int my); \
\
void ff_avg##SIZE##_rvv(uint8_t *dst, ptrdiff_t dststride, \
void ff_vp9_avg##SIZE##_rvv(uint8_t *dst, ptrdiff_t dststride, \
const uint8_t *src, ptrdiff_t srcstride, \
int h, int mx, int my);

8
libavcodec/riscv/vp9dsp_init.c
View File

@ -52,10 +52,10 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp)
if (bpp == 8 && (flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) {
#define init_fpel(idx1, sz) \
dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_avg##sz##_rvv; \
dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_avg##sz##_rvv; \
dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_avg##sz##_rvv; \
dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_avg##sz##_rvv
dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_vp9_avg##sz##_rvv; \
dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_vp9_avg##sz##_rvv; \
dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_vp9_avg##sz##_rvv; \
dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_vp9_avg##sz##_rvv
init_fpel(0, 64);
init_fpel(1, 32);