From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 10/12] avradio/avformat/sdrdemux: fix off by 2 FM bandwidth error
Date: Mon, 31 Jul 2023 00:11:29 +0200
Message-ID: <20230730221131.1205193-10-michael@niedermayer.cc> (raw)
In-Reply-To: <20230730221131.1205193-1-michael@niedermayer.cc>
Also adjust related parameters
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/sdrdemux.c | 8 ++++----
tests/ref/fate/sdr-am | 25 ++++++++++++-------------
tests/ref/fate/sdr-fm | 14 +++++++-------
3 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/libavformat/sdrdemux.c b/libavformat/sdrdemux.c
index 0e327f4860..a40346ff31 100644
--- a/libavformat/sdrdemux.c
+++ b/libavformat/sdrdemux.c
@@ -704,7 +704,7 @@ static int demodulate_am(SDRContext *sdr, Station *station, AVStream *st, AVPack
double freq = station->frequency;
int64_t bandwidth = station->bandwidth;
int index = lrint(F2INDEX(freq));
- int len = (bandwidth * 2ll * sdr->block_size + sdr->sdr_sample_rate/2) / sdr->sdr_sample_rate;
+ int len = (bandwidth * 1ll * sdr->block_size + sdr->sdr_sample_rate/2) / sdr->sdr_sample_rate;
float *newbuf;
float scale;
int sample_rate = sdr->sdr_sample_rate * (int64_t)sdr->am_block_size / sdr->block_size;
@@ -1030,7 +1030,7 @@ static int demodulate_fm(SDRContext *sdr, Station *station, AVStream *st, AVPack
double freq = station->frequency;
int64_t bandwidth = station->bandwidth;
int index = lrint(F2INDEX(freq));
- int len = (bandwidth * 2ll * sdr->block_size + sdr->sdr_sample_rate/2) / sdr->sdr_sample_rate;
+ int len = (bandwidth * 1ll * sdr->block_size + sdr->sdr_sample_rate/2) / sdr->sdr_sample_rate;
float *newbuf;
float scale;
int sample_rate = sdr->sdr_sample_rate * (int64_t)sdr->fm_block_size / sdr->block_size;
@@ -1687,11 +1687,11 @@ int avpriv_sdr_common_init(AVFormatContext *s)
av_log(s, AV_LOG_INFO, "Block size %d\n", sdr->block_size);
sdr->block_time = sdr->block_size / (double)sdr->sdr_sample_rate;
- sdr->am_bandwidth = 6 * 1000;
+ sdr->am_bandwidth = 12 * 1000;
sdr->fm_bandwidth = 180 * 1000;
sdr->fm_bandwidth_p2 = 16.5 * 1000; // Officially Stereo Broadcast FM has 15khz audio bandwidth
- sdr->am_block_size = find_block_size(sdr, sdr->am_bandwidth);
+ sdr->am_block_size = find_block_size(sdr, sdr->am_bandwidth / 2);
sdr->fm_block_size = find_block_size(sdr, sdr->fm_bandwidth);
sdr->fm_block_size_p2 = find_block_size(sdr, sdr->fm_bandwidth_p2);
diff --git a/tests/ref/fate/sdr-am b/tests/ref/fate/sdr-am
index e2ae353902..992ec1936d 100644
--- a/tests/ref/fate/sdr-am
+++ b/tests/ref/fate/sdr-am
@@ -30,18 +30,17 @@
#channel_layout_name 5: stereo
0, 0, 0, 1, 320000, 0x816a0964
0, 1, 1, 1, 320000, 0x140ce2da
-1, 2048, 2048, 1024, 2048, 0x4d31ff0f
-2, 2048, 2048, 1024, 2048, 0x3cd002ad
-3, 2048, 2048, 1024, 2048, 0x8bdd034d
-4, 2048, 2048, 1024, 2048, 0xc6430169
-1, 3072, 3072, 1024, 2048, 0xb307000d
-2, 3072, 3072, 1024, 2048, 0x3f6d01d4
-3, 3072, 3072, 1024, 2048, 0x2de9fde9
-4, 3072, 3072, 1024, 2048, 0xad7efe6f
+1, 2048, 2048, 1024, 2048, 0x3cd002ad
+2, 2048, 2048, 1024, 2048, 0x8bdd034d
+3, 2048, 2048, 1024, 2048, 0xc6430169
+1, 3072, 3072, 1024, 2048, 0x3f6d01d4
+2, 3072, 3072, 1024, 2048, 0x2de9fde9
+3, 3072, 3072, 1024, 2048, 0xad7efe6f
+4, 3072, 3072, 1024, 2048, 0x2c18fef7
5, 3072, 3072, 1024, 2048, 0x9c840168
-1, 4096, 4096, 1024, 2048, 0x7e7cfe03
-2, 4096, 4096, 1024, 2048, 0x6561fc7b
-3, 4096, 4096, 1024, 2048, 0xdcd6ff8d
-4, 4096, 4096, 1024, 2048, 0xedac0493
+1, 4096, 4096, 1024, 2048, 0x6561fc7b
+2, 4096, 4096, 1024, 2048, 0xdcd6ff8d
+3, 4096, 4096, 1024, 2048, 0xedac0493
+4, 4096, 4096, 1024, 2048, 0x7e7cfe03
5, 4096, 4096, 1024, 2048, 0x970a0066
-0, 3, 3, 1, 320000, 0x6ea8fa49
+0, 3, 3, 1, 320000, 0x76d901a2
diff --git a/tests/ref/fate/sdr-fm b/tests/ref/fate/sdr-fm
index 3ae5adc2c0..97a2320a2a 100644
--- a/tests/ref/fate/sdr-fm
+++ b/tests/ref/fate/sdr-fm
@@ -15,11 +15,11 @@
#channel_layout_name 2: stereo
0, 0, 0, 1, 320000, 0xf553af75
0, 1, 1, 1, 320000, 0xeabc15b3
-1, 8196, 8196, 4096, 8192, 0x585d090e
-2, 8196, 8196, 4096, 8192, 0xb966fb19
-1, 12292, 12292, 4096, 8192, 0x6d8ffe6e
-2, 12292, 12292, 4096, 8192, 0x51d1fb50
+1, 8196, 8196, 4096, 8192, 0x4af5090c
+2, 8196, 8196, 4096, 8192, 0x8e43fafd
+1, 12292, 12292, 4096, 8192, 0x39fbfe6a
+2, 12292, 12292, 4096, 8192, 0x7febfb59
0, 3, 3, 1, 320000, 0xf8b7b144
-1, 16388, 16388, 4096, 8192, 0x8c000600
-2, 16388, 16388, 4096, 8192, 0x335ff20c
-0, 4, 4, 1, 320000, 0xab42bbc7
+1, 16388, 16388, 4096, 8192, 0x886a05fe
+2, 16388, 16388, 4096, 8192, 0x0b2cf20d
+0, 4, 4, 1, 320000, 0xf3a3bf66
--
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-30 22:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-30 22:11 [FFmpeg-devel] [PATCH 01/12] avradio/avformat/sdrdemux: Move agc_gain into local variable Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 02/12] avradio/avformat/sdrdemux: Move Software AGC into buffer thread Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 03/12] avradio/avdevice/sdrindev: Soapy / RTLSDR ignores gain in direct sampling mode Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 04/12] avradio/avformat/sdrdemux: only update agc_gain on success Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 05/12] avradio/avformat/sdrdemux: delay station search on AGC adjust Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 06/12] avradio/avformat/sdrdemux: run clip check on the correct samples Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 07/12] avradio/avformat/sdrdemux: Avoid uninitialized memory on mono -> stereo switch Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 08/12] avradio/avformat/sdrdemux: set wanted gain also when manually set Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 09/12] avradio/avformat/sdrdemux: dont use a fuction name as local variable Michael Niedermayer
2023-07-30 22:11 ` Michael Niedermayer [this message]
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 11/12] avradio/avformat/sdrdemux: fix FM block size Michael Niedermayer
2023-07-30 22:11 ` [FFmpeg-devel] [PATCH 12/12] avradio/avformat/sdrdemux: replace heuristic FM scaling by logic Michael Niedermayer
2023-07-30 22:26 ` [FFmpeg-devel] [PATCH 01/12] avradio/avformat/sdrdemux: Move agc_gain into local variable Paul B Mahol
2023-08-10 21:03 ` Michael Niedermayer
2023-08-10 23:03 ` Paul B Mahol
2023-09-08 13:24 ` Michael Niedermayer
2023-09-09 10:34 ` Paul B Mahol
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=20230730221131.1205193-10-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