From patchwork Sun Aug 6 12:42:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 43142 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1046881pzh; Sun, 6 Aug 2023 05:42:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPxpI+0PUGVKlMSrbCPKAAZ52x8pA7NXskNSp4mZvzWkBUrz6JfLuOcRv0W88kwOBRLCUy X-Received: by 2002:a17:907:b16:b0:99c:6fb6:ae7c with SMTP id h22-20020a1709070b1600b0099c6fb6ae7cmr5954675ejl.22.1691325742794; Sun, 06 Aug 2023 05:42:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691325742; cv=none; d=google.com; s=arc-20160816; b=09OLG3c/lG0VCWR6Wynsmf/WTqko5OA86FcXFJXrPSwmVgi56vCyAsb3U4ujTyg5eH nORg422EjytiV46kPeWSYIwphVb5POhfHspsjiyD+6NYnbUkU/nvIxZAR9F0yAiiy/KS ZiQoV8A6z/yF4tlLOG9hLWFOrJ5vDjBS52ufuWgLt8kXGCNDjyGEA/Par4YVBjkcpghm nGtYUxi5+uyHiRX690CG4gzh6qcxxuDdaFKRPdVxYGeIvFg1ISHDVnM+Q1AgRmRkcKXp sKwy9XAJnzydrIoPtNkxc7hVshZQEbAcx5k+6DUVa7HH68Lj8ZDqP7V/oprM3i2THPBC rNNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=Tue8yyi903avk+9pEwumpl/UGom1Hyzjcw3ZcX8p64M=; fh=fMjmfVbdHm+M/+18QsbBd9XwekW2z8GZAuS0XfnYyyA=; b=fjPbEmg0ETk8vdfAnzZI3lR7sjOIdZ2sS+T0w11odk8VFMNRlT91CVv/h+e5vYBn2Q CkQ4yJkisxh0UNzytBgWfQyA/fITCvoJCxosg2rTSth0MfCoTkIclYEMmipdM6ZvF4CN k0qS7PKMeVdpOt0xs4PNiptJMUOs3XFtiH2JVmIEq1cO2QGDnvrxRF3RKWEC44lds3cy Wbv+tafk4ZsQa2ZH02VnHJPVomY8QM+qA84gZKTcCi86UH3CHEIjlGN5qW9i//Acux3O kp3Ah2ylsXWmpjFGVqNX+u2PCp9EyhyUsLpzMgwxvHB7A9tpcaSjTP+dxpQ9vzaAStRJ d6XA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sd23-20020a170906ce3700b0099cb0d4f9besi2838465ejb.26.2023.08.06.05.42.22; Sun, 06 Aug 2023 05:42:22 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8B8468C697; Sun, 6 Aug 2023 15:42:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24EDB68C683 for ; Sun, 6 Aug 2023 15:42:12 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 14AD3E9273; Sun, 6 Aug 2023 14:39:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rb_uRbsKFDM0; Sun, 6 Aug 2023 14:39:22 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 4AB1CE926A; Sun, 6 Aug 2023 14:39:22 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 14:42:02 +0200 Message-Id: <20230806124202.7833-1-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/on2avc: use correct fft sizes 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wc/Pah53BS8l With the earlier patch this fixes the audio corruption regression caused by 6ba0aa1770ba29eb4126c6a706f6b0cd3809648f. Fixes ticket #10029. Signed-off-by: Marton Balint --- libavcodec/on2avc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 474adb149d..0d0869bc9c 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -956,13 +956,13 @@ static av_cold int on2avc_decode_init(AVCodecContext *avctx) if ((ret = av_tx_init(&c->mdct_small, &c->mdct_small_fn, AV_TX_FLOAT_MDCT, 1, 128, &scale, 0)) < 0) return ret; - if ((ret = av_tx_init(&c->fft1024, &c->fft1024_fn, AV_TX_FLOAT_FFT, 1, 1024, NULL, 0)) < 0) + if ((ret = av_tx_init(&c->fft1024, &c->fft1024_fn, AV_TX_FLOAT_FFT, 1, 512, NULL, 0)) < 0) return ret; - if ((ret = av_tx_init(&c->fft512, &c->fft512_fn, AV_TX_FLOAT_FFT, 1, 512, NULL, 0)) < 0) + if ((ret = av_tx_init(&c->fft512, &c->fft512_fn, AV_TX_FLOAT_FFT, 1, 256, NULL, 0)) < 0) return ret; - if ((ret = av_tx_init(&c->fft256, &c->fft256_fn, AV_TX_FLOAT_FFT, 0, 256, NULL, 0)) < 0) + if ((ret = av_tx_init(&c->fft256, &c->fft256_fn, AV_TX_FLOAT_FFT, 0, 128, NULL, 0)) < 0) return ret; - if ((ret = av_tx_init(&c->fft128, &c->fft128_fn, AV_TX_FLOAT_FFT, 0, 128, NULL, 0)) < 0) + if ((ret = av_tx_init(&c->fft128, &c->fft128_fn, AV_TX_FLOAT_FFT, 0, 64, NULL, 0)) < 0) return ret; c->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT);