From patchwork Wed Apr 24 08:54:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 48245 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:2d06:b0:1a9:af23:56c1 with SMTP id tw6csp513090pzb; Wed, 24 Apr 2024 01:54:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUUTQa9lqpzNzGoODCo3sm3wNDePfxxQaPI569AtEK5zoVtHqlR4MDt3IUPb0SkTOR1fypbqeHEvsry3vtiGmXSu+Fxx30RnkeL6w== X-Google-Smtp-Source: AGHT+IHHUCLBjGM0Zb3JhKNRjBSV9G5KWPE+l/SLSv3dqbLx9wJYsitqrYB3gk1iU1UatAAK29+u X-Received: by 2002:a50:c34a:0:b0:570:5b37:5bd5 with SMTP id q10-20020a50c34a000000b005705b375bd5mr1216922edb.4.1713948890013; Wed, 24 Apr 2024 01:54:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713948889; cv=none; d=google.com; s=arc-20160816; b=Ohs6xfPUuks3xkM+HOGVNI9fyao6mUpunOvfqm8jpLZ5kd+EjRITH7tw+uqwjS2GvH 86gOngk/7JhwPn0eVFXIAItNszhlpf7g38Qjn/pIuBffbvcva+x3/yjbve7IvnfFhhVw zfrSgaWgmQN6C1+q08HjIk9fgueqvdsMnic2avg3F4NrQ4BXoYwARnLNPHtTADdCxAGc fObZMzdzRp33sOAGQhyJqK1vcqViUcjPNeCsIrkgwUP2i87+/8B0Nur3h4upm4EA6BmW IjMAXFCwg88Us+N2Gud7je6pbzvqMmuYq0EzdeTKOLNY1ItEf8ln1xJlYx81UI4plDLn znlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:dkim-signature:delivered-to; bh=Sz5vk33tA/NyyBaoqVmmeAbnXi3Ls5FRhys4++YjFuQ=; fh=Q46kXK7oI5D1Jhi90JBr53c7NIaTxGaU4KPeRZyM/hI=; b=fEuogdoUR/ql/jA9gsjlQW56smWItfMWUMT6rZuXpanpHgyYbxtOrrCfssswrVXCRW eREM1/TyxyTXUyup9P+JzSGR9eBdgT4TkvoXS5HUWzkH6KQawz9V4Gl+pCVYrrZIGQu+ PG+aG5kRYwJHFBpu5zPumJ2EQZpTjy5O8MlaguWGsKBQweEkAOQ7IZDyR9/3vYtep0Ve ffMrWcwJfffccYl5EFAOTJVJ/VbkkCKX6Gc8GmL4wHhSi+SSyMoz4bMeLlZuMVc2VInn EmVz7qVZwCHfIvwy5EhvpQ2FWa0177ykanK0aYJOSmYWdD7UPfGo+W2m4jQDcB9c08DX u3Rw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=fCBFmt6A; 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=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m29-20020a50999d000000b0056dc9379f51si8261744edb.546.2024.04.24.01.54.49; Wed, 24 Apr 2024 01:54:49 -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=@lynne.ee header.s=s1 header.b=fCBFmt6A; 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=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 11BC768D414; Wed, 24 Apr 2024 11:54:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAEEE68D37F for ; Wed, 24 Apr 2024 11:54:38 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 516021060170 for ; Wed, 24 Apr 2024 08:54:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1713948877; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=BTlVKWXIzMvRdwx5NMbeOPDK4hJ65y1JnMWx3fFIZcI=; b=fCBFmt6A8VqXwHoEj938KhqkgWyFO6AulyxfdtXYf+8KAjarh/1CA0eLLm9JNNFe e5Zjw/mbDhDVPhoTLa25mBlrnVLpVnd3F1bvaYVGz6mdFjY1w8lzuQn5K66MoHBJXnr CFo6dn+rLiD1UZT8eGQfryObUKZPGqoltGoJdR1x6t1Txbxrj69jAXV0SAJ/BzGI2H4 uOjr1fCcc3A3Wl1TyG4yVoLHcf7BntLosY2eHfI84eYvb3KqkKYuVzevVIRUg55eibV MrcslRfu0rPK01quiNbO/UaYORLH94KEzkrqyctZVVdXTe+A3gGQER2NiaLOGHaBagp 4GnsTbq+dg== Date: Wed, 24 Apr 2024 10:54:37 +0200 (CEST) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] opusdsp: add ability to modify deemphasis constant 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: DPXq/czsX9Zr xHE-AAC relies on the same postfilter mechanism that Opus uses to improve clarity (albeit with a steeper deemphasis filter). The code to apply it is identical, it's still just a simple IIR low-pass filter. This commit makes it possible to use alternative constants. Version 2 changes: Move the deemphasis constant table to opustab.c and document its values better. From e6d0621f61bb39929548cab5fa047c1827e1ab8c Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 29 Jan 2024 04:31:43 +0100 Subject: [PATCH v2] opusdsp: add ability to modify deemphasis constant xHE-AAC relies on the same postfilter mechanism that Opus uses to improve clarity (albeit with a steeper deemphasis filter). The code to apply it is identical, it's still just a simple IIR low-pass filter. This commit makes it possible to use alternative constants. --- libavcodec/aarch64/opusdsp_init.c | 2 +- libavcodec/aarch64/opusdsp_neon.S | 28 +++++----------------------- libavcodec/opusdec_celt.c | 6 ++++-- libavcodec/opusdsp.c | 6 ++++-- libavcodec/opusdsp.h | 4 +--- libavcodec/opustab.c | 28 ++++++++++++++++++++++++++++ libavcodec/opustab.h | 2 ++ libavcodec/x86/opusdsp.asm | 9 +++------ libavcodec/x86/opusdsp_init.c | 2 +- 9 files changed, 49 insertions(+), 38 deletions(-) diff --git a/libavcodec/aarch64/opusdsp_init.c b/libavcodec/aarch64/opusdsp_init.c index bb6d71b66b..a727006593 100644 --- a/libavcodec/aarch64/opusdsp_init.c +++ b/libavcodec/aarch64/opusdsp_init.c @@ -23,7 +23,7 @@ #include "libavcodec/opusdsp.h" void ff_opus_postfilter_neon(float *data, int period, float *gains, int len); -float ff_opus_deemphasis_neon(float *out, float *in, float coeff, int len); +float ff_opus_deemphasis_neon(float *out, float *in, float coeff, const float *weights, int len); av_cold void ff_opus_dsp_init_aarch64(OpusDSP *ctx) { diff --git a/libavcodec/aarch64/opusdsp_neon.S b/libavcodec/aarch64/opusdsp_neon.S index e933151ab4..253825aa61 100644 --- a/libavcodec/aarch64/opusdsp_neon.S +++ b/libavcodec/aarch64/opusdsp_neon.S @@ -18,29 +18,11 @@ #include "libavutil/aarch64/asm.S" - // 0.85..^1 0.85..^2 0.85..^3 0.85..^4 -const tab_st, align=4 - .word 0x3f599a00, 0x3f38f671, 0x3f1d382a, 0x3f05a32f -endconst -const tab_x0, align=4 - .word 0x0, 0x3f599a00, 0x3f38f671, 0x3f1d382a -endconst -const tab_x1, align=4 - .word 0x0, 0x0, 0x3f599a00, 0x3f38f671 -endconst -const tab_x2, align=4 - .word 0x0, 0x0, 0x0, 0x3f599a00 -endconst - function ff_opus_deemphasis_neon, export=1 - movrel x4, tab_st - ld1 {v4.4s}, [x4] - movrel x4, tab_x0 - ld1 {v5.4s}, [x4] - movrel x4, tab_x1 - ld1 {v6.4s}, [x4] - movrel x4, tab_x2 - ld1 {v7.4s}, [x4] + ld1 {v4.4s}, [x2], #16 + ld1 {v5.4s}, [x2], #16 + ld1 {v6.4s}, [x2], #16 + ld1 {v7.4s}, [x2] fmul v0.4s, v4.4s, v0.s[0] @@ -63,7 +45,7 @@ function ff_opus_deemphasis_neon, export=1 st1 {v1.4s, v2.4s}, [x0], #32 fmul v0.4s, v4.4s, v2.s[3] - subs w2, w2, #8 + subs w3, w3, #8 b.gt 1b mov s0, v2.s[3] diff --git a/libavcodec/opusdec_celt.c b/libavcodec/opusdec_celt.c index fd8e9929e9..b19342337d 100644 --- a/libavcodec/opusdec_celt.c +++ b/libavcodec/opusdec_celt.c @@ -460,7 +460,9 @@ int ff_celt_decode_frame(CeltFrame *f, OpusRangeCoder *rc, /* deemphasis */ block->emph_coeff = f->opusdsp.deemphasis(output[i], &block->buf[1024 - frame_size], - block->emph_coeff, frame_size); + block->emph_coeff, + ff_opus_deemph_weights, + frame_size); } if (channels == 1) @@ -516,7 +518,7 @@ void ff_celt_flush(CeltFrame *f) * a lesser discontinuity when seeking. * The deemphasis functions differ from libopus in that they require * an initial state divided by the coefficient. */ - block->emph_coeff = 0.0f / CELT_EMPH_COEFF; + block->emph_coeff = 0.0f / ff_opus_deemph_weights[0]; } f->seed = 0; diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c index 0764d712e4..e61cc36098 100644 --- a/libavcodec/opusdsp.c +++ b/libavcodec/opusdsp.c @@ -18,6 +18,7 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/mem_internal.h" #include "opusdsp.h" static void postfilter_c(float *data, int period, float *gains, int len) @@ -43,10 +44,11 @@ static void postfilter_c(float *data, int period, float *gains, int len) } } -static float deemphasis_c(float *y, float *x, float coeff, int len) +static float deemphasis_c(float *y, float *x, float coeff, const float *weights, int len) { + const float c = weights[0]; for (int i = 0; i < len; i++) - coeff = y[i] = x[i] + coeff*CELT_EMPH_COEFF; + coeff = y[i] = x[i] + coeff*c; return coeff; } diff --git a/libavcodec/opusdsp.h b/libavcodec/opusdsp.h index c2a301e832..9d93336cfe 100644 --- a/libavcodec/opusdsp.h +++ b/libavcodec/opusdsp.h @@ -19,11 +19,9 @@ #ifndef AVCODEC_OPUSDSP_H #define AVCODEC_OPUSDSP_H -#define CELT_EMPH_COEFF 0.8500061035f - typedef struct OpusDSP { void (*postfilter)(float *data, int period, float *gains, int len); - float (*deemphasis)(float *out, float *in, float coeff, int len); + float (*deemphasis)(float *out, float *in, float coeff, const float *weights, int len); } OpusDSP; void ff_opus_dsp_init(OpusDSP *ctx); diff --git a/libavcodec/opustab.c b/libavcodec/opustab.c index 2a57511177..47624fe651 100644 --- a/libavcodec/opustab.c +++ b/libavcodec/opustab.c @@ -1159,3 +1159,31 @@ const uint32_t * const ff_celt_pvq_u_row[15] = { celt_pvq_u + 1207, celt_pvq_u + 1226, celt_pvq_u + 1240, celt_pvq_u + 1248, celt_pvq_u + 1254, celt_pvq_u + 1257 }; + +/* Deemphasis constant (alpha_p), as specified in RFC6716 as 0.8500061035. + * libopus uses a slighly rounded constant, set to 0.85 exactly, + * to simplify its fixed-point version, but it's not significant to impact + * compliance. */ +#define CELT_EMPH_COEFF 0.8500061035f + +DECLARE_ALIGNED(16, const float, ff_opus_deemph_weights)[] = { + CELT_EMPH_COEFF, + CELT_EMPH_COEFF*CELT_EMPH_COEFF, + CELT_EMPH_COEFF*CELT_EMPH_COEFF*CELT_EMPH_COEFF, + CELT_EMPH_COEFF*CELT_EMPH_COEFF*CELT_EMPH_COEFF*CELT_EMPH_COEFF, + + 0, + CELT_EMPH_COEFF, + CELT_EMPH_COEFF*CELT_EMPH_COEFF, + CELT_EMPH_COEFF*CELT_EMPH_COEFF*CELT_EMPH_COEFF, + + 0, + 0, + CELT_EMPH_COEFF, + CELT_EMPH_COEFF*CELT_EMPH_COEFF, + + 0, + 0, + 0, + CELT_EMPH_COEFF, +}; diff --git a/libavcodec/opustab.h b/libavcodec/opustab.h index 9c9f1b9d98..57e546aef5 100644 --- a/libavcodec/opustab.h +++ b/libavcodec/opustab.h @@ -161,6 +161,8 @@ extern const float ff_celt_window2[120]; extern const float ff_celt_window_padded[]; static const float *const ff_celt_window = &ff_celt_window_padded[8]; +extern const float ff_opus_deemph_weights[]; + extern const uint32_t * const ff_celt_pvq_u_row[15]; FF_VISIBILITY_POP_HIDDEN diff --git a/libavcodec/x86/opusdsp.asm b/libavcodec/x86/opusdsp.asm index 418cc16330..635f59f83c 100644 --- a/libavcodec/x86/opusdsp.asm +++ b/libavcodec/x86/opusdsp.asm @@ -22,16 +22,13 @@ SECTION_RODATA - ; 0.85..^1 0.85..^2 0.85..^3 0.85..^4 -tab_st: dd 0x3f599a00, 0x3f38f671, 0x3f1d382a, 0x3f05a32f - SECTION .text INIT_XMM fma3 %if UNIX64 -cglobal opus_deemphasis, 3, 3, 8, out, in, len +cglobal opus_deemphasis, 4, 4, 8, out, in, weights, len %else -cglobal opus_deemphasis, 4, 4, 8, out, in, coeff, len +cglobal opus_deemphasis, 5, 5, 8, out, in, coeff, weights, len %endif %if ARCH_X86_32 VBROADCASTSS m0, coeffm @@ -41,7 +38,7 @@ cglobal opus_deemphasis, 4, 4, 8, out, in, coeff, len shufps m0, m0, 0 %endif - movaps m4, [tab_st] + movaps m4, [weightsq] VBROADCASTSS m5, m4 shufps m6, m4, m4, q1111 shufps m7, m4, m4, q2222 diff --git a/libavcodec/x86/opusdsp_init.c b/libavcodec/x86/opusdsp_init.c index 582fbb4f0c..66d6839589 100644 --- a/libavcodec/x86/opusdsp_init.c +++ b/libavcodec/x86/opusdsp_init.c @@ -23,7 +23,7 @@ #include "libavcodec/opusdsp.h" void ff_opus_postfilter_fma3(float *data, int period, float *gains, int len); -float ff_opus_deemphasis_fma3(float *out, float *in, float coeff, int len); +float ff_opus_deemphasis_fma3(float *out, float *in, float coeff, const float *weights, int len); av_cold void ff_opus_dsp_init_x86(OpusDSP *ctx) { -- 2.43.0.381.gb435a96ce8