From patchwork Sat Oct 29 06:34:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 39043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp1203091pzd; Fri, 28 Oct 2022 23:34:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4R1w79mVkW8hXYPtHQswocS0gX0v/tPav6gilpraL36xELIczoAqamdZo8cqBfgAJH7b6v X-Received: by 2002:a17:906:847b:b0:7a6:2ad9:298 with SMTP id hx27-20020a170906847b00b007a62ad90298mr2626888ejc.90.1667025293557; Fri, 28 Oct 2022 23:34:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667025293; cv=none; d=google.com; s=arc-20160816; b=OwGIiazShxuzt9w+dLXCzX+Ljwb27CdHOxcemdisqXN9SJMEebgEMOijwVlc6HSZtZ wo8pCT6RnOuHAD6eb26w/G9zbaWwL9hWQi/cl4FN664NIFtsHXW8uF+YdJQh7zGXKfXC f7A4s2ZiDm9ripa8XBWNWjHiyaI6DhSGBCtxu9RBqdpKN5WU0mrIJ3AUNVLyLDXiTH9u lE/eW53sqXVC/DXlYezNTYmi6hgyhUR0sAWIzZotfOh5Sqe8XuEOWRiljbqOcPwH0DGU 9vYtLbRw5jwiPmz1LgLdanG1olvxNpYgMMUR5Ze6qPKc1zz0oAQVvz7PzDXRU5GoBmLJ NQEw== 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=WS/h5X91U2Ksqo73pHZgz7jmn5jH0P2V+KpuZ/S42WQ=; b=TS0UqttkLBeb2D3KZUS9LOLxAYfx1AMXXFgJ+MYU8+e7lvC0Ix6J7Sb7TKAwGifGcG qMglEe+lhm+WxR2ni78o3qi2oUKlyyv5qKZYLw+aVL7vs8AoDvyod4m/pVIKQ3orrvv3 YOjeNxkxDC4Amn2hB25bkZdxzkr+HzEGNbAbmL1YPZfiCLd0ZjjN66lxTGxTqGoCUaty BNmojRSqFHqlD+GkY/ZAwPjag6qg6MchuwjuFQwMSBccs2Y6Z4iDyrugZfEbn6s/wf6e rfYjJ7xJcF5VcMvXs42wA6D8/No4wBwH7H3+WOKjmfTbqqPJaBdxUnwBGBoA3jm2c+5i fVlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=wLRk76Kd; 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 y15-20020a50e60f000000b0046178c62b6asi819575edm.477.2022.10.28.23.34.52; Fri, 28 Oct 2022 23:34:53 -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=wLRk76Kd; 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 38E8168BD2C; Sat, 29 Oct 2022 09:34:48 +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 413ED68BBA5 for ; Sat, 29 Oct 2022 09:34:42 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 8BDD91060154 for ; Sat, 29 Oct 2022 06:34:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1667025281; 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=XfdPquoXfGz0enHVd5iiWIWnJfBgo6KmFtOrTkBpb6A=; b=wLRk76KdRVRX09D7h7+VGgsP5TRsTZ2GM0JsG4PS11Zx+7UMsJ5vQIayyNBdRZDV NetC0e9NLd4Sgt6AmrcvJYttXzeE1LKIjf5jIVZMsh2NGz0FnZ00jj172TFgBievouc 8gQjV09jEEFWbBd07xQZKIaOyCCTSE9Q3/L9jWePOdFohnzOzHrVriw+7v05Yal+2ko vtlq5JSoeLwlm2DipbReWM21FcIsYGEu/SmwObLlaH8f2Zp7UjszKTB/uDWjBikYFx1 BskJOjc/2l84P6XG1NI2kc6fnkEqyCB4+EejO5VYYP7meFmWbrGbJ1AkIeuv+ljGNQ/ hoZmRsfybw== Date: Sat, 29 Oct 2022 08:34:41 +0200 (CEST) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] vorbisdec: convert to lavu/tx 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: 1QK9Gj+dmYel This also fixes not checking the return values on transform init. Total decoder speedup on Zen 3: 9% Patch attached. From efe3006093cd80182b293f01aa98fb75733a8188 Mon Sep 17 00:00:00 2001 From: Lynne Date: Sat, 29 Oct 2022 08:30:56 +0200 Subject: [PATCH] vorbisdec: convert to lavu/tx This also fixes not checking the return values on transform init. Total decoder speedup on Zen 3: 9% --- libavcodec/vorbisdec.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 715a7f7d03..dd856a6dfe 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -31,12 +31,12 @@ #include "libavutil/avassert.h" #include "libavutil/float_dsp.h" +#include "libavutil/tx.h" #define BITSTREAM_READER_LE #include "avcodec.h" #include "codec_internal.h" #include "decode.h" -#include "fft.h" #include "get_bits.h" #include "vorbis.h" #include "vorbisdsp.h" @@ -130,7 +130,9 @@ typedef struct vorbis_context_s { VorbisDSPContext dsp; AVFloatDSPContext *fdsp; - FFTContext mdct[2]; + AVTXContext *mdct[2]; + av_tx_fn mdct_fn[2]; + uint8_t first_frame; int64_t initial_pts; uint32_t version; @@ -202,8 +204,8 @@ static void vorbis_free(vorbis_context *vc) av_freep(&vc->residues); av_freep(&vc->modes); - ff_mdct_end(&vc->mdct[0]); - ff_mdct_end(&vc->mdct[1]); + av_tx_uninit(&vc->mdct[0]); + av_tx_uninit(&vc->mdct[1]); if (vc->codebooks) for (i = 0; i < vc->codebook_count; ++i) { @@ -964,6 +966,8 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) { GetBitContext *gb = &vc->gb; unsigned bl0, bl1; + float scale = -1.0; + int ret; if ((get_bits(gb, 8) != 'v') || (get_bits(gb, 8) != 'o') || (get_bits(gb, 8) != 'r') || (get_bits(gb, 8) != 'b') || @@ -1009,8 +1013,16 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) vc->previous_window = -1; - ff_mdct_init(&vc->mdct[0], bl0, 1, -1.0); - ff_mdct_init(&vc->mdct[1], bl1, 1, -1.0); + ret = av_tx_init(&vc->mdct[0], &vc->mdct_fn[0], AV_TX_FLOAT_MDCT, 1, + vc->blocksize[0] >> 1, &scale, 0); + if (ret < 0) + return ret; + + ret = av_tx_init(&vc->mdct[1], &vc->mdct_fn[1], AV_TX_FLOAT_MDCT, 1, + vc->blocksize[1] >> 1, &scale, 0); + if (ret < 0) + return ret; + vc->fdsp = avpriv_float_dsp_alloc(vc->avctx->flags & AV_CODEC_FLAG_BITEXACT); if (!vc->fdsp) return AVERROR(ENOMEM); @@ -1585,7 +1597,8 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr) { GetBitContext *gb = &vc->gb; - FFTContext *mdct; + AVTXContext *mdct; + av_tx_fn mdct_fn; int previous_window = vc->previous_window; unsigned mode_number, blockflag, blocksize; int i, j; @@ -1707,12 +1720,13 @@ static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr) // Dotproduct, MDCT - mdct = &vc->mdct[blockflag]; + mdct = vc->mdct[blockflag]; + mdct_fn = vc->mdct_fn[blockflag]; for (j = vc->audio_channels-1;j >= 0; j--) { ch_res_ptr = vc->channel_residues + res_chan[j] * blocksize / 2; vc->fdsp->vector_fmul(floor_ptr[j], floor_ptr[j], ch_res_ptr, blocksize / 2); - mdct->imdct_half(mdct, ch_res_ptr, floor_ptr[j]); + mdct_fn(mdct, ch_res_ptr, floor_ptr[j], sizeof(float)); } // Overlap/add, save data for next overlapping -- 2.37.2.609.g9ff673ca1a