From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id F3E734615E for ; Mon, 7 Aug 2023 04:40:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49E6E68C738; Mon, 7 Aug 2023 07:40:33 +0300 (EEST) Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F00D68C3D0 for ; Mon, 7 Aug 2023 07:40:26 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id B793410601FE for ; Mon, 7 Aug 2023 04:40:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1691383226; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding: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=KGCDXCGdDhvq7+eg5y5CijpGVfbgcMYjUI6PUuBRXPY=; b=btbQiutYVQDBC4B0xD3QFJYPqfCSaidqraMOKT2W+BS8BKtsFECSUUdsIhLeQPqN 5+Gy0iEFoz7FaAs0Nbsphw0bY745zOSNmMoRjk1REGBkI+Cwtk/9WvfgRVd2Vh+mmku fQP/j8LSbylai1Nga/x5WCTJwCjaG5g5n+0biSON3OYgqFgVenWOrYIAT8M2w0ALtbZ F4spRNjDQ4JPVwNwkfb9dZLtiYu3j651v3eminIP536+ut1XKmaoUmVAxv3+9SRdKvP kG8sMjmeb3Miji1Olbc3zi1Kv9Mq7+D/GR0Kwp4egEnlmz+sk7UHAZP7UHAMdQR84Mq 9gE9W201QQ== Date: Mon, 7 Aug 2023 06:40:26 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: <20230806194131.6734-1-cus@passwd.hu> References: <20230806124202.7833-1-cus@passwd.hu> <20230806194131.6734-1-cus@passwd.hu> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Aug 6, 2023, 21:45 by cus@passwd.hu: > Also rename the contexts and the functions so their names will reflect their > intended size. > > With the earlier patch this fixes the audio corruption regression caused by > 6ba0aa1770ba29eb4126c6a706f6b0cd3809648f. > > Fixes ticket #10029. > > Signed-off-by: Marton Balint > --- > libavcodec/on2avc.c | 32 ++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) > > diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c > index 474adb149d..b190f36e19 100644 > --- a/libavcodec/on2avc.c > +++ b/libavcodec/on2avc.c > @@ -51,9 +51,9 @@ typedef struct On2AVCContext { > AVCodecContext *avctx; > AVFloatDSPContext *fdsp; > AVTXContext *mdct, *mdct_half, *mdct_small; > - AVTXContext *fft128, *fft256, *fft512, *fft1024; > + AVTXContext *fft64, *fft128, *fft256, *fft512; > av_tx_fn mdct_fn, mdct_half_fn, mdct_small_fn; > - av_tx_fn fft128_fn, fft256_fn, fft512_fn, fft1024_fn; > + av_tx_fn fft64_fn, fft128_fn, fft256_fn, fft512_fn; > void (*wtf)(struct On2AVCContext *ctx, float *out, float *in, int size); > > int is_av500; > @@ -475,16 +475,16 @@ static void wtf_end_512(On2AVCContext *c, float *out, float *src, > zero_head_and_tail(tmp1 + 256, 128, 13, 7); > zero_head_and_tail(tmp1 + 384, 128, 15, 5); > > - c->fft128_fn(c->fft128, src + 0, tmp1 + 0, sizeof(float)); > - c->fft128_fn(c->fft128, src + 128, tmp1 + 128, sizeof(float)); > - c->fft128_fn(c->fft128, src + 256, tmp1 + 256, sizeof(float)); > - c->fft128_fn(c->fft128, src + 384, tmp1 + 384, sizeof(float)); > + c->fft64_fn(c->fft64, src + 0, tmp1 + 0, sizeof(float)); > + c->fft64_fn(c->fft64, src + 128, tmp1 + 128, sizeof(float)); > + c->fft64_fn(c->fft64, src + 256, tmp1 + 256, sizeof(float)); > + c->fft64_fn(c->fft64, src + 384, tmp1 + 384, sizeof(float)); > > combine_fft(src, src + 128, src + 256, src + 384, tmp1, > ff_on2avc_ctab_1, ff_on2avc_ctab_2, > ff_on2avc_ctab_3, ff_on2avc_ctab_4, 512, 2); > > - c->fft512_fn(c->fft512, src, tmp1, sizeof(float)); > + c->fft256_fn(c->fft256, src, tmp1, sizeof(float)); > > pretwiddle(&tmp0[ 0], src, 512, 84, 4, 16, 4, ff_on2avc_tabs_20_84_1); > pretwiddle(&tmp0[128], src, 512, 84, 4, 16, 4, ff_on2avc_tabs_20_84_2); > @@ -503,16 +503,16 @@ static void wtf_end_1024(On2AVCContext *c, float *out, float *src, > zero_head_and_tail(tmp1 + 512, 256, 13, 7); > zero_head_and_tail(tmp1 + 768, 256, 15, 5); > > - c->fft256_fn(c->fft256, src + 0, tmp1 + 0, sizeof(float)); > - c->fft256_fn(c->fft256, src + 256, tmp1 + 256, sizeof(float)); > - c->fft256_fn(c->fft256, src + 512, tmp1 + 512, sizeof(float)); > - c->fft256_fn(c->fft256, src + 768, tmp1 + 768, sizeof(float)); > + c->fft128_fn(c->fft128, src + 0, tmp1 + 0, sizeof(float)); > + c->fft128_fn(c->fft128, src + 256, tmp1 + 256, sizeof(float)); > + c->fft128_fn(c->fft128, src + 512, tmp1 + 512, sizeof(float)); > + c->fft128_fn(c->fft128, src + 768, tmp1 + 768, sizeof(float)); > > combine_fft(src, src + 256, src + 512, src + 768, tmp1, > ff_on2avc_ctab_1, ff_on2avc_ctab_2, > ff_on2avc_ctab_3, ff_on2avc_ctab_4, 1024, 1); > > - c->fft1024_fn(c->fft1024, src, tmp1, sizeof(float)); > + c->fft512_fn(c->fft512, src, tmp1, sizeof(float)); > > pretwiddle(&tmp0[ 0], src, 1024, 84, 4, 16, 4, ff_on2avc_tabs_20_84_1); > pretwiddle(&tmp0[256], src, 1024, 84, 4, 16, 4, ff_on2avc_tabs_20_84_2); > @@ -956,14 +956,14 @@ 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) > - return ret; > if ((ret = av_tx_init(&c->fft512, &c->fft512_fn, AV_TX_FLOAT_FFT, 1, 512, 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, 1, 256, NULL, 0)) < 0) > return ret; > if ((ret = av_tx_init(&c->fft128, &c->fft128_fn, AV_TX_FLOAT_FFT, 0, 128, NULL, 0)) < 0) > return ret; > + if ((ret = av_tx_init(&c->fft64, &c->fft64_fn, AV_TX_FLOAT_FFT, 0, 64, NULL, 0)) < 0) > + return ret; > > c->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); > if (!c->fdsp) > @@ -998,10 +998,10 @@ static av_cold int on2avc_decode_close(AVCodecContext *avctx) > av_tx_uninit(&c->mdct); > av_tx_uninit(&c->mdct_half); > av_tx_uninit(&c->mdct_small); > + av_tx_uninit(&c->fft64); > av_tx_uninit(&c->fft128); > av_tx_uninit(&c->fft256); > av_tx_uninit(&c->fft512); > - av_tx_uninit(&c->fft1024); > > av_freep(&c->fdsp); > LGTM Thanks _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".