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 E16B1466F3 for ; Sat, 8 Jul 2023 21:27:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F49368C5E5; Sun, 9 Jul 2023 00:25:54 +0300 (EEST) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F391968C59A for ; Sun, 9 Jul 2023 00:25:47 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id E475E60003 for ; Sat, 8 Jul 2023 21:25:46 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 8 Jul 2023 23:25:28 +0200 Message-Id: <20230708212530.109692-16-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230708212530.109692-1-michael@niedermayer.cc> References: <20230708212530.109692-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/18] avradio/sdr: rename fft_p2 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: The FFT really is from the point of view of the stream Phase 1 not Phase 2 of the demodulation. Signed-off-by: Michael Niedermayer --- libavradio/sdr.h | 4 ++-- libavradio/sdrdemux.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavradio/sdr.h b/libavradio/sdr.h index 8a2ab1c78a..1582f70d86 100644 --- a/libavradio/sdr.h +++ b/libavradio/sdr.h @@ -95,10 +95,10 @@ typedef struct FIFOElement { typedef struct SDRStream { AVTXContext *ifft_ctx; - AVTXContext *fft_p2_ctx; + AVTXContext *fft_ctx; AVTXContext *ifft_p2_ctx; av_tx_fn ifft; - av_tx_fn fft_p2; + av_tx_fn fft; av_tx_fn ifft_p2; int block_size; int block_size_p2; diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index b51fa4296a..1ded01e957 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -979,7 +979,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_p2(sst->fft_p2_ctx, sst->block, sst->iblock, sizeof(AVComplexFloat)); + sst->fft(sst->fft_ctx, sst->block, sst->iblock, sizeof(AVComplexFloat)); // Only the low N/2+1 are used the upper is just a reflection carrier19_i_exact = find_am_carrier(sdr, sst->block, 2*sst->block_size, (void*)(sst->block + 1 + sst->block_size), carrier19_i, 10, 10); @@ -1078,10 +1078,10 @@ static void free_stream(SDRContext *sdr, int stream_index) SDRStream *sst = st->priv_data; av_tx_uninit(&sst->ifft_ctx); - av_tx_uninit(&sst->fft_p2_ctx); + av_tx_uninit(&sst->fft_ctx); av_tx_uninit(&sst->ifft_p2_ctx); sst->ifft = NULL; - sst->fft_p2 = NULL; + sst->fft = NULL; sst->ifft_p2 = NULL; sst->block_size = 0; @@ -1127,7 +1127,7 @@ static int setup_stream(SDRContext *sdr, int stream_index, Station *station) if (sst->station->bandwidth_p2) { //Allocate 2nd stage demodulation fields if needed - ret = av_tx_init(&sst-> fft_p2_ctx, &sst-> fft_p2, AV_TX_FLOAT_FFT, 0, 2*sst->block_size , NULL, 0); + ret = av_tx_init(&sst-> fft_ctx, &sst-> fft, AV_TX_FLOAT_FFT, 0, 2*sst->block_size , NULL, 0); if (ret < 0) return ret; -- 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".