From patchwork Tue Jul 2 17:13:34 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: 50286 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2589767vqv; Tue, 2 Jul 2024 10:13:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVU2Tb55bBWQmTYwDi7nAwXW72JeapVQGKbq0J7R2Qo4sRNnzJqBCT9sXYwbj3y6wGKXc+7Xm3Jylr803P6egcwZaZOzMnhkawBOw== X-Google-Smtp-Source: AGHT+IFaAKDJwi3eHymyCOHfQTd917x6A8bOqHG9ZQmnjxgA2CpWHzjma87gfRdPpGPXoSXLefdw X-Received: by 2002:a05:6512:234b:b0:52c:dae5:af2f with SMTP id 2adb3069b0e04-52e825c82e2mr6216599e87.0.1719940428853; Tue, 02 Jul 2024 10:13:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719940428; cv=none; d=google.com; s=arc-20160816; b=GRfdFV8LAfjVD4SynCNfdM1RLDA91uHDRKMs6Ifiu+Qetdgtjcgc1HF1AX2S6Kvamf gG3LBU0k5N2QpNzvWeLpwfPkuDF4SN1UsbKUfFzAhiWz5lpwiME0m0uMdy0XihbMJKQ4 syU4w9B6T1VfTQxfy3/VUw4Gv1vtXGzEdAxw4+2SbwAQUVadZsrBlXE8kjZrrv0002Kp MiXW/kXMogOEqPgCSgSIm6khzSUnpAnWK0lTQWXGFquW0v+cgQgBkYn6DImD46JGvbKJ RN7gp9kkA58eDMXWUzeHYIPSwGGJIx/V3j1mMJe/mSCqnOkNE43EWiuXB+Yk7ZjIJxyI +8DA== 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=2hlTYS3s+i6I0mDONi8FFPuKdJqIvaRePoa+afteHWY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HffBY8uSRia6WyhXSlwNCvS7K90gJUs2wNkqjmXG+5dwQ+eEna726bDqWlxEdH/vUL 1OVu3878h/q7Avw3ItV3Ek26MpJCVrwoEUX+hynzcR1PMmOLqgkItewPUNpmgNerex0k 6FNEpzJzKr1fp1YsmimHQd3AqjhQk6gZ68mhYqOFLxch9wrmXuSc7u5R3TiQWIwhOIq4 F91Ea2yLHbmQN0q7DLFlZs5SgmOiP80PMaW0FE2IAD/SXHy5T09IoVvdufLcI/Sq8L0h 0I9liDjOxvBbB5O908Z/IjeFJvqfaSpE+HmK5zcfTVLb8biFAkEo1HaMtywXIryNuwJ3 sVeQ==; 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 2adb3069b0e04-52e7ab316d6si3106492e87.465.2024.07.02.10.13.48; Tue, 02 Jul 2024 10:13:48 -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 16B4768D926; Tue, 2 Jul 2024 20:13: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 A06A468D699 for ; Tue, 2 Jul 2024 20:13:37 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 17FB4C018A for ; Tue, 2 Jul 2024 20:13:37 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 20:13:34 +0300 Message-ID: <20240702171336.26390-2-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702171336.26390-1-remi@remlab.net> References: <20240702171336.26390-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/h264dsp: R-V V 8-bit h264_idct_add16intra 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: a8LGMaqdNnkg --- libavcodec/riscv/h264dsp_init.c | 4 ++ libavcodec/riscv/h264idct_rvv.S | 68 +++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 5f318e3f2b..7badb86e87 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -37,6 +37,9 @@ void ff_h264_h_loop_filter_luma_mbaff_8_rvv(uint8_t *pix, ptrdiff_t stride, void ff_h264_idct_add16_8_rvv(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[5 * 8]); +void ff_h264_idct_add16intra_8_rvv(uint8_t *dst, const int *blockoffset, + int16_t *block, int stride, + const uint8_t nnzc[5 * 8]); extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); @@ -58,6 +61,7 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, ff_h264_h_loop_filter_luma_mbaff_8_rvv; dsp->h264_idct_add16 = ff_h264_idct_add16_8_rvv; + dsp->h264_idct_add16intra = ff_h264_idct_add16intra_8_rvv; } dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; } diff --git a/libavcodec/riscv/h264idct_rvv.S b/libavcodec/riscv/h264idct_rvv.S index 74083f8221..42a29ba336 100644 --- a/libavcodec/riscv/h264idct_rvv.S +++ b/libavcodec/riscv/h264idct_rvv.S @@ -102,5 +102,73 @@ func ff_h264_idct_add16_\depth\()_rvv, zve32x addi sp, sp, 80 ret endfunc + +func ff_h264_idct_add16intra_\depth\()_rvv, zve32x + addi sp, sp, -80 + lla t0, ff_h264_scan8 + sd s0, (sp) + li t1, 32 << (\depth > 8) + mv s0, sp + sd ra, 8(sp) + sd s1, 16(sp) + sd s2, 24(sp) + sd s3, 32(sp) + sd s4, 40(sp) + sd s5, 48(sp) + sd s6, 56(sp) + sd s7, 64(sp) + vsetivli zero, 16, e8, m1, ta, ma + vle8.v v8, (t0) + vlse16.v v16, (a2), t1 + vluxei8.v v12, (a4), v8 +.if \depth == 8 + vsetvli zero, zero, e16, m2, ta, ma +.else + vsetvli zero, zero, e32, m4, ta, ma +.endif + vmsne.vi v1, v16, 0 + vsetvli zero, zero, e8, m1, ta, ma + vmsne.vi v0, v12, 0 + vsetvli zero, zero, e16, m2, ta, ma + vmv.x.s s2, v0 + vmv.x.s s3, v1 + li s1, 16 + mv s4, a0 + mv s5, a1 + mv s6, a2 + mv s7, a3 +1: + andi t0, s2, 1 + addi s1, s1, -1 + srli s2, s2, 1 + lw t2, (s5) # block_offset[i] + andi t1, s3, 1 + mv a1, s6 + mv a2, s7 + add a0, s4, t2 + beqz t0, 2f # if (nnzc[scan8[i]]) + call ff_h264_idct_add_\depth\()_c + j 3f +2: + beqz t1, 3f # if (block[i * 16]) + call ff_h264_idct_dc_add_\depth\()_c +3: + srli s3, s3, 1 + addi s5, s5, 4 + addi s6, s6, 16 * 2 << (\depth > 8) + bnez s1, 1b + + ld s7, 64(sp) + ld s6, 56(sp) + ld s5, 48(sp) + ld s4, 40(sp) + ld s3, 32(sp) + ld s2, 24(sp) + ld s1, 16(sp) + ld ra, 8(sp) + ld s0, 0(sp) + addi sp, sp, 80 + ret +endfunc .endr #endif