Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 3/6] avradio/sdrdemux: Skip probing in the area outside the bandwidth
Date: Wed,  5 Jul 2023 00:22:59 +0200
Message-ID: <20230704222302.1129450-3-michael@niedermayer.cc> (raw)
In-Reply-To: <20230704222302.1129450-1-michael@niedermayer.cc>

---
 libavradio/sdrdemux.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index 39e2e54ee7..90f6805c3b 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -394,6 +394,7 @@ static int probe_am(SDRContext *sdr)
     int i;
     int bandwidth_f = 6000;
     int half_bw_i = bandwidth_f * (int64_t)sdr->block_size / sdr->sdr_sample_rate;
+    int border_i = (sdr->sdr_sample_rate - sdr->bandwidth) * sdr->block_size / sdr->sdr_sample_rate;
     double avg = 0;
 
     if (2*half_bw_i > 2*sdr->block_size)
@@ -408,6 +409,10 @@ static int probe_am(SDRContext *sdr)
         avg += sdr->len2block[i + half_bw_i];
         score = half_bw_i * mid / (avg - mid);
         avg -= sdr->len2block[i - half_bw_i];
+
+        if (i < border_i || i > 2*sdr->block_size - border_i)
+            continue;
+
         //TODO also check for symmetry in the spectrum
         if (mid > 0 && score > AM_THRESHOLD &&
             sdr->len2block[i - 1] <  mid          && sdr->len2block[i + 1] <= mid &&
@@ -703,6 +708,7 @@ static int probe_fm(SDRContext *sdr)
     int half_bw_i = bandwidth_f * (int64_t)sdr->block_size / sdr->sdr_sample_rate;
     double avg[2] = {0}, tri = 0;
     float last_score[3] = {FLT_MAX, FLT_MAX, FLT_MAX};
+    int border_i = (sdr->sdr_sample_rate - sdr->bandwidth) * sdr->block_size / sdr->sdr_sample_rate;
 
     if (2*half_bw_i > 2*sdr->block_size)
         return 0;
@@ -726,6 +732,8 @@ static int probe_fm(SDRContext *sdr)
         last_score[2] = last_score[1];
         last_score[1] = last_score[0];
         last_score[0] = tri / (b * half_bw_i);
+        if (i < border_i || i > 2*sdr->block_size - border_i)
+            continue;
 
         if (last_score[1] >= last_score[0] &&
             last_score[1] > last_score[2] &&
-- 
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".

  parent reply	other threads:[~2023-07-04 22:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-04 22:22 [FFmpeg-devel] [PATCH 1/6] avradio/sdrdemux: end on EOF dont wraparound Michael Niedermayer
2023-07-04 22:22 ` [FFmpeg-devel] [PATCH 2/6] avradio: Fill in missing bandwidth values at 80% of frequency Michael Niedermayer
2023-07-04 22:22 ` Michael Niedermayer [this message]
2023-07-04 22:23 ` [FFmpeg-devel] [PATCH 4/6] avradio/sdrdemux: adjust frequency precission in probing depending on modulation Michael Niedermayer
2023-07-04 22:23 ` [FFmpeg-devel] [PATCH 5/6] avradio/sdrdemux: When searching for stations move in smaller steps Michael Niedermayer
2023-07-04 22:23 ` [FFmpeg-devel] [PATCH 6/6] avradio/sdrdemux: slightly different normalization of FM scores Michael Niedermayer
2023-07-05 23:16 ` [FFmpeg-devel] [PATCH 1/6] avradio/sdrdemux: end on EOF dont wraparound 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=20230704222302.1129450-3-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