From patchwork Wed Jun 5 16:36:36 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: 49586 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp516343vqb; Wed, 5 Jun 2024 09:37:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVikMTrzwos0OdjhNl8uw90jM81/kxbR9Q5qoUVgC0kuMyadtkrbPI9yW7RFNjEsoF3knY7OfNyWdJWm/VkCsRvrqI5Cc2HpmD1Bg== X-Google-Smtp-Source: AGHT+IFlQj+Sh96C8MgzHuKUyxn0RF023MHjeOSluW1dmI+172q9Tt81Fz3rsiADRXupM/rWnaMT X-Received: by 2002:a05:651c:b2b:b0:2e9:61c7:cad3 with SMTP id 38308e7fff4ca-2eac79c8aefmr28539671fa.25.1717605419810; Wed, 05 Jun 2024 09:36:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717605419; cv=none; d=google.com; s=arc-20160816; b=B2dZa12wWV/BmbzZIMvxDFNSKUe+RvJhrWp9q3Ukhix5HYaygte23uynCYD3w2pLq6 uhHZieNtLjbuMgZSx6bOwj5WAq7vX0HqV8uGA38IKfmKC/HQ0H7elVLshQdtOM/5zMmo ylbgJYhwU3TL3aPrIUpL6A6c9Hr6av12qqsM17b5zW0Jc9/oRGIqSZjiaBvnkOutkP6n /BWY4FDACWPol2p0/OC6UOd/c0kcUM7X0NLnAH+UhNxCH7FFjr4enD1N7FCHke3GxMA5 M9n9dYRdFfSdMv0G24C/xZIuUYB38Rs6iwfSdfm9Xe6y8+67itiC332DVLpkOq9RAhBA anKA== 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=hE7Z9ZuGh+IKfx4FcSqIDkph1IZCpW9i8+RfMZ1J8fI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=x0tlEWxbxr7uW+fL23lmO0PW+l7YUHukTLVV1GtjWlrBbxQ4/5X+PgctJQ8ZGpOMZI 70B23h5b66TPtcwE2epfD0vSrcPnU3ajtr0hRh4jsA31juPsBZ3G0fVRK7+tL2ZHZHO8 MOa17c2P3gr9DGHvx+yWbh8r4U2q4m+U1dVjAvBPOVlPJBMhD/xF9XokHhIpxJux92S5 vqF+llZ3btqz/521oBn0fIZzuR54PuUaPw/BTSswgFkpv9pZuK0NCS/MumSCZhtxf+se DEQDuKziA3jjn42UvRLDeXGTzj5OQdHwynYE6aOx0Z5rwH7FalBB9LnqGuGZl+4dXz8+ fQyw==; 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 38308e7fff4ca-2ea91d4d838si37593081fa.579.2024.06.05.09.36.59; Wed, 05 Jun 2024 09:36:59 -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 EFDFD68D6FF; Wed, 5 Jun 2024 19:36:46 +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 B4BA768D67D for ; Wed, 5 Jun 2024 19:36:39 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 527F2C02EF 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:36 +0300 Message-ID: <20240605163638.10586-2-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 2/3] sws/input: R-V V rgb24ToUV and bgr24ToUV 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: xsVN++OS4ouj T-Head C908: rgb24_to_uv_8_c: 2.7 rgb24_to_uv_8_rvv_i32: 3.2 rgb24_to_uv_128_c: 41.0 rgb24_to_uv_128_rvv_i32: 12.7 rgb24_to_uv_1080_c: 342.5 rgb24_to_uv_1080_rvv_i32: 105.7 rgb24_to_uv_1280_c: 406.0 rgb24_to_uv_1280_rvv_i32: 124.2 rgb24_to_uv_1920_c: 626.0 rgb24_to_uv_1920_rvv_i32: 186.0 SpacemiT X60: rgb24_to_uv_8_c: 2.5 rgb24_to_uv_8_rvv_i32: 3.0 rgb24_to_uv_128_c: 36.5 rgb24_to_uv_128_rvv_i32: 5.7 rgb24_to_uv_1080_c: 304.2 rgb24_to_uv_1080_rvv_i32: 49.0 rgb24_to_uv_1280_c: 360.5 rgb24_to_uv_1280_rvv_i32: 57.5 rgb24_to_uv_1920_c: 540.7 rgb24_to_uv_1920_rvv_i32: 86.2 --- libswscale/riscv/input.S | 46 ++++++++++++++++++++++++++++++++++++++ libswscale/riscv/swscale.c | 8 +++++++ 2 files changed, 54 insertions(+) diff --git a/libswscale/riscv/input.S b/libswscale/riscv/input.S index 323f650bc9..3392f189ca 100644 --- a/libswscale/riscv/input.S +++ b/libswscale/riscv/input.S @@ -53,3 +53,49 @@ func ff_rgb24ToY_rvv, zve32x ret endfunc + +func ff_bgr24ToUV_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_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)) + (1 << (15 - 7)) +2: + vsetvli t0, a5, e32, m8, ta, ma + vlseg3e8.v v0, (a3) + sub a5, a5, t0 + vzext.vf4 v16, v0 + sh1add a6, t0, t0 + vzext.vf4 v24, v2 + vmul.vx v8, v16, t1 + add a3, a6, a3 + vmul.vx v16, v16, t4 + vmacc.vx v8, t2, v24 + vmacc.vx v16, t5, v24 + vzext.vf4 v24, v4 + vadd.vx v8, v8, a7 + vadd.vx v16, v16, a7 + vmacc.vx v8, t3, v24 + vmacc.vx v16, t6, v24 + vsetvli zero, zero, e16, m4, ta, ma + vnsra.wi v0, v8, 15 - 6 + vnsra.wi v4, v16, 15 - 6 + vse16.v v0, (a0) + sh1add a0, t0, a0 + vse16.v v4, (a1) + sh1add a1, t0, a1 + bnez a5, 2b + + ret +endfunc diff --git a/libswscale/riscv/swscale.c b/libswscale/riscv/swscale.c index 187b3fce58..b3552976c6 100644 --- a/libswscale/riscv/swscale.c +++ b/libswscale/riscv/swscale.c @@ -23,8 +23,12 @@ 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_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 *); av_cold void ff_sws_init_swscale_riscv(SwsContext *c) { @@ -35,10 +39,14 @@ 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) + c->chrToYV12 = ff_bgr24ToUV_rvv; break; case AV_PIX_FMT_RGB24: c->lumToYV12 = ff_rgb24ToY_rvv; + if (!c->chrSrcHSubSample) + c->chrToYV12 = ff_rgb24ToUV_rvv; break; } }