From patchwork Thu Jun 6 18:26:16 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: 49629 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp564687vqo; Thu, 6 Jun 2024 11:26:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpaegqR2zJb7B35AIjWpDeYMLUhr4kgOsBniSe89taxALxREfncwOVVRrfabQfcxYpUu+241EhHvDD66fczRQzgRUfeGAWhF3v5w== X-Google-Smtp-Source: AGHT+IFNQ6WgGjgeZ45JBqBAw+0xm8Tv2peGnuWlj/Ihj0ASBUd+Cy9n9JnFURmtbJ8VFJgsc4nf X-Received: by 2002:a05:6512:3f08:b0:52b:81de:1127 with SMTP id 2adb3069b0e04-52bb9fc4584mr343353e87.50.1717698397973; Thu, 06 Jun 2024 11:26:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717698397; cv=none; d=google.com; s=arc-20160816; b=Yxz8nbsb4vHlzCBngR/XZhQ5nvoqaJeWrJ6KMUrOs8Rh5f4VwKCKm1aC4U0VGDs4Ww 8PBeiXMcfnGlFIjmMFCEHk7mh5uWxhsNZLOCwa11wifkm1kWdkUuQNqM0NysNQkq8kni ycuN9YDIpGH89bUxgGmx2WRD+KlBaBQyh2+nVufpacyDlXoebXBDWe8nZqbiZCEMckoT S6STRFc8x5/jsMpWBKFmpjXjHfpEBdJmSaJJ37zsWV1lekxN8PTveLMRc/I5Y9rnab+X BD6kxWsS5c8FwY/+g0wxthVaucEXxbXnpoaxOfVBNZyzkbUc/KWP2X6BWo9rWC3uCaDp qfvg== 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=CXrmVRYnx1WHkLcNSSbEDtvZoapiKM7DaLhQdFnWyOI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=damVn92owoZaRAo5+q4xyVt39v/hl0ObbCVHt3gfk3axMegBja10vqK/3t+xyMwRx5 coc5fs7d/qPFSzs44LyH989Singy2dpf1LuLWl/H1cZZhj5RN2rrkUj61rgk33WJ/brw 4DFe1LnVNlH2epxfZRGHZPbb2+io+lY9kAbiW2+WbnZP/0ZuiWeyUT8MNsHKZAkAOpyP pxiid7fZsU41YShYZhqMmY4viUxJa5ruINUAY35jVsRCp0GnhRmiaCO2HBKYpWJXI64t iabL0zO0uq1RDZM9x45xL0DWCNGyheqibwbNrnJVqeyvTjzOlqOAytXGQH1YXJDJ9gUP UVQg==; 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 a640c23a62f3a-a6c8058c548si87671366b.209.2024.06.06.11.26.37; Thu, 06 Jun 2024 11:26:37 -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 135B468D718; Thu, 6 Jun 2024 21:26:27 +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 C2F7068D6E2 for ; Thu, 6 Jun 2024 21:26:18 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 299C7C016F for ; Thu, 6 Jun 2024 21:26:18 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jun 2024 21:26:16 +0300 Message-ID: <20240606182617.39636-2-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240606182617.39636-1-remi@remlab.net> References: <20240606182617.39636-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] sws/input: R-V V 32-bit RGB to UV 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: BacOSrJphxnF --- libswscale/riscv/input.S | 52 ++++++++++++++++++++++++++++++++++++++ libswscale/riscv/swscale.c | 8 ++++++ 2 files changed, 60 insertions(+) diff --git a/libswscale/riscv/input.S b/libswscale/riscv/input.S index 8dfd012a9d..2d00a5a225 100644 --- a/libswscale/riscv/input.S +++ b/libswscale/riscv/input.S @@ -190,6 +190,58 @@ func ff_\chr0\()ToY_rvv, zve32x ret endfunc + +func ff_\chr1\()ToUV_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_\chr0\()ToUV_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 a6, 0xff + li a7, (256 << (15 - 1)) + (1 << (15 - 7)) +2: + vsetvli t0, a5, e32, m8, ta, ma + vle32.v v0, (a3) + sub a5, a5, t0 + .if \high + vsrl.vi v24, v0, 24 + .else + vand.vx v24, v0, a6 + .endif + sh2add a3, t0, a3 + vsrl.vi v8, v0, 8 * (1 + \high) + vmul.vx v16, v24, t1 + vand.vx v8, v8, a6 + vmul.vx v24, v24, t4 + vmacc.vx v16, t2, v8 + vsrl.vi v0, v0, 8 * (2 - \high) + vmacc.vx v24, t5, v8 + vand.vx v0, v0, a6 + vadd.vx v16, v16, a7 + vadd.vx v24, v24, a7 + vmacc.vx v16, t3, v0 + vmacc.vx v24, t6, v0 + vsetvli zero, zero, e16, m4, ta, ma + vnsra.wi v0, v16, 15 - 6 + vnsra.wi v4, v24, 15 - 6 + vse16.v v0, (a0) + sh1add a0, t0, a0 + vse16.v v4, (a1) + sh1add a1, t0, a1 + bnez a5, 2b + + ret +endfunc .endm rgba_input rgba32, bgra32, 0 diff --git a/libswscale/riscv/swscale.c b/libswscale/riscv/swscale.c index fcb338b295..76fbf2ca08 100644 --- a/libswscale/riscv/swscale.c +++ b/libswscale/riscv/swscale.c @@ -47,10 +47,14 @@ av_cold void ff_sws_init_swscale_riscv(SwsContext *c) switch (c->srcFormat) { case AV_PIX_FMT_ABGR: c->lumToYV12 = ff_abgr32ToY_rvv; + if (!c->chrSrcHSubSample) + c->chrToYV12 = ff_abgr32ToUV_rvv; break; case AV_PIX_FMT_ARGB: c->lumToYV12 = ff_argb32ToY_rvv; + if (!c->chrSrcHSubSample) + c->chrToYV12 = ff_argb32ToUV_rvv; break; case AV_PIX_FMT_BGR24: @@ -63,6 +67,8 @@ av_cold void ff_sws_init_swscale_riscv(SwsContext *c) case AV_PIX_FMT_BGRA: c->lumToYV12 = ff_bgra32ToY_rvv; + if (!c->chrSrcHSubSample) + c->chrToYV12 = ff_bgra32ToUV_rvv; break; case AV_PIX_FMT_RGB24: @@ -75,6 +81,8 @@ av_cold void ff_sws_init_swscale_riscv(SwsContext *c) case AV_PIX_FMT_RGBA: c->lumToYV12 = ff_rgba32ToY_rvv; + if (!c->chrSrcHSubSample) + c->chrToYV12 = ff_rgba32ToUV_rvv; break; } }