From patchwork Mon Jul 10 00:01:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42572 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp360583pzb; Sun, 9 Jul 2023 17:01:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFXFyP+3ZNPYohsN0J9VzH1LAjroky0X3qXf9hVpWUTAlrtkQbCu4sK0BaQZQztGlt0JCGr X-Received: by 2002:a05:6512:3122:b0:4f8:6b57:87f9 with SMTP id p2-20020a056512312200b004f86b5787f9mr8122996lfd.22.1688947295644; Sun, 09 Jul 2023 17:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688947295; cv=none; d=google.com; s=arc-20160816; b=XluS7TxOKfBbHBsf7fSwk/ncIMa+kyyXziRtiVTvcZqbbDRp6cvU8pudHXQsh3aIn/ PnAQPCYr5XtBMUIaDAIzjkHm9tR2cRIDsjHajcIjeELlY6Cr9wpivzEl4mXWH3ypN/zU tCuQJ1XDnn1qlRg0LkbcRX7qnyqDbIVfry4GUktGq3Se/HJkfd8Bkm9h1MWAzNrStEXb 1NRMdzFimfagCFAnBkOYVeX5FRt0u9ShH3tKWMDjQF2fso7BfNrnnHM8RVobDR1smi2S 0A+Q+kAeNU4+Gy/QQHbkltU3hrfKffGhCWtre+q4Y9Ugkgy+L/owU5jLhHqjCl6qVtJC dkXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=1OXJLm/KkNGSlAEd69bAZ3V+bgFa5IHwWXLCWhMotQE=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=CDyNFd5R8M9YrCSIkrisp3CN/ErQaDz+C1vzXJZrdb/D4tHyaCw5pYKKTNBKCz9icA dlOthAFX1waRrZMez9/5P/eppF5/UY4gVBtH0A7rBTdWjxxDRUBA5Ec1TBnX/g49eqkT z5gB5Lf4ET1j+eilO4QZUwOFNOqIaprnEBM2XRrWIa+Vfdt0DBprJzUAZdHCA7pZNwLY KjgBAX19+b70c8zBlHeJ31J3UBJZuarzS1m7wuZ16iEpusItYP1HpIgkRmnVM8SDgb94 BveThel5fZg/M1zeCgImlk/jctUwUKmrrc2mnmDSXMoIs1cXQ0UN0JrJwOlSNypSUEIs jBeQ== 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 lc1-20020a170906dfe100b00992cef85664si7486851ejc.139.2023.07.09.17.01.35; Sun, 09 Jul 2023 17:01:35 -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 A363068C66C; Mon, 10 Jul 2023 03:01:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nAaNJ0qo5s6Q 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; }