From patchwork Thu Aug 1 19:59:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 50868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp1393623vqs; Thu, 1 Aug 2024 12:59:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXr1Qw3khdFihzFSUxn0iSFdm6/K9Kv6s13sozeFdMjxsDkYpW2H4CEiJCqQ6YHlWPo1dAyZIpzsnFKvhedPD/6ARGPF0rIPp3p+g== X-Google-Smtp-Source: AGHT+IEbdLleG/KQpTM0BniDeVlZ34zeaDZyqeaM8IHp7Xubtz6eS/G7VT+H06P69gbBJb22yR5F X-Received: by 2002:a05:6512:131b:b0:52e:936e:a237 with SMTP id 2adb3069b0e04-530bb3812eamr999773e87.16.1722542395961; Thu, 01 Aug 2024 12:59:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722542395; cv=none; d=google.com; s=arc-20160816; b=Hy+Rtqu59u6Ui4oFMrFVEBodDIMhpTe5zy1+qx2rEB2lEeDJnZlF8jM8xgiyXeNdR8 xo+twek8CeaUJS5UYU+amBcbRX3zk+enKyAsA6y5Tnrddv2ZU+RSCJK9f45ggtMaew2H kzQlz0lSGyU1pX50jkEDbjnuZpKyCs5mXjZpQDqPdPklOlqbjtmJVdyY+Hz6AvV9h+1B jNTi3tfCqPZ4Ij1j2Ph7M19srZjcl8giYBq8ZzhvxBSWFFXet9JuwnQx8grnOi3T796z SeS/u2bMuyjA46oHT3OGnrmpBavHYobKEnYLKy1wKZYMS+Lk3jPPHn9VghXb/PCd/kve AGHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=dU5ks6VPgAHkuotut9j9BN3Qt8WpbULnGg9lmgoXKnY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=oqhSzkwCPmaUS8sXdj3hYipd3uiJPFDH3jMSYFLphZuYPYb/Nqmvy6MJfM9unFsvdO hKKtpOPrVp6bX45GoJoU981870OM4NIPPUBDT8RegegGcGgPHv2KzGvSo4kGgkxK431d OCHHEFSy1utCP7tWz4T0bMA5FITFLKOhPi8+Aws5jVzAxrqsfqYpe4OmxHwq40Tmz+vq rpY+8/UbERmTuVksaNbc33GSk6fLEe/5ca3Q+dgLqfnbcagCwZvwaiB5av1LuSb9DLfT CFvdgodSlpedbx5nj1MNunxL01ow7kXmvmafvEGyK33gDJwxaIGy4OX1EVLdLOHDuSXr aYow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-530bba46c04si97385e87.637.2024.08.01.12.59.55; Thu, 01 Aug 2024 12:59:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F8C568D94B; Thu, 1 Aug 2024 22:59:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D63D168D41F for ; Thu, 1 Aug 2024 22:59:18 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 3BD19C03FB for ; Thu, 1 Aug 2024 22:59:18 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Aug 2024 22:59:15 +0300 Message-ID: <20240801195917.43555-4-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801195917.43555-1-remi@remlab.net> References: <20240801195917.43555-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] sws/riscv: depend on RVB and simplify accordingly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kQjqzcX8tecX --- libswscale/riscv/rgb2rgb.c | 8 +++----- libswscale/riscv/swscale.c | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libswscale/riscv/rgb2rgb.c b/libswscale/riscv/rgb2rgb.c index fb527e2bbe..7e0c0046da 100644 --- a/libswscale/riscv/rgb2rgb.c +++ b/libswscale/riscv/rgb2rgb.c @@ -50,16 +50,14 @@ av_cold void rgb2rgb_init_riscv(void) shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb; #endif #if HAVE_RVV - if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) { shuffle_bytes_0321 = ff_shuffle_bytes_0321_rvv; shuffle_bytes_2103 = ff_shuffle_bytes_2103_rvv; shuffle_bytes_1230 = ff_shuffle_bytes_1230_rvv; shuffle_bytes_3012 = ff_shuffle_bytes_3012_rvv; interleaveBytes = ff_interleave_bytes_rvv; - if (flags & AV_CPU_FLAG_RVB_BASIC) { - uyvytoyuv422 = ff_uyvytoyuv422_rvv; - yuyvtoyuv422 = ff_yuyvtoyuv422_rvv; - } + uyvytoyuv422 = ff_uyvytoyuv422_rvv; + yuyvtoyuv422 = ff_yuyvtoyuv422_rvv; } #endif #endif diff --git a/libswscale/riscv/swscale.c b/libswscale/riscv/swscale.c index 529d817aaa..c452d93e5d 100644 --- a/libswscale/riscv/swscale.c +++ b/libswscale/riscv/swscale.c @@ -39,7 +39,7 @@ av_cold static void ff_sws_init_range_convert_riscv(SwsContext *c, int flags) if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat) && c->dstBpc <= 14 && - (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) { bool from = c->srcRange != 0; c->lumConvertRange = convs[from].lum; @@ -70,7 +70,7 @@ av_cold void ff_sws_init_swscale_riscv(SwsContext *c) int flags = av_get_cpu_flags(); #if HAVE_RVV - if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) { switch (c->srcFormat) { case AV_PIX_FMT_ABGR: c->lumToYV12 = ff_abgr32ToY_rvv;