From patchwork Sun Jul 30 22:11:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7927:b0:130:ccc6:6c4b with SMTP id b39csp2030688pzg; Sun, 30 Jul 2023 15:13:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlEbHrkV8RPJJhgVCOtaDNvA20ZNqles3UE3SlIkUOpwPLnFzcNHj0JXL0BVHWMC5mvppSXN X-Received: by 2002:a05:6512:b9d:b0:4fd:d64f:c0a6 with SMTP id b29-20020a0565120b9d00b004fdd64fc0a6mr5538869lfv.48.1690755182343; Sun, 30 Jul 2023 15:13:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690755182; cv=none; d=google.com; s=arc-20160816; b=eHCA1xIZmIHxVdwU3PEsRUnkiO0AxgUzG5e0cv8yYL5P+3bzT17ZZmmsd+KVff4EW2 gnZQmEFk/EpRNpYxqxKcBfBW5RANb9kyJ45TbvtBRTtNMcmmNelCpCwhPdRWDdaDN4o5 +LiZ2kTDzHf3VoIWRsKmcYwRwx+KqqDPaj66PJ/G5f2bbDnl/zwAQlBXEKVep7jt4845 cClHfTRZGdGSYIcTAXqStblneiT54eeIQhLPQykBY6NvVkGuPThSNr9t4xIBv38znde9 zU1L5Ek4pVEE62iXXeAGR4Kz3MIpZ0rkUqEQxFs+eUtwP29f5mzJN1IMpWZlaYwcH3Z2 3IKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=T7rJdOmsTB1/KGGWZQJ4+dqYKP1rTsoXEEu8nsvujg8=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=WmxxY7z2AuFYyxvW2tthyDWxtlPoSqDfrtiyVnMVF1LyUtZCDX8XyaC4GhBCkWbhZv nWLNYt/QdOdq0dBnn4d5+cAvege36mkcrLabEXRa3SL6v9t0Vu8LPqjib+YnIDvgTY0z /Z+h09P1HntiFEW150XY7+Y1TtrQ2C89SwT2nGD0z1Xto+7RWMmJZZDX85C7h0OJvjtY 362ipsJ0VNhQ9Z89Cf1nEDF0s9t6cFL4v3oyUnA7cDjUln+V/73mHuI8W0Ll+M2KTXDi 39OCO7iVFsO1PUYtu+1tVz4eggxlqcIg92zqfWbxL0EoMTTUxKhURJRYR0J6RUBhiY2+ wJ5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o5-20020aa7c505000000b00522414e0582si5783999edq.371.2023.07.30.15.13.01; Sun, 30 Jul 2023 15:13:02 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1FC4A68C5B0; Mon, 31 Jul 2023 01:11:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9ED5968C55C for ; Mon, 31 Jul 2023 01:11:47 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E752AFF802 for ; Sun, 30 Jul 2023 22:11:46 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 31 Jul 2023 00:11:30 +0200 Message-Id: <20230730221131.1205193-11-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 11/12] avradio/avformat/sdrdemux: fix FM block size 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M6R+uxbZMKve 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 --- 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