From patchwork Wed Jun 5 16:36:37 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: 49587 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp516439vqb; Wed, 5 Jun 2024 09:37:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUTmAlLTHYRkVjC6m0cTNrS0hqvmemjzI8fTd2Ih+lvt4hy9G9YfC4K9O6mLUodevrr0EMBIfqcpZSVZdvRto85wfpD+RNOt1ODEg== X-Google-Smtp-Source: AGHT+IHarPZiw9pJfp05UF52YyVLsfAhXrNCbjU2zS1pYq5hN8PqY+2MLi3HmGqErAcw9AUVjCJv X-Received: by 2002:a50:9e6e:0:b0:57a:859e:4d81 with SMTP id 4fb4d7f45d1cf-57a8bca32b0mr1857757a12.28.1717605428226; Wed, 05 Jun 2024 09:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717605428; cv=none; d=google.com; s=arc-20160816; b=YFSkwO9oMdaKpp3AFkniGs5tiDNt6QSfW//BLDMRB7VKr7l81L2Wa8yxSDQ5XEFZfL Bi3LrG6jj+dr0yw/APdVD7P84VXSWOJNprNdKsPdyFnbPhJOhXMlofR8EeE/rvkaNJId nuFfSGX3aEaBZJEq1pTdo1TRvkBw6WQ+3T0sdLUfaCthsASoU4i7I1Bm2hFijXWyHHqo IeodN8UvFYDe+lFPJcWuRLUDKhwA8vLELdPDjiIWr0DJHng376NCtoLJBUmNLW2B2on/ d7+q5w4yevi6Xpfud4irp8mOtJlIObvnQEDBoKNP6AfhK5J45NVQBMJ+Wv6PmZmQUrIx sDbQ== 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=/WatfdbsynV8IlSCEvEgK2EzlZLZzRNO1+3KyMrNvW0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=PEoSlRbirOWnUY1+fjuz03dG6RZ3OzWCfBTfW7t8o9HjjQEJ8cT4+XJs8air+m3gyw 13xN2fZz53sHCpzXF0RgItuY/9uLKVRTclHh5DeTd2XWxb+R48pDW6BjYmLbgmicnsMY qopmdjneIRVQeFoLHaJXq3A1skVX1H2yUoySxVN5d1qmpFCwUQj+wPwFrf7ky6jJdI/q wzXyltnTZd3gMPPfkWDYzdFZ5LSR2aoAlvotxvwcIS6erneKqRJ/HTesYlI1YogAJsUx G7jLNnIhCOtzNvsIZ537HUBcWCCXV+25zP9u85hHzQ8olGSVaSAf8ia8ZxLFD8meUGkk no1Q==; 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 4fb4d7f45d1cf-57a5fae69c1si3595486a12.617.2024.06.05.09.37.07; Wed, 05 Jun 2024 09:37:08 -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 03B7768D706; Wed, 5 Jun 2024 19:36:48 +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 141E168D67D for ; Wed, 5 Jun 2024 19:36:40 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 82799C02F8 for ; Wed, 5 Jun 2024 19:36:39 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 19:36:37 +0300 Message-ID: <20240605163638.10586-3-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240605163638.10586-1-remi@remlab.net> References: <20240605163638.10586-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] sws/input: R-V V rgb24ToUV_half and bgr24ToUV_half 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: YMh+Lf60+DwU T-Head C908: rgb24_to_uv_half_4_c: 2.0 rgb24_to_uv_half_4_rvv_i32: 3.5 rgb24_to_uv_half_64_c: 27.0 rgb24_to_uv_half_64_rvv_i32: 12.5 rgb24_to_uv_half_540_c: 223.7 rgb24_to_uv_half_540_rvv_i32: 105.2 rgb24_to_uv_half_640_c: 265.5 rgb24_to_uv_half_640_rvv_i32: 123.7 rgb24_to_uv_half_960_c: 414.5 rgb24_to_uv_half_960_rvv_i32: 249.5 SpacemiT X60: rgb24_to_uv_half_4_c: 1.7 rgb24_to_uv_half_4_rvv_i32: 4.2 rgb24_to_uv_half_64_c: 24.0 rgb24_to_uv_half_64_rvv_i32: 8.7 rgb24_to_uv_half_540_c: 199.2 rgb24_to_uv_half_540_rvv_i32: 72.5 rgb24_to_uv_half_640_c: 235.7 rgb24_to_uv_half_640_rvv_i32: 85.2 rgb24_to_uv_half_960_c: 353.5 rgb24_to_uv_half_960_rvv_i32: 127.5 --- libswscale/riscv/input.S | 50 ++++++++++++++++++++++++++++++++++++++ libswscale/riscv/swscale.c | 14 +++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/libswscale/riscv/input.S b/libswscale/riscv/input.S index 3392f189ca..f84f79899b 100644 --- a/libswscale/riscv/input.S +++ b/libswscale/riscv/input.S @@ -99,3 +99,53 @@ func ff_rgb24ToUV_rvv, zve32x ret endfunc + +func ff_bgr24ToUV_half_rvv, zve32x + lw t1, 20(a6) # BU + lw t4, 32(a6) # BV + lw t3, 12(a6) # RU + lw t6, 24(a6) # RV + j 1f +endfunc + +func ff_rgb24ToUV_half_rvv, zve32x + lw t1, 12(a6) # RU + lw t4, 24(a6) # RV + lw t3, 20(a6) # BU + lw t6, 32(a6) # BV +1: + lw t2, 16(a6) # GU + lw t5, 28(a6) # GV + li a7, (256 << 15) + (1 << (15 - 6)) +2: + vsetvli t0, a5, e8, m1, ta, ma + vlseg6e8.v v0, (a3) + sh1add a6, t0, t0 + vwaddu.vv v8, v0, v3 + sub a5, a5, t0 + vwaddu.vv v10, v1, v4 + sh1add a3, a6, a3 + vwaddu.vv v12, v2, v5 + vsetvli zero, zero, e32, m4, ta, ma + vzext.vf2 v20, v8 + vzext.vf2 v24, v10 + vzext.vf2 v28, v12 + vmul.vx v0, v20, t1 + vmul.vx v4, v20, t4 + vmacc.vx v0, t2, v24 + vmacc.vx v4, t5, v24 + vmacc.vx v0, t3, v28 + vmacc.vx v4, t6, v28 + vadd.vx v0, v0, a7 + vadd.vx v4, v4, a7 + vsetvli zero, zero, e16, m2, ta, ma + vnsra.wi v0, v0, 15 - 5 + vnsra.wi v2, v4, 15 - 5 + vse16.v v0, (a0) + sh1add a0, t0, a0 + vse16.v v2, (a1) + sh1add a1, t0, a1 + bnez a5, 2b + + ret +endfunc diff --git a/libswscale/riscv/swscale.c b/libswscale/riscv/swscale.c index b3552976c6..bae626f64a 100644 --- a/libswscale/riscv/swscale.c +++ b/libswscale/riscv/swscale.c @@ -25,10 +25,16 @@ void ff_bgr24ToY_rvv(uint8_t *dst, const uint8_t *src, const uint8_t *, const uint8_t *, int width, uint32_t *coeffs, void *); void ff_bgr24ToUV_rvv(uint8_t *, uint8_t *, const uint8_t *, const uint8_t *, const uint8_t *, int width, uint32_t *coeffs, void *); +void ff_bgr24ToUV_half_rvv(uint8_t *, uint8_t *, const uint8_t *, + const uint8_t *, const uint8_t *, int width, + uint32_t *coeffs, void *); void ff_rgb24ToY_rvv(uint8_t *dst, const uint8_t *src, const uint8_t *, const uint8_t *, int width, uint32_t *coeffs, void *); void ff_rgb24ToUV_rvv(uint8_t *, uint8_t *, const uint8_t *, const uint8_t *, const uint8_t *, int width, uint32_t *coeffs, void *); +void ff_rgb24ToUV_half_rvv(uint8_t *, uint8_t *, const uint8_t *, + const uint8_t *, const uint8_t *, int width, + uint32_t *coeffs, void *); av_cold void ff_sws_init_swscale_riscv(SwsContext *c) { @@ -39,13 +45,17 @@ av_cold void ff_sws_init_swscale_riscv(SwsContext *c) switch (c->srcFormat) { case AV_PIX_FMT_BGR24: c->lumToYV12 = ff_bgr24ToY_rvv; - if (!c->chrSrcHSubSample) + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_bgr24ToUV_half_rvv; + else c->chrToYV12 = ff_bgr24ToUV_rvv; break; case AV_PIX_FMT_RGB24: c->lumToYV12 = ff_rgb24ToY_rvv; - if (!c->chrSrcHSubSample) + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_rgb24ToUV_half_rvv; + else c->chrToYV12 = ff_rgb24ToUV_rvv; break; }