From patchwork Fri Jul 7 17:22:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42526 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp7450341pzh; Fri, 7 Jul 2023 10:23:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlGkTJM/CWvOfZgjnO58ErwaMxczitvHu4zuhmXIoO4Gjf1VFMZ26RTrkxemlgJZrEfHYjd7 X-Received: by 2002:a17:907:c9aa:b0:986:d833:3cf9 with SMTP id uj42-20020a170907c9aa00b00986d8333cf9mr4490570ejc.39.1688750629945; Fri, 07 Jul 2023 10:23:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688750629; cv=none; d=google.com; s=arc-20160816; b=cyD/Gzi60tPGl7YgcC+UkSwrdH7J3vpF/8RWJWAjehbKGF+yV+9H0ah92kSe4Qedd8 3deqJDTZFabc67lnRNJuvfk3fS7ypdq+zanrHsnifii2wgM1RCQuq0IqmtgF4CEGaRJv QM6exm/ybx+AoWmrc+FUv+BDGB49jLCtkEmQGSgPZbBEwvw4yr435z7QPRaBc8wigKWV w6RsAkiggl4CsUthmw2h/T2xNVNWB7+Hel25rRzsOEXBKtxIlmfJRLG3aiAmARfWtZPZ hxjS1lKsMHgWLi91Gv1B5V9li3dRM1XK6FeVzxDJCTZBscG9fz5MOBU6h1NSD8e/ddW0 u6Kg== 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=8f9rdPKJf5QAnjqI6YerZ9JpUto84l8fbx9Hhs/cSgc=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=ydSmhdGauKGIyriuWjH1IVJhtBOrmmg7PhXynz0WgGqKBnNMlumT5imCndA4Ku8cso JEODO56Ml0stfdRVWUXHw5lUVSnhB0D2g6HVdRdHuAirX4hzkupiv6X85igcTLVILkm0 2vOwcFl+SqExSptnX4IR+KqcdcQSPNOree1AmI1erwcqAfukMLP7mYdWMlHTG5hI6WBT /jgz92iVwd0GNIXIlunXpKpcPyUuyK0Ma+eUKpvVgR+SzxlhXJb43pkCGLjOqitu/cVA nqatqZF33lRZE1qUOUMC7LhPN6Eap2Lkg3B+GaoBoANEucXIKI+qpy9iC1WuKeWy2LuW kBpQ== 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 t6-20020a170906178600b009886d385534si2432155eje.950.2023.07.07.10.23.49; Fri, 07 Jul 2023 10:23:49 -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 4B87B68C84D; Fri, 7 Jul 2023 20:22:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 385DC68C7E4 for ; Fri, 7 Jul 2023 20:22:36 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 9793160005 for ; Fri, 7 Jul 2023 17:22:35 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 7 Jul 2023 19:22:24 +0200 Message-Id: <20230707172224.2368067-9-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230707172224.2368067-1-michael@niedermayer.cc> References: <20230707172224.2368067-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 9/9] avradio/sdrdemux: Use 2 differnt FM station detectors 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: mpgZOk696tm8 Detect station if both lie within 1kHz of each other This eliminates some artifacts being detected Signed-off-by: Michael Niedermayer --- libavradio/sdrdemux.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index 4c1ec7b51c..bed74ebd26 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -855,13 +855,17 @@ static int probe_fm(SDRContext *sdr) for (int pass = 0; pass < 2; pass ++) { double avg[2] = {0}, tri = 0; + double mean = 0; + double center = 0; for (i = 0; ilen2block[i]; tri += i*sdr->len2block[i]; } + mean = tri; for (; i<2*half_bw_i; i++) { avg[1] += sdr->len2block[i]; tri += (2*half_bw_i-i)*sdr->len2block[i]; + mean += i*sdr->len2block[i]; } for(i = half_bw_i; i<2*sdr->block_size - half_bw_i; i++) { @@ -871,6 +875,10 @@ static int probe_fm(SDRContext *sdr) b += avg[1]; tri += avg[1] - avg[0]; + mean += (i+half_bw_i)*sdr->len2block[i+half_bw_i]; + center = mean / b; + mean -= (i-half_bw_i)*sdr->len2block[i-half_bw_i]; + if (i < border_i || i > 2*sdr->block_size - border_i) continue; @@ -884,6 +892,7 @@ static int probe_fm(SDRContext *sdr) if (last_score[1] >= last_score[0] && last_score[1] > last_score[2] && last_score[1] > sdr->fm_threshold) { + double score = last_score[1]; float rmax = max_in_range(sdr, i-half_bw_i/4, i+half_bw_i/4); int lowcount = countbelow(sdr, i-half_bw_i/4, i+half_bw_i/4, rmax / 100); @@ -898,7 +907,12 @@ static int probe_fm(SDRContext *sdr) if (peak_i < 0) continue; av_assert0(fabs(peak_i-i) < 2); - create_candidate_station(sdr, FM, peak_i * 0.5 * sdr->sdr_sample_rate / sdr->block_size + sdr->block_center_freq - sdr->sdr_sample_rate/2, bandwidth_f, bandwidth_p2, last_score[1]); + double f = peak_i * 0.5 * sdr->sdr_sample_rate / sdr->block_size + sdr->block_center_freq - sdr->sdr_sample_rate/2; + double f2 = center * 0.5 * sdr->sdr_sample_rate / sdr->block_size + sdr->block_center_freq - sdr->sdr_sample_rate/2; + + if (fabs(f2 - f) > 1000) + continue; + create_candidate_station(sdr, FM, f2, bandwidth_f, bandwidth_p2, score); } } }