From patchwork Fri Sep 23 23:19:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 38205 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp792089pzh; Fri, 23 Sep 2022 16:19:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6jrPBphnAuZkjoWwvnhRNm42pKyiiFF4b4E20qfNfed0/jDTRnVEFuD+3RWQ8UwxaIZRNH X-Received: by 2002:a17:906:3a15:b0:73d:80bf:542c with SMTP id z21-20020a1709063a1500b0073d80bf542cmr9223484eje.633.1663975185600; Fri, 23 Sep 2022 16:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663975185; cv=none; d=google.com; s=arc-20160816; b=AOynTcxntbKk4LnHV2qveXd7BFrrGgvpgUKAXkp2PilByLz/bly+fEcD2OqIor1TWg p7mcN0Q0ahhMxvJJgJdbodGMDf549KL7yPlFZqr3UKqyrSavJPVw5QmpcuqoUNGjUZws l82QixoehxWdJfbTiH57muLfwijqFv3dexxbYz5rDPwot7zYmJDnVFvF5EJpWbRxwv6G l3pPwZHLJQStlST0fT/1defcak+JEJYJZSL69dpEjZKYs73/GEQslBbfNpFp6HvARvdm JvWOljxdNqMzDPkrC/OET39sU3X+3Wo6G7KY6QmNh5j3VHk1mSgKRN7N1c4HFxW6D1Nh 5tkg== 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:references:in-reply-to:message-id:to:from:date :dkim-signature:delivered-to; bh=/Sky0ef2X/nLfl1lgutIkNvT+whHev3Wulxylu1Liys=; b=VfpS7ACvw4mGf2idLHaBRW5pdVpH7YdXU3q68WP6bVg7x0v9Be9mb5nd72po17vexa 6PYiYWf/ZPviPICo2/khBmXfxNX8zj9g3KCO1Ir8c94bq8wwdQMT+/G2jXTlhj3VTeBY ShpwigvKjycKZJZzWyurB+9IMq7OBAgMFpvXlLy+uOzlz0/YYit2xWImsuNBExKxlnLc fDsljp7TPQ2Ypvv19Om9KVAPUS1j4aiW6cIZPdSf+LL5LW9TwyMmCgHSJvQA9+ttDvSO MlTqRGogLqh9HPmRS2M9ltvcf+NWLrvi+Y+GW1mQgqH5oVcFAuAyklK9+Ocrs5Y1yWms BmOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=O3fpzz6G; 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 bx19-20020a170906a1d300b00780e1dc484esi8875677ejb.776.2022.09.23.16.19.45; Fri, 23 Sep 2022 16:19:45 -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=O3fpzz6G; 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 2D60868BBB3; Sat, 24 Sep 2022 02:19:43 +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 80AD468BB86 for ; Sat, 24 Sep 2022 02:19:36 +0300 (EEST) Received: from w3.tutanota.de (unknown [192.168.1.164]) by w4.tutanota.de (Postfix) with ESMTP id 36BA910600E8 for ; Fri, 23 Sep 2022 23:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1663975176; 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:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=r7WOyX1t2S++ciUFYJFICvISg1srXl2myuCKLUIKE2o=; b=O3fpzz6GaqoAITxKcYa4QHzZj7oFNorkmWRCmUBDW9gzzxeciP97Nk/lUNPmKhCa vTUzUCctT3sK05KWXZuebXXZWXFa+eeUXvPWGxM8VWp9lYkO/zdAVBVxwAoWZHw+wSO A72qj3C0E/1lxbr7qK+TbYx5rSh0seaob1J7l97ekVLOoH34U0vIE5RzoiZ0kXNNUfE /oKNi/iNzcBYbE6RWxGHvM8I8QCwmpzssFO7sFKOtHvFL6+apYsZRZhDcB271kTD8Km ipNHh+sek7VmLRKgcDY4vHsv2z27yWdYde7Sz/Ot+EN36GUwWvhtszFGHsw0DR1PCA3 iUuoR0vCPw== Date: Sat, 24 Sep 2022 01:19:36 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] twinvq: 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: oSQw0jHjlDFD Patch attached. From 685ac65ce0f391fd1d3a06e191c9659dacd375be Mon Sep 17 00:00:00 2001 From: Lynne Date: Sat, 24 Sep 2022 01:07:44 +0200 Subject: [PATCH 5/6] twinvq: convert to lavu/tx --- libavcodec/twinvq.c | 12 +++++++----- libavcodec/twinvq.h | 6 ++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index da10923d78..8cd3c91e14 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -328,7 +328,8 @@ static const uint8_t wtype_to_wsize[] = { 0, 0, 2, 2, 2, 1, 0, 1, 1 }; static void imdct_and_window(TwinVQContext *tctx, enum TwinVQFrameType ftype, int wtype, float *in, float *prev, int ch) { - FFTContext *mdct = &tctx->mdct_ctx[ftype]; + AVTXContext *tx = tctx->tx[ftype]; + av_tx_fn tx_fn = tctx->tx_fn[ftype]; const TwinVQModeTab *mtab = tctx->mtab; int bsize = mtab->size / mtab->fmode[ftype].sub; int size = mtab->size; @@ -357,7 +358,7 @@ static void imdct_and_window(TwinVQContext *tctx, enum TwinVQFrameType ftype, wsize = types_sizes[wtype_to_wsize[sub_wtype]]; - mdct->imdct_half(mdct, buf1 + bsize * j, in + bsize * j); + tx_fn(tx, buf1 + bsize * j, in + bsize * j, sizeof(float)); tctx->fdsp->vector_fmul_window(out2, prev_buf + (bsize - wsize) / 2, buf1 + bsize * j, @@ -543,8 +544,9 @@ static av_cold int init_mdct_win(TwinVQContext *tctx) for (i = 0; i < 3; i++) { int bsize = tctx->mtab->size / tctx->mtab->fmode[i].sub; - if ((ret = ff_mdct_init(&tctx->mdct_ctx[i], av_log2(bsize) + 1, 1, - -sqrt(norm / bsize) / (1 << 15)))) + const float scale = -sqrt(norm / bsize) / (1 << 15); + if ((ret = av_tx_init(&tctx->tx[i], &tctx->tx_fn[i], AV_TX_FLOAT_MDCT, + 1, bsize, &scale, 0))) return ret; } @@ -745,7 +747,7 @@ av_cold int ff_twinvq_decode_close(AVCodecContext *avctx) int i; for (i = 0; i < 3; i++) { - ff_mdct_end(&tctx->mdct_ctx[i]); + av_tx_uninit(&tctx->tx[i]); av_freep(&tctx->cos_tabs[i]); } diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h index b3c881cfac..72b9ba8198 100644 --- a/libavcodec/twinvq.h +++ b/libavcodec/twinvq.h @@ -25,10 +25,11 @@ #include #include +#include "libavutil/tx.h" #include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "avcodec.h" -#include "fft.h" +#include "internal.h" enum TwinVQCodec { TWINVQ_CODEC_VQF, @@ -136,7 +137,8 @@ typedef struct TwinVQModeTab { typedef struct TwinVQContext { AVCodecContext *avctx; AVFloatDSPContext *fdsp; - FFTContext mdct_ctx[3]; + AVTXContext *tx[3]; + av_tx_fn tx_fn[3]; const TwinVQModeTab *mtab; -- 2.37.2.609.g9ff673ca1a