From patchwork Mon Jul 10 00:01:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42570 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp360517pzb; Sun, 9 Jul 2023 17:01:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlGXtGVcDok9aQAIlKHXJVsxSC4cS43PNG2HTLQKID0/A8l+wpsse/h2rKXCxXi5uzgULBRl X-Received: by 2002:a05:651c:120c:b0:2b5:80e0:f18e with SMTP id i12-20020a05651c120c00b002b580e0f18emr8444372lja.3.1688947287171; Sun, 09 Jul 2023 17:01:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688947287; cv=none; d=google.com; s=arc-20160816; b=LJCMOWhzaor6C6pRqT+D6t1Xrq5yYI8n0tKFCy1J66cx0QSqAZT7yOgh2TiowrZeV5 4vYCIsOYhCgIt5CJ7ItMZUJOTjbE0BrQwBKWtEeBIS6kXzd79knag3ljhh0WCOV/GjYL cKySIx7cphp6DnVghNLzWE2VsGwVuXXYUOkrLOGQbVDKWWqKHOr8H9THMQthTae/kySn jxhqCFMez65WyWnsWBMM/gnU0rRq9DTynJi956fXKB8iYRJJy+lctJzl9O5By5wglVNc aiG3g6hsW0okXyfiFnuCBoBsyGpWUxZGWKT8awfTUku8ZBGCKTVgPHHPlGpm/Upfo4K0 s4ig== 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=9AIsISo9Z/txye1UAgV3I+/XTcFSE5DMtbK7KEkw5qk=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=jnjWpBjsUFdgOJYgUx9qTo/BsLIWlbrHz86/gCUA+g9WT2WTGh2SxFv0xn6OHypyAE eEJWIQX/LStgFfgUtia6vHb48FDgylXJcR92kWegFGI/lKUEo8A81tGY/PqpHHjgc1cf f+5pu8XLkUeCPcc1VHAVtXgF5VkjU45/8jLIkeZ5gCsw7u4J5T0S/jmxokdv0SO4gSTc YPCSDjXS3rLrDCItWSt6S3BCAFXg1t0DmiB51Ixx1dnEyn4pLlB8MpATDrZJ2zdtPbxl ygnWpWGXaW99a33rd7NvsYvAyseK3gTeOndmH/5oebBgAYoKMCKdzSr5W2sG/shE/m5g IC3Q== 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 qn4-20020a170907210400b0099317635beesi6575542ejb.470.2023.07.09.17.01.26; Sun, 09 Jul 2023 17:01:27 -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 8806368C65B; Mon, 10 Jul 2023 03:01:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 173E968C580 for ; Mon, 10 Jul 2023 03:01:08 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 460EE60002 for ; Mon, 10 Jul 2023 00:01:07 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 10 Jul 2023 02:01:01 +0200 Message-Id: <20230710000104.3597392-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230710000104.3597392-1-michael@niedermayer.cc> References: <20230710000104.3597392-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avradio/sdrdemux: shift 19khz carrier differntly 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: 1RnfrSrDCRZS This simplifies the following commits Signed-off-by: Michael Niedermayer --- libavradio/sdrdemux.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index 92b218d899..ef8a8a91d3 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -983,15 +983,17 @@ static int demodulate_fm(SDRContext *sdr, int stream_index, AVPacket *pkt) carrier19_i = lrint(carrier19_i_exact); if (carrier19_i >= 0) { - int shift = carrier19_i/2; i = sst->block_size; memset(sst->block + i, 0, 2*sst->block_size_p2 * sizeof(AVComplexFloat)); - memcpy(sst->block + i + carrier19_i - W - shift , sst->block + carrier19_i - W, sizeof(AVComplexFloat)*(2*W+1)); + memcpy(sst->block + i, sst->block + carrier19_i, sizeof(AVComplexFloat)*(W+1)); + memcpy(sst->block + i + 2*sst->block_size_p2 - W, sst->block + carrier19_i - W, sizeof(AVComplexFloat)*W); sst->ifft_p2(sst->ifft_p2_ctx, sst->icarrier, sst->block + i, sizeof(AVComplexFloat)); - memcpy(sst->block + i + 2*carrier19_i - 2*shift - len17_i, sst->block + 2*carrier19_i - len17_i, sizeof(AVComplexFloat)*2*len17_i); - apply_deemphasis(sdr, sst->block + i + 2*carrier19_i - 2*shift, sst->block_size_p2, sample_rate_p2, + 1); - apply_deemphasis(sdr, sst->block + i + 2*carrier19_i - 2*shift, sst->block_size_p2, sample_rate_p2, - 1); + memcpy(sst->block + i, sst->block + 2*carrier19_i, sizeof(AVComplexFloat)*len17_i); + memcpy(sst->block + i + 2*sst->block_size_p2 - len17_i, sst->block + 2*carrier19_i - len17_i, sizeof(AVComplexFloat)*len17_i); + + apply_deemphasis(sdr, sst->block + i, sst->block_size_p2, sample_rate_p2, + 1); + apply_deemphasis(sdr, sst->block + i + 2*sst->block_size_p2, sst->block_size_p2, sample_rate_p2, - 1); sst->ifft_p2(sst->ifft_p2_ctx, sst->iside , sst->block + i, sizeof(AVComplexFloat)); synchronous_am_demodulationN(sst->iside, sst->icarrier, sst->window_p2, 2*sst->block_size_p2, 2); }