From patchwork Mon Jul 1 15:23:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 50256 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1880754vqv; Mon, 1 Jul 2024 08:24:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQL9yodBBhgF85B7AH7gQh/6BMpR+6JL0zhYUx+hobsz+TRn64a2xIriZxLoQHBXqMPfPZuyroqoFsT1dG4unzbkf8qd0DKZxShg== X-Google-Smtp-Source: AGHT+IFEQ+X5Vw7cP/88q1wQ0mOF/XrZDdP2uTZmsCKs3n7ws5OHUdjxpSBl5vqqtb2Cn9gMIyxM X-Received: by 2002:a2e:9613:0:b0:2ec:5b10:685a with SMTP id 38308e7fff4ca-2ee5e35db6emr38201021fa.17.1719847440638; Mon, 01 Jul 2024 08:24:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719847440; cv=none; d=google.com; s=arc-20160816; b=ZtAv3btgeztKIW0LDQxw8PTdGsxA7XIXnQSpy5ALJaj9+q+DYJY4MIQCXMfte3tHXw yNdcNj7KA4qtaWNj62PMoKOsKraOkBDIzKOgijYJKwYKmedfGYYKr5dogv+jSwaKPK0B wSVQW4AA/oa9AOwEvrIFrIOpV+G30gnlEznOHrPTLM1Ns/AUE+d8DP1YuD8bO2mSMEYc urFYrWDqO1Xc4UAM6FYXhakvwWdsovvMUzMQR7KfdmswreNhecvF5R+xJX+0QRq+rTdb QPXYrOQcD+PBGgHVFYqxADshRukN1PdvxmVW5Ly4gasueeDEVXLE6PS4pYri/i9+7EKN r9Aw== 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:message-id:date:to:from :delivered-to; bh=r5nfz8TpiNF2lUcWIAiL6CrlOBS28zTxCJ+v+5sj+7k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=sFt6iMW7PyI8UzDj5rRqPf8zkpbrC5fRj3pi+y9sQVM8lQBfbsLD5/r2FmMe6FWx7C uupL1PQZyn7Pn56mypEIrVeryJe0C82Snw7+BdV1c8oY8tVnSdPo8x63tBH6MzdKHUUR 4DBs7JL6lxyaz5JRwimJcu+UTb94WMWTL4y+KrRml3kU2ZIrunFiwXRWgpEgj+1DEwBN XaI/TnO87H9451fpkKBAyihRqJTQSjmmDd2TRzc9PPTSO4x7YZ8XCLkXt4ctWyW+g8M+ maNIbP9FEZLveItmz1EGuZigTrp9iLfff+dxPWMyMf2AA8rOcIFErBW35COX8D7wk5Vg 4tSQ==; 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-2ee51584165si19800291fa.640.2024.07.01.08.23.59; Mon, 01 Jul 2024 08:24:00 -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 03C9468D7F8; Mon, 1 Jul 2024 18:23: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 7B7F068D22E for ; Mon, 1 Jul 2024 18:23:39 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id B123BC0140 for ; Mon, 1 Jul 2024 18:23:38 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 18:23:36 +0300 Message-ID: <20240701152338.9624-1-remi@remlab.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2 1/2] lavc/h264dsp: R-V V 8-bit luma loop filter 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: +pSGswDtXZcV T-Head C908 (cycles): h264_h_loop_filter_luma_8bpp_c: 297.5 h264_h_loop_filter_luma_8bpp_rvv_i32: 369.2 h264_v_loop_filter_luma_8bpp_c: 862.7 h264_v_loop_filter_luma_8bpp_rvv_i32: 199.7 Performance in the horizontal scenario seems worse than scalar. x86 SSE2 and AVX optimisations are similarly affected. This is presumably caused by unlucky inputs from checkasm, such that the C code short-circuits almost all filter calculations. Changes since version 1: 1) Multiplies rather than shuffles to extend the TC array. 2) Get rid of the weird MBAFF macros (as a consequence of (1)). --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/h264dsp_init.c | 13 ++- libavcodec/riscv/h264dsp_rvv.S | 140 ++++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/h264dsp_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index c180223141..a1510e8c6e 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -31,6 +31,7 @@ RVV-OBJS-$(CONFIG_H263DSP) += riscv/h263dsp_rvv.o OBJS-$(CONFIG_H264CHROMA) += riscv/h264_chroma_init_riscv.o RVV-OBJS-$(CONFIG_H264CHROMA) += riscv/h264_mc_chroma.o OBJS-$(CONFIG_H264DSP) += riscv/h264dsp_init.o +RVV-OBJS-$(CONFIG_H264DSP) += riscv/h264dsp_rvv.o OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_init.o RVV-OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index dbbf3db400..0d4d541992 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -24,8 +24,14 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/riscv/cpu.h" #include "libavcodec/h264dsp.h" +void ff_h264_v_loop_filter_luma_8_rvv(uint8_t *pix, ptrdiff_t stride, + int alpha, int beta, int8_t *tc0); +void ff_h264_h_loop_filter_luma_8_rvv(uint8_t *pix, ptrdiff_t stride, + int alpha, int beta, int8_t *tc0); + extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); @@ -38,8 +44,13 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, if (flags & AV_CPU_FLAG_RVB_BASIC) dsp->startcode_find_candidate = ff_startcode_find_candidate_rvb; # if HAVE_RVV - if (flags & AV_CPU_FLAG_RVV_I32) + if (flags & AV_CPU_FLAG_RVV_I32) { + if (bit_depth == 8 && ff_rv_vlen_least(128)) { + dsp->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_8_rvv; + dsp->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_8_rvv; + } dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; + } # endif #endif } diff --git a/libavcodec/riscv/h264dsp_rvv.S b/libavcodec/riscv/h264dsp_rvv.S new file mode 100644 index 0000000000..77bf40db1f --- /dev/null +++ b/libavcodec/riscv/h264dsp_rvv.S @@ -0,0 +1,140 @@ +/* + * Copyright © 2024 Rémi Denis-Courmont. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "libavutil/riscv/asm.S" + + .variant_cc ff_h264_loop_filter_luma_8_rvv +func ff_h264_loop_filter_luma_8_rvv, zve32x + # p2: v8, p1: v9, p0: v10, q0: v11, q1: v12, q2: v13 + # alpha: a2, beta: a3, tc_orig: v6 + csrwi vxrm, 0 + vaaddu.vv v14, v10, v11 # (p0 + q0 + 1) / 2 + vwsubu.vv v16, v9, v12 + vwaddu.vv v18, v8, v14 + vwaddu.vv v20, v13, v14 + vnsra.wi v24, v16, 2 # (p1 - q1) / 4 + vnsrl.wi v14, v18, 1 + vnsrl.wi v15, v20, 1 + vneg.v v5, v6 # -tc_orig + vwsubu.vv v22, v11, v10 # q0 - p0 + vwsubu.vv v18, v14, v9 + vwsubu.vv v20, v15, v12 + vwadd.wv v16, v22, v24 + vmsge.vi v7, v6, 0 # tc_orig >= 0 + vnclip.wi v14, v18, 0 + vnclip.wi v15, v20, 0 + vnclip.wi v16, v16, 1 # clip8((q0 - p0 + (p1 - q1) / 4 + 1) >> 1) + vmin.vv v14, v14, v6 + vmin.vv v15, v15, v6 + vmax.vv v14, v14, v5 # clip(p2 + ... - p1, +/-tc_orig) + vmax.vv v15, v15, v5 # clip(q2 + ... - q1, +/-tc_orig) + vwsubu.vv v20, v10, v11 + vwsubu.vv v24, v9, v10 + vwsubu.vv v26, v10, v9 + vwsubu.vv v28, v12, v11 + vwsubu.vv v30, v11, v12 + vwsubu.vv v0, v8, v10 + vwsubu.vv v2, v10, v8 + vwsubu.vv v4, v13, v11 + vwsubu.vv v18, v11, v13 + vsetvli zero, zero, e16, m2, ta, ma + vmax.vv v20, v20, v22 # abs(p0 - q0) + vmax.vv v24, v24, v26 # abs(p1 - p0) + vmax.vv v28, v28, v30 # abs(q1 - q0) + vmax.vv v22, v0, v2 # abs(p2 - p0) + vmax.vv v26, v4, v18 # abs(q2 - q0) + vmslt.vx v1, v20, a2 + vmslt.vx v2, v24, a3 + vmand.mm v7, v7, v1 + vmslt.vx v3, v28, a3 + vmand.mm v7, v7, v2 + vmslt.vx v0, v22, a3 + vmand.mm v7, v7, v3 # whether to update p0 and q0 + vmslt.vx v1, v26, a3 + vmand.mm v0, v0, v7 + vsetvli zero, zero, e8, m1, ta, mu + vadd.vi v6, v6, 1, v0.t # tc++ + vadd.vv v9, v9, v14, v0.t # p1' + vmand.mm v0, v1, v7 + vadd.vi v6, v6, 1, v0.t # tc++ + vadd.vv v12, v12, v15, v0.t # q1' + vneg.v v5, v6 # -tc + vmin.vv v16, v16, v6 + vwcvtu.x.x.v v18, v10 + vmax.vv v16, v16, v5 + vwcvtu.x.x.v v20, v11 + vwadd.wv v18, v18, v16 + vwsub.wv v20, v20, v16 + vmmv.m v0, v7 + vsetvli zero, zero, e16, m2, ta, ma + vmax.vx v18, v18, zero + vmax.vx v20, v20, zero + vsetvli zero, zero, e8, m1, ta, mu + vnclipu.wi v10, v18, 0, v0.t # p0' + vnclipu.wi v11, v20, 0, v0.t # q0' + jr t0 +endfunc + +func ff_h264_v_loop_filter_luma_8_rvv, zve32x + vsetivli zero, 4, e32, m1, ta, ma + vle8.v v4, (a4) + li t0, 0x01010101 + vzext.vf4 v6, v4 + sub t3, a0, a1 + vmul.vx v6, v6, t0 + vsetivli zero, 16, e8, m1, ta, ma + vle8.v v11, (a0) + sub t2, t3, a1 + vid.v v0 + vle8.v v10, (t3) + sub t1, t2, a1 + vle8.v v9, (t2) + add t5, a0, a1 + vle8.v v8, (t1) + add t6, t5, a1 + vle8.v v12, (t5) + vle8.v v13, (t6) + jal t0, ff_h264_loop_filter_luma_8_rvv + vse8.v v9, (t2) + vse8.v v10, (t3) + vse8.v v11, (a0) + vse8.v v12, (t5) + ret +endfunc + +func ff_h264_h_loop_filter_luma_8_rvv, zve32x + vsetivli zero, 4, e32, m1, ta, ma + vle8.v v4, (a4) + li t0, 0x01010101 + vzext.vf4 v6, v4 + addi a0, a0, -3 + vmul.vx v6, v6, t0 + vsetivli zero, 16, e8, m1, ta, ma + vlsseg6e8.v v8, (a0), a1 + jal t0, ff_h264_loop_filter_luma_8_rvv + vssseg6e8.v v8, (a0), a1 + ret +endfunc From patchwork Mon Jul 1 15:23: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: 50255 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1880623vqv; Mon, 1 Jul 2024 08:23:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU9XtXoYWDCxHl776tyc9EvLx3znV3V1W72HHJj0Kogwz8nFCwxpqCFI3fZoOijLChUZrSH+hahlD6Sh1ovwj/8t9FrnY/PvQ00Sw== X-Google-Smtp-Source: AGHT+IENgJ0kKrS7lWGvldwBFpgYIj5HHHGh8h0HV3xK0qwZjqZQ0XVOIsgjsTrekNlmeOPRRsX5 X-Received: by 2002:a2e:a547:0:b0:2ee:46ec:60bc with SMTP id 38308e7fff4ca-2ee5e4c392amr50917191fa.27.1719847430555; Mon, 01 Jul 2024 08:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719847430; cv=none; d=google.com; s=arc-20160816; b=aPNKx3B/QwsS56ItVGc911sn/shuqDs9/Lz304mp6o5X3gVX2kJqC9qsIQ99fb2z+y vNqQl0/IHJzYrVtzQpMldXB1fkXWK/LfgigZh8lks0K2S1DQ2TXV9RKXIKPfwvMQuaKu F22m4I4vHKAxmkSYcKcHzekz4FI4zD7z35rl2MIm6xTiHQBqCu7XcZhh4YJ6qXnkin59 7Xh/hBetRvN/G2M8bXVMI1iVkewCc/Qrl+jv6rU+jDZ11bC0XqqZg+ayqZ91D1D1/7Cq aU3t2Jz3oswXcaJ/wWqSHZiN2fhf2kg8iNxF84vve3L0LDKUJUZSoexbsDGs/pwCtBkP w/Aw== 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=fMuus0fT6LRpkUPJ6VJh56oV1Jh2d11hFgwMQA/FDsk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=bZE64KWpLUxbNtnuSLiXGp2pA+HkvQ8DSs57Huve1mjEiLBqt9H5AGtnfqY0V7UndI fzcCzevM1FGFdxjWWaO/D8XKWc5yYhl+YxyXFVRNYcELwz/pnYn3qvnZbSUJBSYxHkzv VOno/wK76KlUZCaj1O0mS9e+EqykBpVgDJifG70G3Ho2kW4I9aRJXgl2JDAI5AstdEpS uhMdBlxTUl1Fb2Kf8+y0m2ZH11dJUyoM0vqOqrfbwdaA0YMsATboC8JUngj+8lttIkj6 ljkB2GHQBm11an2WGQuoH0zL6MATDAnAjBx0hbEmDVEgwgxCsVWoX15sI3o4tFD/idpu Gegg==; 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-2ee515385cdsi20240971fa.294.2024.07.01.08.23.50; Mon, 01 Jul 2024 08:23:50 -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 C903F68D22E; Mon, 1 Jul 2024 18:23:45 +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 7DD7368D7CA for ; Mon, 1 Jul 2024 18:23:39 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id E0B3EC0170 for ; Mon, 1 Jul 2024 18:23:38 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 18:23:37 +0300 Message-ID: <20240701152338.9624-2-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240701152338.9624-1-remi@remlab.net> References: <20240701152338.9624-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/h264dsp: R-V V 8-bit MBAFF loop filter 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: M0OmDvBREVwL Performance is (unfortunately) the same as with non-MBAFF, since the hardware under test does not short-circuit vector tail calculations. (IMO, a generic solution or work-around should be agreed on, rather than bespoke approaches all over the place.) --- libavcodec/riscv/h264dsp_init.c | 4 ++++ libavcodec/riscv/h264dsp_rvv.S | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 0d4d541992..ab412a9924 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -31,6 +31,8 @@ void ff_h264_v_loop_filter_luma_8_rvv(uint8_t *pix, ptrdiff_t stride, int alpha, int beta, int8_t *tc0); void ff_h264_h_loop_filter_luma_8_rvv(uint8_t *pix, ptrdiff_t stride, int alpha, int beta, int8_t *tc0); +void ff_h264_h_loop_filter_luma_mbaff_8_rvv(uint8_t *pix, ptrdiff_t stride, + int alpha, int beta, int8_t *tc0); extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); @@ -48,6 +50,8 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, if (bit_depth == 8 && ff_rv_vlen_least(128)) { dsp->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_8_rvv; dsp->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_8_rvv; + dsp->h264_h_loop_filter_luma_mbaff = + ff_h264_h_loop_filter_luma_mbaff_8_rvv; } dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; } diff --git a/libavcodec/riscv/h264dsp_rvv.S b/libavcodec/riscv/h264dsp_rvv.S index 77bf40db1f..008f33d4b8 100644 --- a/libavcodec/riscv/h264dsp_rvv.S +++ b/libavcodec/riscv/h264dsp_rvv.S @@ -138,3 +138,17 @@ func ff_h264_h_loop_filter_luma_8_rvv, zve32x vssseg6e8.v v8, (a0), a1 ret endfunc + +func ff_h264_h_loop_filter_luma_mbaff_8_rvv, zve32x + vsetivli zero, 4, e16, m1, ta, ma + vle8.v v4, (a4) + li t0, 0x0101 + vzext.vf2 v6, v4 + addi a0, a0, -3 + vmul.vx v6, v6, t0 # tc_orig + vsetivli zero, 8, e8, m1, ta, ma + vlsseg6e8.v v8, (a0), a1 + jal t0, ff_h264_loop_filter_luma_8_rvv + vssseg6e8.v v8, (a0), a1 + ret +endfunc