[FFmpeg-devel,05/12] avradio/rds: move phase 2 window to main context

Message ID	20230711211910.1257355-5-michael@niedermayer.cc
State	New
Headers	show Delivered-To: ffmpegpatchwork2@gmail.com 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; From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Date: Tue, 11 Jul 2023 23:19:03 +0200 Message-Id: <20230711211910.1257355-5-michael@niedermayer.cc> In-Reply-To: <20230711211910.1257355-1-michael@niedermayer.cc> References: <20230711211910.1257355-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/12] avradio/rds: move phase 2 window to main context Precedence: list Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Series	[FFmpeg-devel,01/12] avradio/sdrdemux: Fix use of uninitialized memory \| expand [FFmpeg-devel,01/12] avradio/sdrdemux: Fix use of uninitialized memory [FFmpeg-devel,02/12] avradio/rds: Implement burst error decoder [FFmpeg-devel,03/12] avradio/rds: Keep track of program_id [FFmpeg-devel,04/12] avradio/sdr: Move rds_ring to Station [FFmpeg-devel,05/12] avradio/rds: move phase 2 window to main context [FFmpeg-devel,06/12] avradio/sdr: Warnings cleanup [FFmpeg-devel,07/12] avradio/rds: warnings cleanup [FFmpeg-devel,08/12] avradio/sdr: Move IFFT and block size to main context [FFmpeg-devel,09/12] avradio/sdr: Move per stream arraies to main context [FFmpeg-devel,10/12] avradio/sdr: Move tx contexts out of stream so its not duplicated [FFmpeg-devel,11/12] avradio/sdr: Pass AVStream instead of int to demodulate [FFmpeg-devel,12/12] avradio/sdr: Process RDS of all stations not just the current one

Context	Check	Description
andriy/configure_x86	warning	Failed to apply patch
yinshiyou/configure_loongarch64	warning	Failed to apply patch

diff --git a/libavradio/rds.c b/libavradio/rds.c index e16685be18..1392bb0874 100644 --- a/libavradio/rds.c +++ b/libavradio/rds.c @@ -150,10 +150,9 @@ static int decode_rds_group(SDRContext *sdr, Station *station, uint16_t group[4] return 0; } -int ff_sdr_decode_rds(SDRContext *sdr, SDRStream *sst, AVComplexFloat *signal) +int ff_sdr_decode_rds(SDRContext *sdr, Station *station, AVComplexFloat *signal) { int i, phase; - Station *station = sst->station; float (*ring)[2] = station->rds_ring; float diff[2*104 - 1]; uint16_t group[4]; @@ -164,10 +163,10 @@ int ff_sdr_decode_rds(SDRContext *sdr, SDRStream *sst, AVComplexFloat *signal) //For reasons that are beyond me, RDS spec allows inphase and quadrature so we have to compute and check both for (int i=0; i < sdr->fm_block_size_p2; i++) { - ring[ station->rds_ring_pos + i ][0] += signal[i].re * sst->window_p2[i]; - ring[ station->rds_ring_pos + i + sdr->fm_block_size_p2 ][0] = signal[i + sdr->fm_block_size_p2].re * sst->window_p2[i + sdr->fm_block_size_p2]; - ring[ station->rds_ring_pos + i ][1] += signal[i].im * sst->window_p2[i]; - ring[ station->rds_ring_pos + i + sdr->fm_block_size_p2 ][1] = signal[i + sdr->fm_block_size_p2].im * sst->window_p2[i + sdr->fm_block_size_p2]; + ring[ station->rds_ring_pos + i ][0] += signal[i].re * sdr->fm_window_p2[i]; + ring[ station->rds_ring_pos + i + sdr->fm_block_size_p2 ][0] = signal[i + sdr->fm_block_size_p2].re * sdr->fm_window_p2[i + sdr->fm_block_size_p2]; + ring[ station->rds_ring_pos + i ][1] += signal[i].im * sdr->fm_window_p2[i]; + ring[ station->rds_ring_pos + i + sdr->fm_block_size_p2 ][1] = signal[i + sdr->fm_block_size_p2].im * sdr->fm_window_p2[i + sdr->fm_block_size_p2]; } station->rds_ring_pos += sdr->fm_block_size_p2; diff --git a/libavradio/sdr.h b/libavradio/sdr.h index 7d951334f9..f966a16e2e 100644 --- a/libavradio/sdr.h +++ b/libavradio/sdr.h @@ -113,7 +113,6 @@ typedef struct SDRStream { AVComplexFloat *icarrier; AVComplexFloat *iside; float *window; - float *window_p2; Station *station; float am_amplitude; @@ -163,6 +162,7 @@ typedef struct SDRContext { int64_t fm_bandwidth_p2; int fm_block_size_p2; int rds_ring_size; + float *fm_window_p2; int am_mode; ///< AMMode but using int for generic option access int emphasis_mode; @@ -278,7 +278,7 @@ int ff_sdr_histogram_score(Station *s); * Decode RDS * @param signal the time domain RDS signal */ -int ff_sdr_decode_rds(SDRContext *sdr, SDRStream *sst, AVComplexFloat *signal); +int ff_sdr_decode_rds(SDRContext *sdr, Station *station, AVComplexFloat *signal); static inline float len2(AVComplexFloat c) { diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index 762328aebe..93e48c2cdf 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -1005,15 +1005,15 @@ static int demodulate_fm(SDRContext *sdr, int stream_index, AVPacket *pkt) memcpy(sst->block + i, sst->block + 3*carrier19_i, sizeof(AVComplexFloat)*len2_4_i); memcpy(sst->block + i + 2*sdr->fm_block_size_p2 - len2_4_i, sst->block + 3*carrier19_i - len2_4_i, sizeof(AVComplexFloat)*len2_4_i); sst->ifft_p2(sst->ifft_p2_ctx, sst->iside , sst->block + i, sizeof(AVComplexFloat)); - synchronous_am_demodulationN(sst->iside, sst->icarrier, sst->window_p2, 2*sdr->fm_block_size_p2, 3); - ff_sdr_decode_rds(sdr, sst, sst->iside); + synchronous_am_demodulationN(sst->iside, sst->icarrier, sdr->fm_window_p2, 2*sdr->fm_block_size_p2, 3); + ff_sdr_decode_rds(sdr, sst->station, sst->iside); memcpy(sst->block + i, sst->block + 2*carrier19_i, sizeof(AVComplexFloat)*len17_i); memcpy(sst->block + i + 2*sdr->fm_block_size_p2 - len17_i, sst->block + 2*carrier19_i - len17_i, sizeof(AVComplexFloat)*len17_i); apply_deemphasis(sdr, sst->block + i, sdr->fm_block_size_p2, sample_rate_p2, + 1); apply_deemphasis(sdr, sst->block + i + 2*sdr->fm_block_size_p2, sdr->fm_block_size_p2, sample_rate_p2, - 1); sst->ifft_p2(sst->ifft_p2_ctx, sst->iside , sst->block + i, sizeof(AVComplexFloat)); - synchronous_am_demodulationN(sst->iside, sst->icarrier, sst->window_p2, 2*sdr->fm_block_size_p2, 2); + synchronous_am_demodulationN(sst->iside, sst->icarrier, sdr->fm_window_p2, 2*sdr->fm_block_size_p2, 2); } memset(sst->block + len17_i, 0, (2*sdr->fm_block_size_p2 - len17_i) * sizeof(AVComplexFloat)); apply_deemphasis(sdr, sst->block, 2*sdr->fm_block_size_p2, sample_rate_p2, + 1); @@ -1024,12 +1024,12 @@ static int demodulate_fm(SDRContext *sdr, int stream_index, AVPacket *pkt) for(i = 0; i<sdr->fm_block_size_p2; i++) { float m, q; - m = sst->out_buf[2*i+0] + (sst->iblock[i ].re) * sst->window_p2[i ] * scale; - newbuf[2*i+0] = (sst->iblock[i + sdr->fm_block_size_p2].re) * sst->window_p2[i + sdr->fm_block_size_p2] * scale; + m = sst->out_buf[2*i+0] + (sst->iblock[i ].re) * sdr->fm_window_p2[i ] * scale; + newbuf[2*i+0] = (sst->iblock[i + sdr->fm_block_size_p2].re) * sdr->fm_window_p2[i + sdr->fm_block_size_p2] * scale; if (carrier19_i >= 0) { - q = sst->out_buf[2*i+1] + sst->iside[i ].im * sst->window_p2[i ] * scale; - newbuf[2*i+1] = sst->iside[i + sdr->fm_block_size_p2].im * sst->window_p2[i + sdr->fm_block_size_p2] * scale; + q = sst->out_buf[2*i+1] + sst->iside[i ].im * sdr->fm_window_p2[i ] * scale; + newbuf[2*i+1] = sst->iside[i + sdr->fm_block_size_p2].im * sdr->fm_window_p2[i + sdr->fm_block_size_p2] * scale; sst->out_buf[2*i+0] = m + q; sst->out_buf[2*i+1] = m - q; @@ -1108,7 +1108,6 @@ static void free_stream(SDRContext *sdr, int stream_index) av_freep(&sst->icarrier); av_freep(&sst->iside); av_freep(&sst->window); - av_freep(&sst->window_p2); } static int setup_stream(SDRContext *sdr, int stream_index, Station *station) @@ -1152,15 +1151,9 @@ 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 * sdr->fm_block_size_p2); sst->iside = av_malloc(sizeof(*sst->iside) * 2 * sdr->fm_block_size_p2); - if (!sst->iside || !sst->window_p2) + if (!sst->iside) return AVERROR(ENOMEM); - - avpriv_kbd_window_init(sst->window_p2, sdr->kbd_alpha, sdr->fm_block_size_p2); - for(int i = sdr->fm_block_size_p2; i < 2 * sdr->fm_block_size_p2; i++) { - sst->window_p2[i] = sst->window_p2[2*sdr->fm_block_size_p2 - i - 1]; - } } sst->out_buf = av_mallocz(sizeof(*sst->out_buf) * 2 * sst->block_size); @@ -1508,7 +1501,9 @@ int ff_sdr_common_init(AVFormatContext *s) sdr->block = av_malloc(sizeof(*sdr->block ) * 2 * sdr->block_size); sdr->len2block = av_malloc(sizeof(*sdr->len2block) * 2 * sdr->block_size); sdr->window = av_malloc(sizeof(*sdr->window ) * 2 * sdr->block_size); - if (!sdr->windowed_block || !sdr->len2block || !sdr->block || !sdr->window) + sdr->fm_window_p2 = av_malloc(sizeof(*sdr->fm_window_p2)* 2 * sdr->fm_block_size_p2); + + if (!sdr->windowed_block || !sdr->len2block || !sdr->block || !sdr->window || !sdr->fm_window_p2) return AVERROR(ENOMEM); ret = av_tx_init(&sdr->fft_ctx, &sdr->fft, AV_TX_FLOAT_FFT, 0, 2*sdr->block_size, NULL, 0); @@ -1523,6 +1518,11 @@ int ff_sdr_common_init(AVFormatContext *s) for (int i = 0; i < 2 * sdr->block_size; i++) sdr->window[i] *= ((i&1) ? 1:-1) * scale; + avpriv_kbd_window_init(sdr->fm_window_p2, sdr->kbd_alpha, sdr->fm_block_size_p2); + for(int i = sdr->fm_block_size_p2; i < 2 * sdr->fm_block_size_p2; i++) { + sdr->fm_window_p2[i] = sdr->fm_window_p2[2*sdr->fm_block_size_p2 - i - 1]; + } + if (sdr->waterfall_st_index >= 0) { AVStream *st = s->streams[sdr->waterfall_st_index]; SDRStream *sst = st->priv_data; @@ -1971,6 +1971,7 @@ int ff_sdr_read_close(AVFormatContext *s) av_freep(&sdr->block); av_freep(&sdr->len2block); av_freep(&sdr->window); + av_freep(&sdr->fm_window_p2); av_tx_uninit(&sdr->fft_ctx); sdr->fft = NULL;

[FFmpeg-devel,05/12] avradio/rds: move phase 2 window to main context

Checks

Commit Message

Patch