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 0BCB446D37 for ; Mon, 10 Jul 2023 00:01:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 699E968C672; Mon, 10 Jul 2023 03:01:16 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6126768C5E1 for ; Mon, 10 Jul 2023 03:01:09 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 9F200240007 for ; Mon, 10 Jul 2023 00:01:08 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 10 Jul 2023 02:01:02 +0200 Message-Id: <20230710000104.3597392-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230710000104.3597392-1-michael@niedermayer.cc> References: <20230710000104.3597392-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avradio/sdrdemux: only allocare iside and window_p2 when needed 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: Signed-off-by: Michael Niedermayer --- libavradio/sdrdemux.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index ef8a8a91d3..36b8aac2fb 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -1136,16 +1136,23 @@ static int setup_stream(SDRContext *sdr, int stream_index, Station *station) if (ret < 0) return ret; + sst->window_p2 = av_malloc(sizeof(*sst->window_p2)* 2 * sst->block_size_p2); + sst->iside = av_malloc(sizeof(*sst->iside) * 2 * sst->block_size_p2); + if (!sst->iside || !sst->window_p2) + return AVERROR(ENOMEM); + + avpriv_kbd_window_init(sst->window_p2, sdr->kbd_alpha, sst->block_size_p2); + for(int i = sst->block_size_p2; i < 2 * sst->block_size_p2; i++) { + sst->window_p2[i] = sst->window_p2[2*sst->block_size_p2 - i - 1]; + } } sst->out_buf = av_malloc(sizeof(*sst->out_buf) * 2 * sst->block_size); sst->block = av_malloc(sizeof(*sst-> block) * 2 * sst->block_size); sst->iblock = av_malloc(sizeof(*sst->iblock) * 2 * sst->block_size); sst->icarrier = av_malloc(sizeof(*sst->icarrier) * 2 * sst->block_size); - sst->iside = av_malloc(sizeof(*sst->iside) * 2 * sst->block_size_p2); sst->window = av_malloc(sizeof(*sst->window) * 2 * sst->block_size); - sst->window_p2 = av_malloc(sizeof(*sst->window_p2)* 2 * sst->block_size_p2); - if (!sst->out_buf || !sst->block || !sst->iblock || !sst->icarrier || !sst->iside || !sst->window || !sst->window_p2) + if (!sst->out_buf || !sst->block || !sst->iblock || !sst->icarrier || !sst->window) return AVERROR(ENOMEM); avpriv_kbd_window_init(sst->window, sdr->kbd_alpha, sst->block_size); @@ -1153,10 +1160,6 @@ static int setup_stream(SDRContext *sdr, int stream_index, Station *station) sst->window[i] = sst->window[2*sst->block_size - i - 1]; } - avpriv_kbd_window_init(sst->window_p2, sdr->kbd_alpha, sst->block_size_p2); - for(int i = sst->block_size_p2; i < 2 * sst->block_size_p2; i++) { - sst->window_p2[i] = sst->window_p2[2*sst->block_size_p2 - i - 1]; - } sst->am_amplitude = 0; } -- 2.31.1 _______________________________________________ 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".