From patchwork Thu Mar 28 06:30:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1115959pzb; Wed, 27 Mar 2024 23:31:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8cIRUdRRXRbw2ZSDxuHahRKqDLZ1M0nOIUAbJ/8YYuKE1q0r4QnO3Gysh+gMwHoW3zTvkr5MglvJ9PxiLMNBk/TMpToBy13QpQA== X-Google-Smtp-Source: AGHT+IEuJ8Cp89S5USogzbDSNcJYtleHyqjy5Ep1PI2PFfoN3H//mvbhBS3aBhqwaTci1Huhgxp4 X-Received: by 2002:a17:906:556:b0:a48:56b2:da0a with SMTP id k22-20020a170906055600b00a4856b2da0amr864978eja.5.1711607468407; Wed, 27 Mar 2024 23:31:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711607468; cv=none; d=google.com; s=arc-20160816; b=Xs7Ho5hMWEcIecYKxZOIMb2OlkiEmPFRI6jdQnKrbTGwIJiT68geeHJ5wuHpfKc1Ji nRVUCOnc7yYz7zl0Pr2jIrlJiiW806I/rTatGJgoWvcoxxQ7EnLXZjMcmBJmCI5H1OqR OyN9VmegGWg55K7B0oIPnIxb/rjDG4oyvObYm9hxMp6Weo2sQEID31UrqLvuxjRfPIvn mNRSHm8XGWaMcfcditO8J/qnXKiyeD4LZbKo/A1UuJ0MnXYmHBl+x+ZRogllMSfLUgEb 3VAGiNuGCEo7idPCYTWiBZv0qUcLTmE6hF4c/MpSs/5UmmB+rG7EOszuMY6AZAKpFzyx yh6Q== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=D0EjBpxyFJYcF2aNFvG3dUVX7kXj9At+LRSVZgzaf48=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=pj0409GpcN62uBsHGtMEcFZw5ncvlnN+F/uOzAeS0Th5fTM0Bj8WafYELVRNLG4/ZF PBs3OMCTY9hp+F3nQ1uvXSTL8l3GBzHsaHMRgX1GzEXI33lgj08xAfujNx/iPoPyprBP 4p61EnSlyXarXdXA208j/AnlraEk8gt2hQxVMe+eYaLK0ta/XDG97g4c2Rx1TkdkszVz DcbwYjRY6BDNnESzaWpBC0+H6jyPa7jtm3ekc0IJhHOmt6K+yrL1ekyNt6y8Ag9yDKQ/ OuJMMb5YDEe95eYEYwCpw0CaacPhoBDPMTJp+7MOhDXtk2XHXPcw5ay8ZEDkTUeCgo/9 ApYw==; 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=igfvJETJ; 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 jt22-20020a170906ca1600b00a44a9139b09si389177ejb.299.2024.03.27.23.31.07; Wed, 27 Mar 2024 23:31:08 -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=igfvJETJ; 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 14B7068D681; Thu, 28 Mar 2024 08:31:04 +0200 (EET) 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 97D2268D22B for ; Thu, 28 Mar 2024 08:30:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1711607453; 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; bh=/dKIdTCs89/WLzUWGMVZGrtk8PlzWMclZr6aIWyssrY=; b=igfvJETJPQMGv7egaktyL+nFsuEA2/Bg7EqHqc7J9Sdeublm2DhnBL+DJi+s7nhP4YfUTJ jH5dkUFb35qN1jZ7HXdkDmikmaPQll933+sguR+c3zkxzFg4P7GNDjPE/ROtO65/6nr7Hk Z1KTJ3NSLzwAJnEFIko70tQzQPJ11Dg= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id f6ec0d82 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Thu, 28 Mar 2024 06:30:52 +0000 (UTC) Message-ID: <2a8c7482-df58-4324-9f6e-478b76cf2eb8@geoffhill.org> Date: Wed, 27 Mar 2024 23:30:52 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Geoff Hill To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] 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: 3OTOco7c9z5H Tested on AWS Graviton2 (t4g.medium), NixOS 23.11, GCC 12.3: float_to_fixed24_c: 2462.7 float_to_fixed24_neon: 513.5 Signed-off-by: Geoff Hill --- libavcodec/aarch64/Makefile | 2 ++ libavcodec/aarch64/ac3dsp_init_aarch64.c | 36 +++++++++++++++++++++++ libavcodec/aarch64/ac3dsp_neon.S | 37 ++++++++++++++++++++++++ libavcodec/ac3dsp.c | 4 ++- libavcodec/ac3dsp.h | 3 +- 5 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..5151b7510e 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -35,6 +35,8 @@ ARMV8-OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp.o # subsystems NEON-OBJS-$(CONFIG_AAC_DECODER) += aarch64/sbrdsp_neon.o +NEON-OBJS-$(CONFIG_AC3DSP) += aarch64/ac3dsp_init_aarch64.o \ + 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..77106ea586 --- /dev/null +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -0,0 +1,37 @@ +/* + * 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" + +// void ff_float_to_fixed24_neon(int32_t *dst, const float *src, unsigned int len) + +function ff_float_to_fixed24_neon, export=1 +0: 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 0b + 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);