From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 4/7] avradio/sdrdemux: Use a local noise floor in FM Probing
Date: Mon, 17 Jul 2023 02:27:01 +0200
Message-ID: <20230717002704.3092192-4-michael@niedermayer.cc> (raw)
In-Reply-To: <20230717002704.3092192-1-michael@niedermayer.cc>
The global one caused problems when the spectrum is not flat
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavradio/sdrdemux.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index 5a3af23a74..a4c590acf2 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -861,17 +861,20 @@ static int probe_fm(SDRContext *sdr)
int i;
int bandwidth_f = sdr->fm_bandwidth;
int half_bw_i = bandwidth_f * (int64_t)sdr->block_size / sdr->sdr_sample_rate;
+ int floor_bw_i = 10*1000 * (int64_t)sdr->block_size / sdr->sdr_sample_rate;
float last_score[3] = {FLT_MAX, FLT_MAX, FLT_MAX};
int border_i = (sdr->sdr_sample_rate - FFMIN(sdr->bandwidth, sdr->sdr_sample_rate*7/8)) * sdr->block_size / sdr->sdr_sample_rate;
- double noise_floor = FLT_MAX;
if (2*half_bw_i > 2*sdr->block_size)
return 0;
- for (int pass = 0; pass < 2; pass ++) {
+ {
double avg[2] = {0}, tri = 0;
+ double floor[2] = {0};
double mean = 0;
double center = 0;
+ float floor_compensation = half_bw_i * half_bw_i / (float)floor_bw_i;
+
for (i = 0; i<half_bw_i; i++) {
avg[0] += sdr->len2block[i];
tri += i*sdr->len2block[i];
@@ -883,12 +886,19 @@ static int probe_fm(SDRContext *sdr)
mean += i*sdr->len2block[i];
}
+ for (i=0; i<floor_bw_i; i++)
+ floor[0] += sdr->len2block[i];
+ for (i=2*half_bw_i - floor_bw_i; i<2*half_bw_i; i++)
+ floor[1] += sdr->len2block[i];
+
for(i = half_bw_i; i<2*sdr->block_size - half_bw_i; i++) {
double b = avg[0] + sdr->len2block[i];
avg[0] += sdr->len2block[i] - sdr->len2block[i - half_bw_i];
avg[1] -= sdr->len2block[i] - sdr->len2block[i + half_bw_i];
b += avg[1];
tri += avg[1] - avg[0];
+ floor[0] += sdr->len2block[i - half_bw_i + floor_bw_i] - sdr->len2block[i - half_bw_i];
+ floor[1] -= sdr->len2block[i + half_bw_i - floor_bw_i] - sdr->len2block[i + half_bw_i];
mean += (i+half_bw_i)*sdr->len2block[i+half_bw_i];
center = mean / b;
@@ -897,17 +907,24 @@ static int probe_fm(SDRContext *sdr)
if (i < border_i || i > 2*sdr->block_size - border_i)
continue;
- if (pass == 0) {
- noise_floor = FFMIN(noise_floor, tri);
- } else {
+ {
+ float noise_floor;
+ if (i - half_bw_i < border_i) {
+ noise_floor = floor[1];
+ } else if (i + half_bw_i >= 2*sdr->block_size - border_i) {
+ noise_floor = floor[0];
+ } else
+ noise_floor = (floor[0] + floor[1])/2;
+ noise_floor *= floor_compensation;
+
last_score[2] = last_score[1];
last_score[1] = last_score[0];
- last_score[0] = tri / (noise_floor);
+ last_score[0] = tri;
if (last_score[1] >= last_score[0] &&
last_score[1] > last_score[2] &&
- last_score[1] > sdr->fm_threshold) {
- double score = last_score[1];
+ last_score[1] / noise_floor > sdr->fm_threshold) {
+ double score = last_score[1] / noise_floor;
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);
--
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".
next prev parent reply other threads:[~2023-07-17 0:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 0:26 [FFmpeg-devel] [PATCH 1/7] avradio/sdrdemux: icarrier just needs phase 2 block size Michael Niedermayer
2023-07-17 0:26 ` [FFmpeg-devel] [PATCH 2/7] avradio/sdr: compensate for RTLSDR frequency limitations Michael Niedermayer
2023-07-17 0:27 ` [FFmpeg-devel] [PATCH 3/7] avradio/sdrinradio: Print all tunable elements Michael Niedermayer
2023-07-17 0:27 ` Michael Niedermayer [this message]
2023-07-17 0:27 ` [FFmpeg-devel] [PATCH 5/7] avradio/sdrdemux: adjust bandwidth to 200khz for FM probing Michael Niedermayer
2023-07-17 0:27 ` [FFmpeg-devel] [PATCH 6/7] avradio/sdr: Support setting gain value manually and automatic Michael Niedermayer
2023-07-17 0:27 ` [FFmpeg-devel] [PATCH 7/7] avradio/sdr: workaround inverted gain parameter on sdrplay Michael Niedermayer
2023-07-18 21:26 ` [FFmpeg-devel] [PATCH 1/7] avradio/sdrdemux: icarrier just needs phase 2 block size Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230717002704.3092192-4-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git