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 161EB46DBC for ; Tue, 11 Jul 2023 21:20:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 818B868C653; Wed, 12 Jul 2023 00:19:31 +0300 (EEST) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9CB468BF69 for ; Wed, 12 Jul 2023 00:19:23 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E29991C0003 for ; Tue, 11 Jul 2023 21:19:22 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Jul 2023 23:19:08 +0200 Message-Id: <20230711211910.1257355-10-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230711211910.1257355-1-michael@niedermayer.cc> References: <20230711211910.1257355-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 10/12] avradio/sdr: Move tx contexts out of stream so its not duplicated 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/sdr.h | 10 +++++---- libavradio/sdrdemux.c | 48 +++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/libavradio/sdr.h b/libavradio/sdr.h index 8d7ab803d4..cb4b6dc68b 100644 --- a/libavradio/sdr.h +++ b/libavradio/sdr.h @@ -99,10 +99,6 @@ typedef struct FIFOElement { } FIFOElement; typedef struct SDRStream { - AVTXContext *fft_ctx; - AVTXContext *ifft_p2_ctx; - av_tx_fn fft; - av_tx_fn ifft_p2; int processing_index; float *out_buf; @@ -172,9 +168,15 @@ typedef struct SDRContext { float *fm_window_p2; AVTXContext *am_ifft_ctx; + AVTXContext *am_fft_ctx; AVTXContext *fm_ifft_ctx; + AVTXContext *fm_fft_ctx; + AVTXContext *fm_ifft_p2_ctx; av_tx_fn am_ifft; + av_tx_fn am_fft; av_tx_fn fm_ifft; + av_tx_fn fm_fft; + av_tx_fn fm_ifft_p2; int am_mode; ///< AMMode but using int for generic option access int emphasis_mode; diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index 6442d251f6..5d58d81843 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -991,7 +991,7 @@ static int demodulate_fm(SDRContext *sdr, int stream_index, AVPacket *pkt) //FIXME this only needs to be a RDFT //CONSIDER, this and in fact alot can be done with bandpass and lowpass filters instead of FFTs, find out which is better //CONSIDER synthesizing the carrier instead of IFFT, we have all parameters for that - sst->fft(sst->fft_ctx, sdr->fm_block, sdr->fm_iblock, sizeof(AVComplexFloat)); + sdr->fm_fft(sdr->fm_fft_ctx, sdr->fm_block, sdr->fm_iblock, sizeof(AVComplexFloat)); // Only the low N/2+1 are used the upper is just a reflection carrier19_i_exact = find_am_carrier(sdr, sdr->fm_block, 2*sdr->fm_block_size, (void*)(sdr->fm_block + 1 + sdr->fm_block_size), carrier19_i, 10, 10); @@ -1002,11 +1002,11 @@ static int demodulate_fm(SDRContext *sdr, int stream_index, AVPacket *pkt) memset(sdr->fm_block + i, 0, 2*sdr->fm_block_size_p2 * sizeof(AVComplexFloat)); memcpy(sdr->fm_block + i, sdr->fm_block + carrier19_i, sizeof(AVComplexFloat)*(W+1)); memcpy(sdr->fm_block + i + 2*sdr->fm_block_size_p2 - W, sdr->fm_block + carrier19_i - W, sizeof(AVComplexFloat)*W); - sst->ifft_p2(sst->ifft_p2_ctx, sdr->fm_icarrier, sdr->fm_block + i, sizeof(AVComplexFloat)); + sdr->fm_ifft_p2(sdr->fm_ifft_p2_ctx, sdr->fm_icarrier, sdr->fm_block + i, sizeof(AVComplexFloat)); memcpy(sdr->fm_block + i, sdr->fm_block + 3*carrier19_i, sizeof(AVComplexFloat)*len2_4_i); memcpy(sdr->fm_block + i + 2*sdr->fm_block_size_p2 - len2_4_i, sdr->fm_block + 3*carrier19_i - len2_4_i, sizeof(AVComplexFloat)*len2_4_i); - sst->ifft_p2(sst->ifft_p2_ctx, sdr->fm_iside , sdr->fm_block + i, sizeof(AVComplexFloat)); + sdr->fm_ifft_p2(sdr->fm_ifft_p2_ctx, sdr->fm_iside , sdr->fm_block + i, sizeof(AVComplexFloat)); synchronous_am_demodulationN(sdr->fm_iside, sdr->fm_icarrier, sdr->fm_window_p2, 2*sdr->fm_block_size_p2, 3); ff_sdr_decode_rds(sdr, sst->station, sdr->fm_iside); @@ -1014,12 +1014,12 @@ static int demodulate_fm(SDRContext *sdr, int stream_index, AVPacket *pkt) memcpy(sdr->fm_block + i + 2*sdr->fm_block_size_p2 - len17_i, sdr->fm_block + 2*carrier19_i - len17_i, sizeof(AVComplexFloat)*len17_i); apply_deemphasis(sdr, sdr->fm_block + i, sdr->fm_block_size_p2, sample_rate_p2, + 1); apply_deemphasis(sdr, sdr->fm_block + i + 2*sdr->fm_block_size_p2, sdr->fm_block_size_p2, sample_rate_p2, - 1); - sst->ifft_p2(sst->ifft_p2_ctx, sdr->fm_iside , sdr->fm_block + i, sizeof(AVComplexFloat)); + sdr->fm_ifft_p2(sdr->fm_ifft_p2_ctx, sdr->fm_iside , sdr->fm_block + i, sizeof(AVComplexFloat)); synchronous_am_demodulationN(sdr->fm_iside, sdr->fm_icarrier, sdr->fm_window_p2, 2*sdr->fm_block_size_p2, 2); } memset(sdr->fm_block + len17_i, 0, (2*sdr->fm_block_size_p2 - len17_i) * sizeof(AVComplexFloat)); apply_deemphasis(sdr, sdr->fm_block, 2*sdr->fm_block_size_p2, sample_rate_p2, + 1); - sst->ifft_p2(sst->ifft_p2_ctx, sdr->fm_iblock , sdr->fm_block, sizeof(AVComplexFloat)); + sdr->fm_ifft_p2(sdr->fm_ifft_p2_ctx, sdr->fm_iblock , sdr->fm_block, sizeof(AVComplexFloat)); memset(sdr->fm_iblock + 2*sdr->fm_block_size_p2, 0 ,(2*sdr->fm_block_size -2*sdr->fm_block_size_p2) * sizeof(AVComplexFloat)); scale = 5 / (M_PI * 2*sdr->fm_block_size); @@ -1096,11 +1096,6 @@ static void free_stream(SDRContext *sdr, int stream_index) AVStream *st = s->streams[stream_index]; SDRStream *sst = st->priv_data; - av_tx_uninit(&sst->fft_ctx); - av_tx_uninit(&sst->ifft_p2_ctx); - sst->fft = NULL; - sst->ifft_p2 = NULL; - av_freep(&sst->out_buf); } @@ -1138,15 +1133,6 @@ static int setup_stream(SDRContext *sdr, int stream_index, Station *station) int block_size; if (sst->station->modulation == FM) { - //Allocate 2nd stage demodulation fields if needed - ret = av_tx_init(&sst-> fft_ctx, &sst-> fft, AV_TX_FLOAT_FFT, 0, 2*sdr->fm_block_size , NULL, 0); - if (ret < 0) - return ret; - - ret = av_tx_init(&sst->ifft_p2_ctx, &sst->ifft_p2, AV_TX_FLOAT_FFT, 1, 2*sdr->fm_block_size_p2, NULL, 0); - if (ret < 0) - return ret; - block_size = sdr->fm_block_size; } else block_size = sdr->am_block_size; @@ -1523,10 +1509,22 @@ int ff_sdr_common_init(AVFormatContext *s) if (ret < 0) return ret; + ret = av_tx_init(&sdr->am_fft_ctx, &sdr->am_fft, AV_TX_FLOAT_FFT, 0, 2*sdr->am_block_size , NULL, 0); + if (ret < 0) + return ret; + ret = av_tx_init(&sdr->fm_ifft_ctx, &sdr->fm_ifft, AV_TX_FLOAT_FFT, 1, 2*sdr->fm_block_size, NULL, 0); if (ret < 0) return ret; + ret = av_tx_init(&sdr->fm_fft_ctx, &sdr->fm_fft, AV_TX_FLOAT_FFT, 0, 2*sdr->fm_block_size , NULL, 0); + if (ret < 0) + return ret; + + ret = av_tx_init(&sdr->fm_ifft_p2_ctx, &sdr->fm_ifft_p2, AV_TX_FLOAT_FFT, 1, 2*sdr->fm_block_size_p2, NULL, 0); + if (ret < 0) + return ret; + init_window(sdr, sdr->window, sdr->block_size); for (int i = 0; i < 2 * sdr->block_size; i++) @@ -1998,10 +1996,16 @@ int ff_sdr_read_close(AVFormatContext *s) av_tx_uninit(&sdr->fft_ctx); av_tx_uninit(&sdr->am_ifft_ctx); + av_tx_uninit(&sdr->am_fft_ctx); av_tx_uninit(&sdr->fm_ifft_ctx); - sdr->fft = NULL; - sdr->am_ifft = NULL; - sdr->fm_ifft = NULL; + av_tx_uninit(&sdr->fm_fft_ctx); + av_tx_uninit(&sdr->fm_ifft_p2_ctx); + sdr->fft = NULL; + sdr->am_ifft = NULL; + sdr->am_fft = NULL; + sdr->fm_ifft = NULL; + sdr->fm_fft = NULL; + sdr->fm_ifft_p2 = NULL; avio_close(sdr->dump_avio); -- 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".