From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: [FFmpeg-devel] [PATCH 11/12] avradio/avformat/sdrdemux: fix FM block size Date: Mon, 31 Jul 2023 00:11:30 +0200 Message-ID: <20230730221131.1205193-11-michael@niedermayer.cc> (raw) In-Reply-To: <20230730221131.1205193-1-michael@niedermayer.cc> 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@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 _______________________________________________ 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 ` [FFmpeg-devel] [PATCH 10/12] avradio/avformat/sdrdemux: fix off by 2 FM bandwidth error Michael Niedermayer 2023-07-30 22:11 ` Michael Niedermayer [this message] 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-11-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