From patchwork Sun May 12 10:55:13 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: 48811 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp520292pzb; Sun, 12 May 2024 03:55:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVQ3aO3yw7Ral2zgqiaskmrHeNM39MdwSjACaGHyqP9tBwPtGgH144qhRWhYsD351heCxqda/A96siBlSWuWAR3Jq+9fo6y1FsSMg== X-Google-Smtp-Source: AGHT+IFR3dHsyuqRZc3jWkBRlknQ4tq8y9DdD0Je5z8jmjYxCVv9LNHkHTMhFXJJBLA0TZyD9yvG X-Received: by 2002:a17:906:7110:b0:a59:a18e:3fd9 with SMTP id a640c23a62f3a-a5a2d54c365mr420844066b.5.1715511327736; Sun, 12 May 2024 03:55:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715511327; cv=none; d=google.com; s=arc-20160816; b=r5guOVvXEjAmfSnhJ69XL+Lq49mJt53vDYUomB0eFX5ZeT+hGq5v6pckglEMGQSRrz v1C84kKzW9+3eDmQMPv1a6H2ctA82vbloqGlMwWN5TlJRAgwEOjMZGpIEcY5SvZvBAuW hNPC9n3/62Vxh60FbWm2WxNLTDr5i7ijZwSG6aDvNlbn7aHSlYOBoo2cS+MC64Qe1Nxn SWhYHiKBPh6mWsMCDb+F0FMzEQ5MuiVBjGJ4YtOyX1dOqyOCGpY/cElxhCvsqzxo3uMD IDe/4bSdb9OjDmEK2MJZ5xzEbTTDev45UTtHuVWrcz+hTbBSQyqVMbA+TVWekbrcMTNZ msUA== 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=SMD7Clcg/q9IL5jCDGGNGbgR0rl0EY7qXmmAOorjumE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=oLNcCyPEcK6PvRVsAmSDZ+pqrGlEWpvkuA0OO9RwQOaumufjFP8PvTzSQB+p6Db0eG ErhMLtMmkIlqswWMnJ9nSE624V4T+izr26H0FaQx6p+VwpO3BA908eu4de/2wLAcXOQt vyIJIq8Ro4KPwqv1wVFgyrZY0ZfSYARoT9XgrfuRwuiULCLOvHTV7PpPYufYR66N74A3 C9NQ/Yxhp+f0rj/Qu3egok2b1ZfP4p6U3No/b7Z/LMiqZoGmc1KY/OU2F8DAxNE2eyUy 8EOpYVXA1f9MXMjYcutuv6h2LuUWEobcGU9ALAfzrV7XlpilT/a3ZA29RKQfCZ1cOxmr 1xFw==; 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-a5a1794666csi405112166b.8.2024.05.12.03.55.27; Sun, 12 May 2024 03:55:27 -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 BCE6768D618; Sun, 12 May 2024 13:55:23 +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 A2AE868D27C for ; Sun, 12 May 2024 13:55:16 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id D5596C006F for ; Sun, 12 May 2024 13:55:15 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 May 2024 13:55:13 +0300 Message-ID: <20240512105515.24624-1-remi@remlab.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/startcode: add R-V Zbb startcode_find_candidate 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: Vu4taCjxEGWG --- libavcodec/h264dsp.c | 2 + libavcodec/h264dsp.h | 2 + libavcodec/riscv/Makefile | 2 + libavcodec/riscv/h264dsp_init.c | 40 ++++++++++++++++ libavcodec/riscv/startcode_rvb.S | 81 ++++++++++++++++++++++++++++++++ libavcodec/riscv/vc1dsp_init.c | 7 ++- 6 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/h264dsp_init.c create mode 100644 libavcodec/riscv/startcode_rvb.S diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index 4d2ee10bab..1ba936be1c 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -158,6 +158,8 @@ av_cold void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc); #elif ARCH_PPC ff_h264dsp_init_ppc(c, bit_depth, chroma_format_idc); +#elif ARCH_RISCV + ff_h264dsp_init_riscv(c, bit_depth, chroma_format_idc); #elif ARCH_X86 ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc); #elif ARCH_MIPS diff --git a/libavcodec/h264dsp.h b/libavcodec/h264dsp.h index e0880c4d88..4a9cb1568d 100644 --- a/libavcodec/h264dsp.h +++ b/libavcodec/h264dsp.h @@ -125,6 +125,8 @@ void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc); void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth, const int chroma_format_idc); +void ff_h264dsp_init_riscv(H264DSPContext *c, const int bit_depth, + const int chroma_format_idc); void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, const int chroma_format_idc); void ff_h264dsp_init_mips(H264DSPContext *c, const int bit_depth, diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index f2348e259e..319ea6427b 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -28,6 +28,7 @@ OBJS-$(CONFIG_JPEG2000_DECODER) += riscv/jpeg2000dsp_init.o RVV-OBJS-$(CONFIG_JPEG2000_DECODER) += riscv/jpeg2000dsp_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 OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_init.o RVV-OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o @@ -51,6 +52,7 @@ OBJS-$(CONFIG_RV34DSP) += riscv/rv34dsp_init.o RVV-OBJS-$(CONFIG_RV34DSP) += riscv/rv34dsp_rvv.o OBJS-$(CONFIG_RV40_DECODER) += riscv/rv40dsp_init.o RVV-OBJS-$(CONFIG_RV40_DECODER) += riscv/rv40dsp_rvv.o +RV-OBJS-$(CONFIG_STARTCODE) += riscv/startcode_rvb.o OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_init.o RVV-OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_rvv.o OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_init.o diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c new file mode 100644 index 0000000000..60c84734cd --- /dev/null +++ b/libavcodec/riscv/h264dsp_init.c @@ -0,0 +1,40 @@ +/* + * Copyright © 2024 Rémi Denis-Courmont. + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavcodec/h264dsp.h" + +extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); + +av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, + const int chroma_format_idc) +{ +#if HAVE_RV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVB_BASIC) + dsp->startcode_find_candidate = ff_startcode_find_candidate_rvb; +#endif +} diff --git a/libavcodec/riscv/startcode_rvb.S b/libavcodec/riscv/startcode_rvb.S new file mode 100644 index 0000000000..25b888a8dd --- /dev/null +++ b/libavcodec/riscv/startcode_rvb.S @@ -0,0 +1,81 @@ +/* + * 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" + + .macro lx rd, addr +#if (__riscv_xlen == 32) + lw \rd, \addr +#elif (__riscv_xlen == 64) + ld \rd, \addr +#else + lq \rd, \addr +#endif + .endm + +func ff_startcode_find_candidate_rvb, zbb + add a1, a0, a1 + + // Potentially unaligned head + andi t0, a0, -(__riscv_xlen / 8) + beq a0, a1, 2f + + andi t1, a0, (__riscv_xlen / 8) - 1 + lx t2, (t0) + li t3, __riscv_xlen + slli t1, t1, 3 + orc.b t2, t2 + sub t3, t3, t1 + not t2, t2 + srl t2, t2, t1 + sll t2, t2, t1 + bnez t2, 4f + + // Main loop (including potentially short tail) + ble a1, t0, 2f + li t3, -1 +1: + lx t2, (__riscv_xlen / 8)(t0) + addi t0, t0, __riscv_xlen / 8 + orc.b t2, t2 + bne t2, t3, 3f // t2 != -1 iff (at least one) zero byte + bgt a1, t0, 1b + +2: // No zero byte found + sub a0, a1, a0 + ret + +3: // Zero byte found in main loop + not t2, t2 +4: // Zero byte found in head + ctz t2, t2 + srl t2, t2, 3 + add t0, t0, t2 + // Uncomment the following line for exact POSIX C strnlen() semantics. + //minu t0, t0, a1 // ignore zero byte in tail + sub a0, t0, a0 + ret +endfunc diff --git a/libavcodec/riscv/vc1dsp_init.c b/libavcodec/riscv/vc1dsp_init.c index e47b644f80..7868091978 100644 --- a/libavcodec/riscv/vc1dsp_init.c +++ b/libavcodec/riscv/vc1dsp_init.c @@ -29,12 +29,16 @@ void ff_vc1_inv_trans_8x8_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block void ff_vc1_inv_trans_4x8_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); void ff_vc1_inv_trans_8x4_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); void ff_vc1_inv_trans_4x4_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); +int ff_startcode_find_candidate_rvb(const uint8_t *, int); av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) { -#if HAVE_RVV +#if HAVE_RV int flags = av_get_cpu_flags(); + 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 && ff_get_rv_vlenb() >= 16) { dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_rvv; dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_rvv; @@ -43,5 +47,6 @@ av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_rvv; } } +# endif #endif } From patchwork Sun May 12 10:55:14 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: 48812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp520336pzb; Sun, 12 May 2024 03:55:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVTdb3Hp5R1UCETjHMUaKCwP8FTaONAlWuTGAG3UrEN5R+LvtDxnLB0RWKJkTN1aU/RAXdGXPJbzWrGemt6ZPpz7PnldHG6XDwlGA== X-Google-Smtp-Source: AGHT+IEfTvEIeS8/hclUsyvHGlhxYFJbXwM6wP6806AjZv/7F8hX85tA86MmO1+MZQk88MXXdiIp X-Received: by 2002:a05:6402:1497:b0:572:dfd8:f44a with SMTP id 4fb4d7f45d1cf-5734d5c17a1mr5324520a12.1.1715511338341; Sun, 12 May 2024 03:55:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715511338; cv=none; d=google.com; s=arc-20160816; b=u0mVH3d2x/SK57Z39dWHqaYellNtqVNZQ8jFBD4AvK9UDbXGZPHNl5rlpb+lVi3NvC WFNVpTkhjdM/GjT6C5QqOjrsMhj0nUTabmmmzKfJWUY/DG2zvdQM0tmj4ZB6ifKi/WC3 tSlmaAYHXW8MuiHQ1jIldZZP64dXSCS6sIHhurWURaMaMFWoYEt0cnlUisJ/sFfeBf30 KF4DFi8E5nPlu2WhaZPcmTuViivO+2dAn3x4QHZzA87T0ykLXDeOcvbtbzUnsGbojdqw xXxhe0SOvQ89pzUsNGW+2+vuHPSg5N+oawSjbESM8ZNtEM8aHRwoVM9BiBTumS3CFJGx ZfKA== 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=Ducm+pr9MDbWbHsOCjqyFl8nUJfg80xVhkWRjnRO+bQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=GZ7CNrskJHNiqJCHSEHZjG8+USqhfBf9ZjrR/8+x+KrJtSD9wP6WpIslBDGHb0mcua L/oged9W8psvfr6ZIBHGFSlHtFh8j6WphRTPOGpvwmWyVdqp6EDwvd16e3/O+ouPHb6R 1j05d/Rle6MTmhK+uy6UcPMFGZt9g7tlsJylzAFpT+Lc2oobCzdyl6MiKs/uGJahHDcC XXQhTpZ86koKQf1saWPxMqvSVYrLwCSzzAwn6tlOV7szjS9hyoJNE7P8slilPMr8BHyX HgJlh9zFe7ZvIJxN1iK8f5vmTnuSsce9Ojk0BuqeZtn/tq7k7XHEblTnDA6JZOOgsbdD hWwg==; 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 4fb4d7f45d1cf-5733c378d3dsi3838519a12.663.2024.05.12.03.55.37; Sun, 12 May 2024 03:55:38 -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 D371668D62A; Sun, 12 May 2024 13:55:24 +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 A593868D2D8 for ; Sun, 12 May 2024 13:55:16 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 14AEEC009A for ; Sun, 12 May 2024 13:55:16 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 May 2024 13:55:14 +0300 Message-ID: <20240512105515.24624-2-remi@remlab.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240512105515.24624-1-remi@remlab.net> References: <20240512105515.24624-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/startcode: add R-V V startcode_find_candidate 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: VWuFLgiJ8kLO --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/h264dsp_init.c | 3 +++ libavcodec/riscv/startcode_rvv.S | 44 ++++++++++++++++++++++++++++++++ libavcodec/riscv/vc1dsp_init.c | 16 +++++++----- 4 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 libavcodec/riscv/startcode_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 319ea6427b..1b52d60dbf 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -53,6 +53,7 @@ RVV-OBJS-$(CONFIG_RV34DSP) += riscv/rv34dsp_rvv.o OBJS-$(CONFIG_RV40_DECODER) += riscv/rv40dsp_init.o RVV-OBJS-$(CONFIG_RV40_DECODER) += riscv/rv40dsp_rvv.o RV-OBJS-$(CONFIG_STARTCODE) += riscv/startcode_rvb.o +RVV-OBJS-$(CONFIG_STARTCODE) += riscv/startcode_rvv.o OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_init.o RVV-OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_rvv.o OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_init.o diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 60c84734cd..d5984f1805 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -27,6 +27,7 @@ #include "libavcodec/h264dsp.h" extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); +extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, const int chroma_format_idc) @@ -36,5 +37,7 @@ 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 (flags & AV_CPU_FLAG_RVV_I32) + dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; #endif } diff --git a/libavcodec/riscv/startcode_rvv.S b/libavcodec/riscv/startcode_rvv.S new file mode 100644 index 0000000000..7c43b1d7f3 --- /dev/null +++ b/libavcodec/riscv/startcode_rvv.S @@ -0,0 +1,44 @@ +/* + * 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" + +func ff_startcode_find_candidate_rvv, zve32x + mv t0, a0 +1: + vsetvli t1, a1, e8, m8, ta, ma + vle8.v v8, (t0) + sub a1, a1, t1 + vmseq.vi v0, v8, 0 + vfirst.m t2, v0 + bgez t2, 2f + add t0, t0, t1 + bnez a1, 1b +2: + add t0, t0, t2 + sub a0, t0, a0 + ret +endfunc diff --git a/libavcodec/riscv/vc1dsp_init.c b/libavcodec/riscv/vc1dsp_init.c index 7868091978..03357e262b 100644 --- a/libavcodec/riscv/vc1dsp_init.c +++ b/libavcodec/riscv/vc1dsp_init.c @@ -30,6 +30,7 @@ void ff_vc1_inv_trans_4x8_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block void ff_vc1_inv_trans_8x4_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); void ff_vc1_inv_trans_4x4_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); int ff_startcode_find_candidate_rvb(const uint8_t *, int); +int ff_startcode_find_candidate_rvv(const uint8_t *, int); av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) { @@ -39,13 +40,16 @@ av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) 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 && ff_get_rv_vlenb() >= 16) { - dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_rvv; - dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_rvv; - if (flags & AV_CPU_FLAG_RVV_I64) { - dsp->vc1_inv_trans_8x8_dc = ff_vc1_inv_trans_8x8_dc_rvv; - dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_rvv; + if (flags & AV_CPU_FLAG_RVV_I32) { + if (ff_get_rv_vlenb() >= 16) { + dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_rvv; + dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_rvv; + if (flags & AV_CPU_FLAG_RVV_I64) { + dsp->vc1_inv_trans_8x8_dc = ff_vc1_inv_trans_8x8_dc_rvv; + dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_rvv; + } } + dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; } # endif #endif