From patchwork Wed Jul 26 07:30:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 42988 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp346468pzd; Wed, 26 Jul 2023 00:30:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlHkw00zr5pEbySQNV8aV0oU3pP1nY3gV2MQCKzo0ipKPtde98xeXLNQwLc1GgTldeV4vokc X-Received: by 2002:a17:906:10cd:b0:99b:cc09:711e with SMTP id v13-20020a17090610cd00b0099bcc09711emr307901ejv.23.1690356623716; Wed, 26 Jul 2023 00:30:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690356623; cv=none; d=google.com; s=arc-20160816; b=SRzsaSSmIP2p65XEWWp1zGZt7/0CyDmaV6JRCWbILBG2vVmPJQkXhcCm1v8x7HyfVH mRArbHmn79zEf4ugshPCeQH5s7RAbI3SyT3egYJzvaG6XsSRJXLtcuAmVMQrVBjDmP5Z Xj1G5dQw2U3e3rBPLXrzNYGj8KDkThoPvSAEf25Y/A3GlHqbIs4DktJ9CqAjEjf+FGkL l4i3FqPn/ebl/ICg81kZg/L3qG1l2vPDy0t4oPnTiZDj7NDgYsVcDukEYrtPcqPJmZeX K0kniActnKkQDfpLA7YuvkHexDd5WuOvLkz2d3AMrrqhRXpuFd/1I1p16mi79avtthoK QtLQ== 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=llQF+LxebS3fsxWjpDp2Iy1HtXghrDytqmDwS0gMI60=; fh=awftJPkKIDcYG+GZSKK7EGrS2s4rqD3QuLTgwd5DXmc=; b=mmlkxQbd3+xs5R75qed2WSvPgVq1db7h+uO0n9w4kaPODL18tq+AjzijNiuTSjAWh+ kKIvT4I1OC3DXEwilKhMbZNsN6z0nFU/XBjNkOTwlyBYtzoFMoZh6hUl9RFE1cjxbWRA CddrS9oj4y6lWiQEMmOqm5aTBzrZQAdz1NyhiQ0ODRuy7r7JcxJrjC7JfZtnQzKsqVCW kuEDRlVoBSaWeDP7vTaOaA9woeJ21LkMj/KHOuSuvwey35Bama+XkHxdYfOzLFseHzOr QQQpW4xzqDgevLjtaxhB64d0W7aawzJSnqGHVPSdLfB0lrV5kvYr/CmzqfnivD8ImMEG Q70Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=OVTSgbnd; 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 xa19-20020a170907b9d300b00996e0a8a2dfsi9415222ejc.78.2023.07.26.00.30.23; Wed, 26 Jul 2023 00:30:23 -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=OVTSgbnd; 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 49A4B68C926; Wed, 26 Jul 2023 10:30:21 +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 0D73968C8E6 for ; Wed, 26 Jul 2023 10:30:15 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 49C6E1060122 for ; Wed, 26 Jul 2023 07:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1690356614; 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=9NQYXyJTpoL16mbwLW2yFdbQNfYxvuwERGgkrl0qagg=; b=OVTSgbndz05NcegRzGpKEEtgHYfhp0Gz48hcxzOLje9UYK/vMJ17plb3u36KI8Xs U6oBhvJDYsHscjI2AG9qflIqa/SOU9LgY4FuzRKY9UYPXjl5+L2Mh3OSqBK42xAnHYL s3s3/nXHF1q0m9M9ifLIJKJBbGKZsuL0aiaXnK436l0bArdYdsobynLsVjHd9AEDV5I cw+/TbcqNptv+pG8vMd2Dz2t3gec9hjZ7LmMCn0IPvT5Qn+IWz01gUiLzwTPUhKY+PU rCAjj9UWrHXLkNcFcu+iDUPCuDDwTh41YFktpzzt3ojbzWI6GzefLrd0C7iz0Sd0pYQ i7keyfDtfw== Date: Wed, 26 Jul 2023 09:30:14 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avfft: wrap lavu/tx instead of ff_mdct 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: g0w/IilT7qr/ Patch attached. From 593d95ce1d2510394c09ea64d8669973889d20e8 Mon Sep 17 00:00:00 2001 From: Lynne Date: Thu, 10 Nov 2022 11:26:33 +0100 Subject: [PATCH 2/3] avfft: wrap lavu/tx instead of ff_mdct --- libavcodec/avfft.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index e4b19af272..ff5c739897 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -75,43 +75,56 @@ av_cold void av_fft_end(FFTContext *s) } } -#if CONFIG_MDCT - FFTContext *av_mdct_init(int nbits, int inverse, double scale) { - FFTContext *s = av_malloc(sizeof(*s)); + int ret; + float scale_f = scale; + AVTXWrapper *s = av_malloc(sizeof(*s)); + if (!s) + return NULL; - if (s && ff_mdct_init(s, nbits, inverse, scale)) - av_freep(&s); + ret = av_tx_init(&s->ctx, &s->fn, AV_TX_FLOAT_MDCT, inverse, 1 << (nbits - 1), &scale_f, 0); + if (ret < 0) { + av_free(s); + return NULL; + } - return s; + if (inverse) { + ret = av_tx_init(&s->ctx2, &s->fn2, AV_TX_FLOAT_MDCT, inverse, 1 << (nbits - 1), + &scale_f, AV_TX_FULL_IMDCT); + if (ret < 0) { + av_tx_uninit(&s->ctx); + av_free(s); + return NULL; + } + } + + return (FFTContext *)s; } void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) { - s->imdct_calc(s, output, input); + AVTXWrapper *w = (AVTXWrapper *)s; + w->fn2(w->ctx2, output, (void *)input, sizeof(float)); } void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input) { - s->imdct_half(s, output, input); + AVTXWrapper *w = (AVTXWrapper *)s; + w->fn(w->ctx, output, (void *)input, sizeof(float)); } void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) { - s->mdct_calc(s, output, input); + AVTXWrapper *w = (AVTXWrapper *)s; + w->fn(w->ctx, output, (void *)input, sizeof(float)); } av_cold void av_mdct_end(FFTContext *s) { - if (s) { - ff_mdct_end(s); - av_free(s); - } + av_fft_end(s); } -#endif /* CONFIG_MDCT */ - #if CONFIG_RDFT RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans) -- 2.40.1