History

sws/riscv: depend on RVB and simplify accordingly

Rémi Denis-Courmont committed 2 years ago

Commit 210877c1 parent f30e5bf2 files · +5 −7Browse files

Unified · Split

2 files
  1. libswscale/riscv/rgb2rgb.c +3 −5
  2. libswscale/riscv/swscale.c +2 −2
libswscale/riscv/rgb2rgb.c+3−5
@@ -50,16 +50,14 @@ av_cold void rgb2rgb_init_riscv(void) · 49 unmodified lines
50 shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb;50 shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb;
51#endif51#endif
52#if HAVE_RVV52#if HAVE_RVV
53 if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {53 if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) {
54 shuffle_bytes_0321 = ff_shuffle_bytes_0321_rvv;54 shuffle_bytes_0321 = ff_shuffle_bytes_0321_rvv;
55 shuffle_bytes_2103 = ff_shuffle_bytes_2103_rvv;55 shuffle_bytes_2103 = ff_shuffle_bytes_2103_rvv;
56 shuffle_bytes_1230 = ff_shuffle_bytes_1230_rvv;56 shuffle_bytes_1230 = ff_shuffle_bytes_1230_rvv;
57 shuffle_bytes_3012 = ff_shuffle_bytes_3012_rvv;57 shuffle_bytes_3012 = ff_shuffle_bytes_3012_rvv;
58 interleaveBytes = ff_interleave_bytes_rvv;58 interleaveBytes = ff_interleave_bytes_rvv;
59 if (flags & AV_CPU_FLAG_RVB_BASIC) {59 uyvytoyuv422 = ff_uyvytoyuv422_rvv;
60 uyvytoyuv422 = ff_uyvytoyuv422_rvv;60 yuyvtoyuv422 = ff_yuyvtoyuv422_rvv;
61 yuyvtoyuv422 = ff_yuyvtoyuv422_rvv;
62 }
63 }61 }
64#endif62#endif
65#endif63#endif
libswscale/riscv/swscale.c+2−2
@@ -39,7 +39,7 @@ av_cold static void ff_sws_init_range_convert_riscv(SwsContext *c, int flags) · 38 unmodified lines
39 39
40 if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat) &&40 if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat) &&
41 c->dstBpc <= 14 &&41 c->dstBpc <= 14 &&
42 (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {42 (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) {
43 bool from = c->srcRange != 0;43 bool from = c->srcRange != 0;
44 44
45 c->lumConvertRange = convs[from].lum;45 c->lumConvertRange = convs[from].lum;
@@ -70,7 +70,7 @@ av_cold void ff_sws_init_swscale_riscv(SwsContext *c) · 24 unmodified lines
70 int flags = av_get_cpu_flags();70 int flags = av_get_cpu_flags();
71 71
72#if HAVE_RVV72#if HAVE_RVV
73 if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {73 if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) {
74 switch (c->srcFormat) {74 switch (c->srcFormat) {
75 case AV_PIX_FMT_ABGR:75 case AV_PIX_FMT_ABGR:
76 c->lumToYV12 = ff_abgr32ToY_rvv;76 c->lumToYV12 = ff_abgr32ToY_rvv;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t