lavc/riscv: use ff_rv_vlen_least()

Rémi Denis-Courmont committed 2 years ago

Commit cdcb4b91 parent 247c5b212 files · +14 −14Browse files

Showing the changes to libavcodec (12 of 12 files). Show all

Unified · Split

12 files

libavcodec/riscv/blockdsp_init.c +1 −1
libavcodec/riscv/g722dsp_init.c +1 −1
libavcodec/riscv/h264_chroma_init_riscv.c +1 −1
libavcodec/riscv/idctdsp_init.c +1 −1
libavcodec/riscv/me_cmp_init.c +1 −1
libavcodec/riscv/pixblockdsp_init.c +1 −1
libavcodec/riscv/rv34dsp_init.c +1 −1
libavcodec/riscv/rv40dsp_init.c +1 −1
libavcodec/riscv/sbrdsp_init.c +1 −1
libavcodec/riscv/vc1dsp_init.c +1 −1
libavcodec/riscv/vp8dsp_init.c +2 −2
libavcodec/riscv/vp9dsp_init.c +2 −2

libavcodec/riscv/blockdsp_init.c+1−1

@@ -37,7 +37,7 @@ av_cold void ff_blockdsp_init_riscv(BlockDSPContext *c) · 36 unmodified lines
37	37	#if HAVE_RVV
38	38	int flags = av_get_cpu_flags();
39	39
40		− if (flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= 16) {
	40	+ if (flags & AV_CPU_FLAG_RVV_I64 && ff_rv_vlen_least(128)) {
41	41	c->clear_block = ff_clear_block_rvv;
42	42	c->clear_blocks = ff_clear_blocks_rvv;
43	43	c->fill_block_tab[0] = ff_fill_block16_rvv;

libavcodec/riscv/g722dsp_init.c+1−1

@@ -34,7 +34,7 @@ av_cold void ff_g722dsp_init_riscv(G722DSPContext *dsp) · 33 unmodified lines
34	34	#if HAVE_RVV
35	35	int flags = av_get_cpu_flags();
36	36
37		− if ((flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16)
	37	+ if ((flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128))
38	38	dsp->apply_qmf = ff_g722_apply_qmf_rvv;
39	39	#endif
40	40	}

libavcodec/riscv/h264_chroma_init_riscv.c+1−1

@@ -38,7 +38,7 @@ av_cold void ff_h264chroma_init_riscv(H264ChromaContext *c, int bit_depth) · 37 unmodified lines
38	38	int flags = av_get_cpu_flags();
39	39
40	40	if (bit_depth == 8 && (flags & AV_CPU_FLAG_RVV_I32) &&
41		− (flags & AV_CPU_FLAG_RVB_ADDR) && ff_get_rv_vlenb() >= 16) {
	41	+ (flags & AV_CPU_FLAG_RVB_ADDR) && ff_rv_vlen_least(128)) {
42	42	c->put_h264_chroma_pixels_tab[0] = h264_put_chroma_mc8_rvv;
43	43	c->avg_h264_chroma_pixels_tab[0] = h264_avg_chroma_mc8_rvv;
44	44	c->put_h264_chroma_pixels_tab[1] = h264_put_chroma_mc4_rvv;

libavcodec/riscv/idctdsp_init.c+1−1

@@ -39,7 +39,7 @@ av_cold void ff_idctdsp_init_riscv(IDCTDSPContext c, AVCodecContext avctx, · 38 unmodified lines
39	39	#if HAVE_RVV
40	40	int flags = av_get_cpu_flags();
41	41
42		− if ((flags & AV_CPU_FLAG_RVV_I64) && ff_get_rv_vlenb() >= 16) {
	42	+ if ((flags & AV_CPU_FLAG_RVV_I64) && ff_rv_vlen_least(128)) {
43	43	c->put_pixels_clamped = ff_put_pixels_clamped_rvv;
44	44	c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_rvv;
45	45	c->add_pixels_clamped = ff_add_pixels_clamped_rvv;

libavcodec/riscv/me_cmp_init.c+1−1

@@ -82,7 +82,7 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext c, AVCodecContext avctx) · 81 unmodified lines
82	82	#if HAVE_RVV
83	83	int flags = av_get_cpu_flags();
84	84
85		− if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) {
	85	+ if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) {
86	86	c->pix_abs[0][0] = ff_pix_abs16_rvv;
87	87	c->sad[0] = ff_pix_abs16_rvv;
88	88	c->pix_abs[1][0] = ff_pix_abs8_rvv;

libavcodec/riscv/pixblockdsp_init.c+1−1

@@ -56,7 +56,7 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 55 unmodified lines
56	56	}
57	57
58	58	#if HAVE_RVV
59		− if ((cpu_flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16) {
	59	+ if ((cpu_flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) {
60	60	c->diff_pixels = ff_diff_pixels_unaligned_rvv;
61	61	c->diff_pixels_unaligned = ff_diff_pixels_unaligned_rvv;
62	62	}

libavcodec/riscv/rv34dsp_init.c+1−1

@@ -33,7 +33,7 @@ av_cold void ff_rv34dsp_init_riscv(RV34DSPContext *c) · 32 unmodified lines
33	33	#if HAVE_RVV
34	34	int flags = av_get_cpu_flags();
35	35
36		− if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) {
	36	+ if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) {
37	37	c->rv34_inv_transform_dc = ff_rv34_inv_transform_dc_rvv;
38	38	c->rv34_idct_dc_add = ff_rv34_idct_dc_add_rvv;
39	39	}

libavcodec/riscv/rv40dsp_init.c+1−1

@@ -40,7 +40,7 @@ av_cold void ff_rv40dsp_init_riscv(RV34DSPContext *c) · 39 unmodified lines
40	40	#if HAVE_RVV
41	41	int flags = av_get_cpu_flags();
42	42
43		− if ((flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16 &&
	43	+ if ((flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128) &&
44	44	(flags & AV_CPU_FLAG_RVB_ADDR)) {
45	45	c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_rvv;
46	46	c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_rvv;

libavcodec/riscv/sbrdsp_init.c+1−1

@@ -53,7 +53,7 @@ av_cold void ff_sbrdsp_init_riscv(SBRDSPContext *c) · 52 unmodified lines
53	53	c->sum_square = ff_sbr_sum_square_rvv;
54	54	c->hf_gen = ff_sbr_hf_gen_rvv;
55	55	c->hf_g_filt = ff_sbr_hf_g_filt_rvv;
56		− if (ff_get_rv_vlenb() <= 16) {
	56	+ if (ff_rv_vlen_least(128)) {
57	57	c->hf_apply_noise[0] = ff_sbr_hf_apply_noise_0_rvv;
58	58	c->hf_apply_noise[2] = ff_sbr_hf_apply_noise_2_rvv;
59	59	if (flags & AV_CPU_FLAG_RVB_BASIC) {

libavcodec/riscv/vc1dsp_init.c+1−1

@@ -35,7 +35,7 @@ av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) · 34 unmodified lines
35	35	#if HAVE_RVV
36	36	int flags = av_get_cpu_flags();
37	37
38		− if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) {
	38	+ if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) {
39	39	dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_rvv;
40	40	dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_rvv;
41	41	if (flags & AV_CPU_FLAG_RVV_I64) {

libavcodec/riscv/vp8dsp_init.c+2−2

@@ -56,7 +56,7 @@ av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) · 55 unmodified lines
56	56	c->put_vp8_bilinear_pixels_tab[2][0][0] = ff_put_vp8_pixels4_rvi;
57	57	}
58	58	#if HAVE_RVV
59		− if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) {
	59	+ if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) {
60	60	c->put_vp8_bilinear_pixels_tab[0][0][1] = ff_put_vp8_bilin16_h_rvv;
61	61	c->put_vp8_bilinear_pixels_tab[0][0][2] = ff_put_vp8_bilin16_h_rvv;
62	62	c->put_vp8_bilinear_pixels_tab[1][0][1] = ff_put_vp8_bilin8_h_rvv;
@@ -107,7 +107,7 @@ av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) · 44 unmodified lines
107	107	#if HAVE_RVV
108	108	int flags = av_get_cpu_flags();
109	109
110		− if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) {
	110	+ if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) {
111	111	c->vp8_idct_dc_add = ff_vp8_idct_dc_add_rvv;
112	112	c->vp8_idct_dc_add4y = ff_vp8_idct_dc_add4y_rvv;
113	113	if (flags & AV_CPU_FLAG_RVB_ADDR) {

libavcodec/riscv/vp9dsp_init.c+2−2

@@ -29,7 +29,7 @@ static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) · 28 unmodified lines
29	29	#if HAVE_RVV
30	30	int flags = av_get_cpu_flags();
31	31
32		− if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= 16) {
	32	+ if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_rv_vlen_least(128)) {
33	33	dsp->intra_pred[TX_8X8][DC_PRED] = ff_dc_8x8_rvv;
34	34	dsp->intra_pred[TX_8X8][LEFT_DC_PRED] = ff_dc_left_8x8_rvv;
35	35	dsp->intra_pred[TX_8X8][DC_127_PRED] = ff_dc_127_8x8_rvv;
@@ -38,7 +38,7 @@ static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) · 2 unmodified lines
38	38	dsp->intra_pred[TX_8X8][TOP_DC_PRED] = ff_dc_top_8x8_rvv;
39	39	}
40	40
41		− if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) {
	41	+ if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) {
42	42	dsp->intra_pred[TX_32X32][DC_PRED] = ff_dc_32x32_rvv;
43	43	dsp->intra_pred[TX_16X16][DC_PRED] = ff_dc_16x16_rvv;
44	44	dsp->intra_pred[TX_32X32][LEFT_DC_PRED] = ff_dc_left_32x32_rvv;