From patchwork Mon Oct 2 16:47:37 2023 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: 44099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp1527953pzf; Mon, 2 Oct 2023 09:48:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHoymI4YBUUJzOsI1ngy0AME/FwuKFkf8zrej8CdWPtpNRJwbWYsi+/9RkjIbIY+B2ZfxPV X-Received: by 2002:a05:6402:1257:b0:530:77e6:849f with SMTP id l23-20020a056402125700b0053077e6849fmr10858023edw.27.1696265281443; Mon, 02 Oct 2023 09:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696265281; cv=none; d=google.com; s=arc-20160816; b=WoQU8pvtC6giDSFula/8NaanffU44eFW3NLakWzjrhyFmYOq2HwKUCO30UjFQRXqpg iGZzIAA9hDRiY+pXl/ClELzIMHCJAD2YzTOHLqMj7HTELLtJgeeaNdQ1VAku16V+d/Pz XQ2dvqLp8VVHqdl7vZ03v69D0wZu0MF921vB5hfW9jV/iT7RbTeWipLbiiz5Tj9Fn7TJ 5Fb4a56ErHbY8Y22RMQhr7IlLnhhmNN3u03/hDuxkn8mxCYWmuxDUrG0lq493r+seYVb Oc1IiOuQrYP6TW0OKLQ4YpATH0iIla1mM0M2BGroyxme4fHKFoJcign+su5GWX/A4uo0 hqcQ== 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=pGu5My7E+rfy46Z8zTyX87vs+OsG/W3m6I/xA+XXBlo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hGNC5gq7luwSFgf80zJDpxPp2sIk+J4c3M9TYasDMs2QeB7rXTNa9YIbo1/bIV/8pc hoh8DArNIxFQsVl7ezxXBRt80g5QFMGwfq05GS64h+LbpHUw701ARmmmMAwpxLunUn6x wb2lw00Fd1ePt9hSmRrVmMEws0HywJgbUrnXtK5O1KrOk/OnGyxb4UrsZwV5ZE8yncUc kZE9NXEqfvkNnGlz5AYAlYsavRHRE7NGViJBcmEXGUlveCY4U6tXkaHyRCUds0vl7s70 ybr5uOj4fK5NI3dKxyfnQnCFq6fQ8B2CvKy5MqsABLD+BQD8XBZZ8+sIQnCtMWb1vED4 pBgg== 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 f15-20020a056402150f00b00534658e5a04si8595928edw.406.2023.10.02.09.47.50; Mon, 02 Oct 2023 09:48:01 -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 C229D68CC6A; Mon, 2 Oct 2023 19:47:46 +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 9E0B868CB2A for ; Mon, 2 Oct 2023 19:47:39 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 0DA07C0069 for ; Mon, 2 Oct 2023 19:47:39 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Oct 2023 19:47:37 +0300 Message-ID: <20231002164738.33752-1-remi@remlab.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/ac3: add R-V Zbb extract_exponents 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: Gel0beAzNamW --- libavcodec/ac3dsp.c | 2 ++ libavcodec/ac3dsp.h | 1 + libavcodec/riscv/Makefile | 2 ++ libavcodec/riscv/ac3dsp_init.c | 38 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/ac3dsp_rvb.S | 38 ++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 libavcodec/riscv/ac3dsp_init.c create mode 100644 libavcodec/riscv/ac3dsp_rvb.S diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index 22cb5f242e..302b786b15 100644 --- a/libavcodec/ac3dsp.c +++ b/libavcodec/ac3dsp.c @@ -395,5 +395,7 @@ av_cold void ff_ac3dsp_init(AC3DSPContext *c) ff_ac3dsp_init_x86(c); #elif ARCH_MIPS ff_ac3dsp_init_mips(c); +#elif ARCH_RISCV + ff_ac3dsp_init_riscv(c); #endif } diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index 33e51e202e..a01bff3d11 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -109,6 +109,7 @@ void ff_ac3dsp_init (AC3DSPContext *c); void ff_ac3dsp_init_arm(AC3DSPContext *c); void ff_ac3dsp_init_x86(AC3DSPContext *c); void ff_ac3dsp_init_mips(AC3DSPContext *c); +void ff_ac3dsp_init_riscv(AC3DSPContext *c); void ff_ac3dsp_downmix(AC3DSPContext *c, float **samples, float **matrix, int out_ch, int in_ch, int len); diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 77bba7f784..cc9c13e6b6 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -1,5 +1,7 @@ OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o +OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o \ + riscv/ac3dsp_rvb.o OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o RVV-OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_rvv.o OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \ diff --git a/libavcodec/riscv/ac3dsp_init.c b/libavcodec/riscv/ac3dsp_init.c new file mode 100644 index 0000000000..20f294f1de --- /dev/null +++ b/libavcodec/riscv/ac3dsp_init.c @@ -0,0 +1,38 @@ +/* + * Copyright © 2023 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 + +#include "config.h" +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavcodec/ac3dsp.h" + +void ff_extract_exponents_rvb(uint8_t *exp, int32_t *coef, int nb_coefs); + +av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c) +{ + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVB_ADDR) { + if (flags & AV_CPU_FLAG_RVB_BASIC) + c->extract_exponents = ff_extract_exponents_rvb; + } +} diff --git a/libavcodec/riscv/ac3dsp_rvb.S b/libavcodec/riscv/ac3dsp_rvb.S new file mode 100644 index 0000000000..48f8bb101e --- /dev/null +++ b/libavcodec/riscv/ac3dsp_rvb.S @@ -0,0 +1,38 @@ +/* + * Copyright © 2023 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 "libavutil/riscv/asm.S" + +func ff_extract_exponents_rvb, zbb +1: + lw t0, (a1) + addi a0, a0, 1 + neg t1, t0 + addi a1, a1, 4 + max t0, t0, t1 + addi a2, a2, -1 + clz t0, t0 + addi t0, t0, 24 - __riscv_xlen + sb t0, -1(a0) + bgtz a2, 1b + + ret +endfunc