From patchwork Sat Apr 6 14:25:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1559658pzd; Sat, 6 Apr 2024 07:26:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6qjPKAhmO1kL7LBvs2MF/IChqPn+sq2tajU4KBgcTeWQMpg78Y9T/crLxnqb2olC9Atwb9+WbrL/sBg2/IT+hew0uzaaSbwEe4A== X-Google-Smtp-Source: AGHT+IEQFzUvAxIb4U57di4WiQABs8ewPPHe/CR5g0wt2AW+LEPnVuzBhzDxFW3baD0mzErheVE+ X-Received: by 2002:aa7:c34e:0:b0:56e:36d9:265d with SMTP id j14-20020aa7c34e000000b0056e36d9265dmr2228816edr.4.1712413565796; Sat, 06 Apr 2024 07:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712413565; cv=none; d=google.com; s=arc-20160816; b=MDdjTYS/MhD1mREtJb6ykLhy+jLx/sOA1o7WEwjy7yoJZEdsr7TbLKs0WmfqNhFwtk J46l79RVVvRVL/d1huAw1ygyY6HC6rzrCHHuxCJW1wR1B7qB8i+afGgQENhAvZraBjU/ I7yPCD1tJ9jEi09BCWSVQF4jwxbLSlg1TpcsuzEnqykgJ7YJF8P0UBo0ZXvDR3FjmGT9 nkXfkG3DpyUv2ji+cZvZdmcJHJRWy56byCO4SpkPUgKkGPdIKvHe/BtODZLPfxRdqUyG mHTacnYNMt5MDD/8XY23GPITvDVymkVu1ytg6oW4fXRTsVXAWr28hF/WTlvuwsshCtnj O0Bg== 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:in-reply-to:content-language:references:to:from :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=o2/wsABVQl4bRliC7XRx5+grzfI7NPlVthn5jZ4XcMw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=tKy74q8oBTRqTL5Ba+WFHEiBXkIvChyljp+soSTrCtu4TCiWFZYOBIBlGnzL+xBieH Rz9nhwnr57tEUEiF1Eswx4cSf/6hfKprtsROqSen0EmjzqxgNsRgXjWMIkdXEn6qeSve jLUsYMoWzDByTwKV/SY0TOLyuA3mPYe5cho+yZBRExeR0MOeMa9AxMtaeD2mEgbFHQIf MnTNRpDaoFpbnqewHZYqPYqie5iI3Sl6zC59HJWoY6gzfv7nLeNYmkF8C69/rTeZICHH yRdexnZmns7yCBuYhySUT23YkUDo940EclyLErX8l1ah5Axqni/YJx1rWPXsFcpZaRa/ 29TA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@geoffhill.org header.s=20220510 header.b=ZE2MROO8; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=geoffhill.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s6-20020a508d06000000b0056e1de6b1e3si1832574eds.556.2024.04.06.07.26.05; Sat, 06 Apr 2024 07:26:05 -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; dkim=neutral (body hash did not verify) header.i=@geoffhill.org header.s=20220510 header.b=ZE2MROO8; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=geoffhill.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7615D68D068; Sat, 6 Apr 2024 17:26:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from riki.gfrh.net (riki.gfrh.net [52.40.11.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD23568C6E0 for ; Sat, 6 Apr 2024 17:25:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712413552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tBedIWBXHYvs5MzgLel/AConQYuCLBW64EDqwz5eafQ=; b=ZE2MROO8DkeGlSB5uVwlL5A28QWbe/GzO6ZEVXln70dMEK7Crz5FUzcPUwtihQYXu6oecW nsk/X7RWSxn+N9lQcROAWoqPfoPTmTInOK6ttE82seXimSqAda7CEbmZnYJ9Xa05fNA9Kj lDdOLUn4dFnjg4WJQE9uAcxEZiELyjA= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 56744642 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 6 Apr 2024 14:25:52 +0000 (UTC) Message-ID: Date: Sat, 6 Apr 2024 07:25:51 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Geoff Hill To: ffmpeg-devel@ffmpeg.org References: <51f7be0a-4267-47bf-ab0b-bd6585806da7@geoffhill.org> Content-Language: en-US In-Reply-To: <51f7be0a-4267-47bf-ab0b-bd6585806da7@geoffhill.org> Subject: [FFmpeg-devel] [PATCH v4 1/5] avcodec/ac3: Implement float_to_fixed24 for aarch64 NEON 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: OKaOStp8xj9t Signed-off-by: Geoff Hill --- libavcodec/aarch64/Makefile | 2 ++ libavcodec/aarch64/ac3dsp_init_aarch64.c | 36 ++++++++++++++++++++++++ libavcodec/aarch64/ac3dsp_neon.S | 36 ++++++++++++++++++++++++ libavcodec/ac3dsp.c | 4 ++- libavcodec/ac3dsp.h | 3 +- tests/checkasm/ac3dsp.c | 1 + 6 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 libavcodec/aarch64/ac3dsp_init_aarch64.c create mode 100644 libavcodec/aarch64/ac3dsp_neon.S diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index beb6a02f5f..95ad4dd202 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -1,4 +1,5 @@ # subsystems +OBJS-$(CONFIG_AC3DSP) += aarch64/ac3dsp_init_aarch64.o OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_init.o OBJS-$(CONFIG_H264CHROMA) += aarch64/h264chroma_init_aarch64.o OBJS-$(CONFIG_H264DSP) += aarch64/h264dsp_init_aarch64.o @@ -35,6 +36,7 @@ ARMV8-OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp.o # subsystems NEON-OBJS-$(CONFIG_AAC_DECODER) += aarch64/sbrdsp_neon.o +NEON-OBJS-$(CONFIG_AC3DSP) += aarch64/ac3dsp_neon.o NEON-OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_neon.o NEON-OBJS-$(CONFIG_H264CHROMA) += aarch64/h264cmc_neon.o NEON-OBJS-$(CONFIG_H264DSP) += aarch64/h264dsp_neon.o \ diff --git a/libavcodec/aarch64/ac3dsp_init_aarch64.c b/libavcodec/aarch64/ac3dsp_init_aarch64.c new file mode 100644 index 0000000000..e3320de0f5 --- /dev/null +++ b/libavcodec/aarch64/ac3dsp_init_aarch64.c @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024 Geoff Hill + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU 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 "libavutil/arm/cpu.h" +#include "libavutil/attributes.h" +#include "libavcodec/ac3dsp.h" +#include "config.h" + +void ff_float_to_fixed24_neon(int32_t *dst, const float *src, size_t len); + +av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) +{ + int cpu_flags = av_get_cpu_flags(); + if (!have_neon(cpu_flags)) return; + + c->float_to_fixed24 = ff_float_to_fixed24_neon; +} diff --git a/libavcodec/aarch64/ac3dsp_neon.S b/libavcodec/aarch64/ac3dsp_neon.S new file mode 100644 index 0000000000..c4d204b51a --- /dev/null +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2011 Mans Rullgard + * Copyright (c) 2024 Geoff Hill + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU 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 "libavutil/aarch64/asm.S" + +function ff_float_to_fixed24_neon, export=1 +1: ld1 {v0.4s, v1.4s}, [x1], #32 + fcvtzs v0.4s, v0.4s, #24 + ld1 {v2.4s, v3.4s}, [x1], #32 + fcvtzs v1.4s, v1.4s, #24 + fcvtzs v2.4s, v2.4s, #24 + st1 {v0.4s, v1.4s}, [x0], #32 + fcvtzs v3.4s, v3.4s, #24 + st1 {v2.4s, v3.4s}, [x0], #32 + subs w2, w2, #16 + b.ne 1b + ret +endfunc diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index 8397e03d32..730fa70fff 100644 --- a/libavcodec/ac3dsp.c +++ b/libavcodec/ac3dsp.c @@ -389,7 +389,9 @@ av_cold void ff_ac3dsp_init(AC3DSPContext *c) c->downmix = NULL; c->downmix_fixed = NULL; -#if ARCH_ARM +#if ARCH_AARCH64 + ff_ac3dsp_init_aarch64(c); +#elif ARCH_ARM ff_ac3dsp_init_arm(c); #elif ARCH_X86 ff_ac3dsp_init_x86(c); diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index ae33b361a9..b1b2bced8f 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -106,7 +106,8 @@ typedef struct AC3DSPContext { void (*downmix_fixed)(int32_t **samples, int16_t **matrix, int len); } AC3DSPContext; -void ff_ac3dsp_init (AC3DSPContext *c); +void ff_ac3dsp_init(AC3DSPContext *c); +void ff_ac3dsp_init_aarch64(AC3DSPContext *c); void ff_ac3dsp_init_arm(AC3DSPContext *c); void ff_ac3dsp_init_x86(AC3DSPContext *c); void ff_ac3dsp_init_mips(AC3DSPContext *c); diff --git a/tests/checkasm/ac3dsp.c b/tests/checkasm/ac3dsp.c index 344e1fe5c2..b1064fccb4 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS). + * Copyright (c) 2024 Geoff Hill * * This file is part of FFmpeg. *