[FFmpeg-devel] [PATCH 11/12] avradio/avformat/sdrdemux: fix FM block size
Michael Niedermayer
michael at niedermayer.cc
Mon Jul 31 01:11:30 EEST 2023
as we copied twice the bandwith needed previously, we now also
need only half the block size.
Done in a seperate patch for easier bisection
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavformat/sdrdemux.c | 2 +-
tests/ref/fate/sdr-fm | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavformat/sdrdemux.c b/libavformat/sdrdemux.c
index a40346ff31..bda7387213 100644
--- a/libavformat/sdrdemux.c
+++ b/libavformat/sdrdemux.c
@@ -1692,7 +1692,7 @@ int avpriv_sdr_common_init(AVFormatContext *s)
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 / 2);
- sdr->fm_block_size = find_block_size(sdr, sdr->fm_bandwidth);
+ sdr->fm_block_size = find_block_size(sdr, sdr->fm_bandwidth / 2);
sdr->fm_block_size_p2 = find_block_size(sdr, sdr->fm_bandwidth_p2);
sdr->windowed_block = av_malloc(sizeof(*sdr->windowed_block) * 2 * sdr->block_size);
diff --git a/tests/ref/fate/sdr-fm b/tests/ref/fate/sdr-fm
index 97a2320a2a..ef76e4f584 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, 0x4af5090c
-2, 8196, 8196, 4096, 8192, 0x8e43fafd
-1, 12292, 12292, 4096, 8192, 0x39fbfe6a
-2, 12292, 12292, 4096, 8192, 0x7febfb59
+1, 8196, 8196, 4096, 8192, 0xdd0d10be
+2, 8196, 8196, 4096, 8192, 0x98c4f547
+1, 12292, 12292, 4096, 8192, 0xaf58fbdc
+2, 12292, 12292, 4096, 8192, 0x6d53f60a
0, 3, 3, 1, 320000, 0xf8b7b144
-1, 16388, 16388, 4096, 8192, 0x886a05fe
-2, 16388, 16388, 4096, 8192, 0x0b2cf20d
+1, 16388, 16388, 4096, 8192, 0x03640b38
+2, 16388, 16388, 4096, 8192, 0x1216e352
0, 4, 4, 1, 320000, 0xf3a3bf66
--
2.31.1
More information about the ffmpeg-devel
mailing list