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
5050 shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb;
5151 #endif
5252 #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)) {
5454 shuffle_bytes_0321 = ff_shuffle_bytes_0321_rvv;
5555 shuffle_bytes_2103 = ff_shuffle_bytes_2103_rvv;
5656 shuffle_bytes_1230 = ff_shuffle_bytes_1230_rvv;
5757 shuffle_bytes_3012 = ff_shuffle_bytes_3012_rvv;
5858 interleaveBytes = ff_interleave_bytes_rvv;
59− if (flags & AV_CPU_FLAG_RVB_BASIC) {
60− uyvytoyuv422 = ff_uyvytoyuv422_rvv;
61− yuyvtoyuv422 = ff_yuyvtoyuv422_rvv;
62− }
59+ uyvytoyuv422 = ff_uyvytoyuv422_rvv;
60+ yuyvtoyuv422 = ff_yuyvtoyuv422_rvv;
6361 }
6462 #endif
6563 #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
3939
4040 if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat) &&
4141 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)) {
4343 bool from = c->srcRange != 0;
4444
4545 c->lumConvertRange = convs[from].lum;
@@ -70,7 +70,7 @@ av_cold void ff_sws_init_swscale_riscv(SwsContext *c) · 24 unmodified lines
7070 int flags = av_get_cpu_flags();
7171
7272 #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)) {
7474 switch (c->srcFormat) {
7575 case AV_PIX_FMT_ABGR:
7676 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