From patchwork Sun Jun 9 16:23:47 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: 49760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2083961vqo; Sun, 9 Jun 2024 09:24:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUh6YDO5Z8M5fk3PIOVUFdYZWHSkcGcycSBr+Q8Fnm1fErqxGvfO3KBHnm6JuD2hF1jZ6A10QPZUzf+X+JBAJt96mKyXNMJtUcGZg== X-Google-Smtp-Source: AGHT+IGuSIQiW4zennq3sRhARsIR7Ol6KIEWDm1p43IEB3OjH9EyG7jIuX9Fw+WhDlb2nrCPpXIa X-Received: by 2002:a17:907:9448:b0:a6f:1e23:c4af with SMTP id a640c23a62f3a-a6f1e23c744mr73500766b.62.1717950266098; Sun, 09 Jun 2024 09:24:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717950266; cv=none; d=google.com; s=arc-20160816; b=Oe2b5Q7STRn8TFFULHHCR0Ow3+e0bmOnNm/kZR7KHJVPb/RAObcqvFjwgQmXMrcnHD VZS0xObDb2YJwdvDABUriaIqJoAK99VQcDfQQvjK++cTSzDspuFtBEEhrrC+qxVW1fS9 IXYiX5arqyR+M8X3+IpIWNlqh9ntrdB/AFNaHiVGJajhKaMluIOhr94Ou0hwFMGAqXgm ycVJkQ0JAT0eebUSaHQEpIirGW97mcoKxrpaz+EP/wputq2Rl/4DkWI5uvWOABvTqzei tb3qjeABgJsqh4UNWkfDG+VhC3+cD3P9Akb6wGy4PZyj1oh2CRqw3mJfXnA0fXeoFNMG nx2g== 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=NRi4Dny0zEM+Bu4siS/hJvuZbq8KW0C26AQsd58OpwU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=aGTcHsCyEnpGYOkADXcul271HKZWEqo6NHy4e2ph929WeTaP2YZfcfCoA9AqtMqvut h845lLSUn/8TWipvAK+zxn5keHKsOmU68tNU7EWyYRBjDA/T8+egjfOUb9KALOfjeClO buYiByBrgOx4Knc0Hl/wMEX9aLr1g9wB+aIbnrOGKv+u9SkJf45uEXXv9Z6NZGV04/6K 0fXXPRaZE2TQUB6sLzywpNF7sOOOsRDHFlBVfhzG/m/CQXWkVJEipKtdOfPDo9FfO/D2 +qBfZxGkV6cp5ifFhlbffEqimPUewlCkvtzMUUmyLOAl5dDgtblTLFcR7bVyTpV2LAYO aIig==; 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-a6eff1d2e31si171964866b.75.2024.06.09.09.24.25; Sun, 09 Jun 2024 09:24:26 -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 10FD968D686; Sun, 9 Jun 2024 19:23:59 +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 C6A2D68D5F1 for ; Sun, 9 Jun 2024 19:23:48 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 6A274C02F9 for ; Sun, 9 Jun 2024 19:23:48 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 19:23:47 +0300 Message-ID: <20240609162347.2541907-4-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240609162347.2541907-1-remi@remlab.net> References: <20240609162347.2541907-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavc/h263dsp: R-V V dct_unquantize_{intra, inter} 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: SHK9u9qdwbUr T-Head C908: h263dsp.dct_unquantize_inter_c: 3.7 h263dsp.dct_unquantize_inter_rvv_i32: 1.7 h263dsp.dct_unquantize_intra_c: 4.0 h263dsp.dct_unquantize_intra_rvv_i32: 2.0 SpacemiT X60: h263dsp.dct_unquantize_inter_c: 3.5 h263dsp.dct_unquantize_inter_rvv_i32: 0.7 h263dsp.dct_unquantize_intra_c: 3.5 h263dsp.dct_unquantize_intra_rvv_i32: 0.7 --- libavcodec/riscv/h263dsp_init.c | 15 ++++++++++++--- libavcodec/riscv/h263dsp_rvv.S | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/libavcodec/riscv/h263dsp_init.c b/libavcodec/riscv/h263dsp_init.c index 21b536366c..8c5d92ef76 100644 --- a/libavcodec/riscv/h263dsp_init.c +++ b/libavcodec/riscv/h263dsp_init.c @@ -25,6 +25,8 @@ #include "libavutil/riscv/cpu.h" #include "libavcodec/h263dsp.h" +void ff_h263_dct_unquantize_intra_rvv(int16_t *, size_t len, int, int); +void ff_h263_dct_unquantize_inter_rvv(int16_t *, size_t len, int, int); void ff_h263_h_loop_filter_rvv(uint8_t *src, int stride, int q); void ff_h263_v_loop_filter_rvv(uint8_t *src, int stride, int q); @@ -33,9 +35,16 @@ av_cold void ff_h263dsp_init_riscv(H263DSPContext *c) #if HAVE_RVV int flags = av_get_cpu_flags(); - if ((flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) { - c->h263_h_loop_filter = ff_h263_h_loop_filter_rvv; - c->h263_v_loop_filter = ff_h263_v_loop_filter_rvv; + if (flags & AV_CPU_FLAG_RVV_I32) { + if (flags & AV_CPU_FLAG_RVB_ADDR) { + c->h263_dct_unquantize_intra = ff_h263_dct_unquantize_intra_rvv; + c->h263_dct_unquantize_inter = ff_h263_dct_unquantize_inter_rvv; + } + + if (ff_rv_vlen_least(128)) { + c->h263_h_loop_filter = ff_h263_h_loop_filter_rvv; + c->h263_v_loop_filter = ff_h263_v_loop_filter_rvv; + } } #endif } diff --git a/libavcodec/riscv/h263dsp_rvv.S b/libavcodec/riscv/h263dsp_rvv.S index 97503d527c..d61cf2c747 100644 --- a/libavcodec/riscv/h263dsp_rvv.S +++ b/libavcodec/riscv/h263dsp_rvv.S @@ -20,6 +20,30 @@ #include "libavutil/riscv/asm.S" +func ff_h263_dct_unquantize_intra_rvv, zve32x + addi a1, a1, -1 + addi a0, a0, 2 + # fall through +endfunc + +func ff_h263_dct_unquantize_inter_rvv, zve32x +1: + vsetvli t0, a1, e16, m4, ta, mu + vle16.v v8, (a0) + sub a1, a1, t0 + vmv.v.x v24, a3 + vmslt.vi v0, v8, 0 + vmul.vx v16, v8, a2 + vneg.v v24, v24, v0.t + vmsne.vi v0, v8, 0 + vadd.vv v8, v16, v24, v0.t + vse16.v v8, (a0) + sh1add a0, t0, a0 + bnez a1, 1b + + ret +endfunc + .option push .option norelax func ff_h263_h_loop_filter_rvv, zve32x