From patchwork Tue Jul 11 21:19:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42603 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp1731275pzb; Tue, 11 Jul 2023 14:20:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlEkl8PHhqL+pV9j7q8A7Mpu1bK3mXwjWnygWBPgPLb/ZAe1SoQno2VlpGrfMeNaHo60XKKV X-Received: by 2002:a17:906:943:b0:992:a9ba:b8da with SMTP id j3-20020a170906094300b00992a9bab8damr14071891ejd.70.1689110425945; Tue, 11 Jul 2023 14:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689110425; cv=none; d=google.com; s=arc-20160816; b=pjkNrfh4De9BR4KzvoloYjVbpORPJu4uNpUjdEakVLxx9M27T7CTuTkdQaDWQjWlBq a+7BfTWEr7gQz35bha2f5DXbMcCCf0Jiq3lQz7NPOqjJDNUQxWXkQ/PHXh1O9WkjqQRh mSfMYW2HCsLhkiRvMnxWEJ6kkl71PMxiwkg46gV/6C0FGLuRIGZzcKSRYMkOh84hGtAd dVm00JrbQJ3BdRnppy/PvE/CaZwb2kIC8571hrt33dV8XY0DNmEj0aGelUC2IyibmJDE scXfPcZwwaiUfj2xg72uhMWz3Ob5/wozTIaQ1DS4vcHX8SOGqnkqtq8sqJZAUpSFN5Ku VlDA== 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=QQS9/9cRNjTphDnSAqEac8lYi1wTfs+i79qMw2pFYoM=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=Jysg1vRHBgPpICsImAAhV6AHNgHlIX/HOcgAsHqvaYZBstt7FDGaUIGCBwgrDv9FGV Fh861Bm4ZyPk8ka6Jbq47CtR8MuW6DZcksGoiRwAfgIP5bsIwS8MS+ZLUw01L47Nxzsf YCFWQxPq7DGri+OG6n9Cd3h7SP+En7jydGiBfZAXQPm9swZ4Uw6rVfAF+LxRweLrSkrf 5bpSmd5KaE0s2Bf6DPa+f7X9gMRzKwZlpYYS0XSFgc20cTSRgJEEKPWykpVbrQEqJbeq +ZQ8c9gK5j6Okp3qT7eJfyG2n24zOnte7fu286n7lWJ/OwwRP9hp0YzLAm1Wfr6lqJ54 16eg== 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 kb1-20020a1709070f8100b0099202eaf99asi2631524ejc.724.2023.07.11.14.20.25; Tue, 11 Jul 2023 14:20:25 -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 7D03668C630; Wed, 12 Jul 2023 00:19:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCE4D68C61F for ; Wed, 12 Jul 2023 00:19:19 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 52BA6C0008 for ; Tue, 11 Jul 2023 21:19:19 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Jul 2023 23:19:05 +0200 Message-Id: <20230711211910.1257355-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230711211910.1257355-1-michael@niedermayer.cc> References: <20230711211910.1257355-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 07/12] avradio/rds: warnings cleanup 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: yhORXXWTuD7J Signed-off-by: Michael Niedermayer --- libavradio/rds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavradio/rds.c b/libavradio/rds.c index 1392bb0874..99e5360b72 100644 --- a/libavradio/rds.c +++ b/libavradio/rds.c @@ -171,8 +171,10 @@ int ff_sdr_decode_rds(SDRContext *sdr, Station *station, AVComplexFloat *signal) station->rds_ring_pos += sdr->fm_block_size_p2; while (station->rds_ring_pos > IDX(2) + IDX(4*104-1)) { - int best_phase; + int best_phase, step; float best_amplitude = -1; + float last_bpsk = 0; + int best_errors = INT_MAX; for (phase = 0; phase < 2*IDX(2); phase++) { double a = 0; for (i = 0; i<2*104; i++) { @@ -185,7 +187,6 @@ int ff_sdr_decode_rds(SDRContext *sdr, Station *station, AVComplexFloat *signal) } phase = best_phase; - float last_bpsk = 0; for (i = 0; i<2*104; i++) { float bpsk = ring[IDX(2*i+1)][phase] - ring[IDX(2*i)][phase]; if (i) @@ -193,7 +194,6 @@ int ff_sdr_decode_rds(SDRContext *sdr, Station *station, AVComplexFloat *signal) last_bpsk = bpsk; } - int best_errors = INT_MAX; for (phase = 0; phase < 104; phase++) { int error = 0; for (int block = 0; block < 4; block++) { @@ -217,7 +217,7 @@ int ff_sdr_decode_rds(SDRContext *sdr, Station *station, AVComplexFloat *signal) decode_rds_group(sdr, station, group); } } - int step = IDX(2*(best_phase + 103)); + step = IDX(2*(best_phase + 103)); av_assert0(station->rds_ring_pos >= step); memmove(ring, ring + step, (station->rds_ring_pos + sdr->fm_block_size_p2 - step) * sizeof(*station->rds_ring));