From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6370245435 for ; Sun, 30 Jul 2023 22:13:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22DBC68C5C5; Mon, 31 Jul 2023 01:11:54 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9C8568C58E for ; Mon, 31 Jul 2023 01:11:48 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 072E2240005 for ; Sun, 30 Jul 2023 22:11:47 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 31 Jul 2023 00:11:31 +0200 Message-Id: <20230730221131.1205193-12-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230730221131.1205193-1-michael@niedermayer.cc> References: <20230730221131.1205193-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 12/12] avradio/avformat/sdrdemux: replace heuristic FM scaling by logic X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Michael Niedermayer --- libavformat/sdrdemux.c | 4 +++- tests/ref/fate/sdr-fm | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libavformat/sdrdemux.c b/libavformat/sdrdemux.c index bda7387213..f8590a2e18 100644 --- a/libavformat/sdrdemux.c +++ b/libavformat/sdrdemux.c @@ -1135,7 +1135,9 @@ static int demodulate_fm(SDRContext *sdr, Station *station, AVStream *st, AVPack if (!newbuf) return AVERROR(ENOMEM); - scale = 5 / (M_PI * 2*sdr->fm_block_size); + //ATAN gives us +-PI the following 2 transforms scale by the given values, we reverse this here + scale = 1.0 / (M_PI * sqrt(2*sdr->fm_block_size * 2*sdr->fm_block_size_p2)); + for(i = 0; ifm_block_size_p2; i++) { float m, q; diff --git a/tests/ref/fate/sdr-fm b/tests/ref/fate/sdr-fm index ef76e4f584..526f53a2bd 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, 0xdd0d10be -2, 8196, 8196, 4096, 8192, 0x98c4f547 -1, 12292, 12292, 4096, 8192, 0xaf58fbdc -2, 12292, 12292, 4096, 8192, 0x6d53f60a +1, 8196, 8196, 4096, 8192, 0x12b50769 +2, 8196, 8196, 4096, 8192, 0xeb93fbff +1, 12292, 12292, 4096, 8192, 0xba21feb7 +2, 12292, 12292, 4096, 8192, 0x3ef2fc7b 0, 3, 3, 1, 320000, 0xf8b7b144 -1, 16388, 16388, 4096, 8192, 0x03640b38 -2, 16388, 16388, 4096, 8192, 0x1216e352 +1, 16388, 16388, 4096, 8192, 0xdea20516 +2, 16388, 16388, 4096, 8192, 0x7538f52b 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".