lavc/pixblockdsp: fix compilation for RV32IMA

Rémi Denis-Courmont committed 1 year ago

Commit d3acffa1 parent 63922ba2 files · +4 −1Browse files

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

Unified · Split

2 files

libavcodec/riscv/pixblockdsp_init.c +2 −1
libavcodec/riscv/pixblockdsp_rvi.S +2 −0

libavcodec/riscv/pixblockdsp_init.c+2−1

@@ -48,6 +48,7 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 47 unmodified lines
48	48	#if HAVE_RV
49	49	int cpu_flags = av_get_cpu_flags();
50	50
	51	+#if __riscv_xlen >= 64
51	52	if (cpu_flags & AV_CPU_FLAG_RVI) {
52	53	if (high_bit_depth)
53	54	c->get_pixels = ff_get_pixels_16_rvi;
@@ -61,7 +62,7 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 7 unmodified lines
61	62	else
62	63	c->get_pixels_unaligned = ff_get_pixels_8_rvi;
63	64	}
64		−
	65	+#endif
65	66	#if HAVE_RVV
66	67	if ((cpu_flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) {
67	68	c->diff_pixels = ff_diff_pixels_unaligned_rvv;

libavcodec/riscv/pixblockdsp_rvi.S+2−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20
21	21	#include "libavutil/riscv/asm.S"
22	22
	23	+#if __riscv_xlen >= 64
23	24	func ff_get_pixels_8_rvi
24	25	lpad 0
25	26	.irp row, 0, 1, 2, 3, 4, 5, 6, 7
@@ -58,3 +59,4 @@ func ff_get_pixels_16_rvi · 32 unmodified lines
58	59	.endr
59	60	ret
60	61	endfunc
	62	+#endif