From patchwork Tue Jul 11 21:19:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42600 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp1731100pzb; Tue, 11 Jul 2023 14:20:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlEfcG36iXfwCA6581q7MwaLZSlSizLqknfIwbc9pKO+z8hLeztAWg+vBCH9k7T7jKm4pPWJ X-Received: by 2002:a2e:a281:0:b0:2b6:cbba:1307 with SMTP id k1-20020a2ea281000000b002b6cbba1307mr13005767lja.0.1689110400073; Tue, 11 Jul 2023 14:20:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689110400; cv=none; d=google.com; s=arc-20160816; b=b0H2Z26mSquSFiA4AvWn8XfEw8UO2rf2Q742YIP3IiJ19Xm3eFX11R6s0vXcli2Rmo BStIOilKXxJ8JVHm/N0R1QQ4QVeposk7rRatg6VEepe2h2r0uAajlNPjYNkGwpqK7q0r BVHwdLO55pDs8j2AgB5xsDy2phZrDNFtbRPQAPl8CileHKFvbe6aoRYCz4a2JIVxVD+g UClGFpK89RmS2wkEvQ0+rKw3KOHQMHnaatbhRoRgFvmsV/CsESLuEZhopvDo8BXJICjA GTkKCfaeQTatwb9rxJEMaj0VCk+LOZwitgMDu8lR8OxDXjosET0srcPbzTA6u+jDtqbr nTkw== 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=OSv3DqIZ9UVqv3PgPRraCXOOL25D9zYmE1zVfVq5qYY=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=smUO9b9gnhXN8YUwu2pCbpwPRKfV5o+B+zjdUqMGmHRPZmFENC6ZQkjN+x0Z/381wP 0/TTe+SzZ3fW3l0J7SlNbH3slG2oVfPUsmQGxXJpijZ/byFjF4oMvaOsNZwKUzEm4Z5a 0hcl+yxqnRipLF6WZix5l07YxyoSVNBKcwO1OpmbrQew1bT9CpymOKpXCXoStm+ZuJCM NXyeZj4MxBkeJlxWW22j0zFPw7jaAj1y8IlkCJFAeZnMJsuQ3GA6ntlbGLHRwkDYAGY2 u20xwTGgPlV5eGBNRI/ekSfagx8gJcxP39E36MVP3smh1ClULsxiDOYaymTZo/dvVm9r z05w== 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 rp28-20020a170906d97c00b0098932a90cdasi3001034ejb.255.2023.07.11.14.19.59; Tue, 11 Jul 2023 14:20:00 -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 9AD2C68C611; Wed, 12 Jul 2023 00:19:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D83FD68C5FC for ; Wed, 12 Jul 2023 00:19:17 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 334B0C0006 for ; Tue, 11 Jul 2023 21:19:16 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Jul 2023 23:19:03 +0200 Message-Id: <20230711211910.1257355-5-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 05/12] avradio/rds: move phase 2 window to main context 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: 7Oh4YgKGsgdj Its the same for all FM stations and channels so we dont need more than 1 Signed-off-by: Michael Niedermayer --- libavradio/rds.c | 11 +++++------ libavradio/sdr.h | 4 ++-- libavradio/sdrdemux.c | 33 +++++++++++++++++---------------- 3 files changed, 24 insertions(+), 24 deletions(-) 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; ifm_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;