From patchwork Fri Aug 6 16:17:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29317 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp658607ioh; Fri, 6 Aug 2021 09:17:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdJ05DtPAGyRWBXUCqGT9usivoc4fIPcmHp3iZypTEOC2SoFXarCRUFQSu2V9Y+l0xW9xW X-Received: by 2002:aa7:db93:: with SMTP id u19mr14006883edt.227.1628266665456; Fri, 06 Aug 2021 09:17:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o24si9641151edi.16.2021.08.06.09.17.44; Fri, 06 Aug 2021 09:17:45 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=idPPElbs; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5115688156; Fri, 6 Aug 2021 19:17:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065061.outbound.protection.outlook.com [40.92.65.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6A55688156 for ; Fri, 6 Aug 2021 19:17:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mr3qK+56G39pJRrKFEGOdPg6oUvOHg4v62f3VbdHGGemQTI5sOkDCYXXltUeD6aWctiaxmr8jCzxLNvZRkuAIFAO/KQlaoh8eDhcJH3c31CqXT3XgyZpxSxX089/mfKnhf0bzW3q+UGY6UbOqShbXNtNtdKLMFcnRpjglo/xNKHiCkQfjRWOJmB3aagnoPVrf3WNuxvSRaPBqWbBf9fh35718qGsg4OQIY3ceDo9Aa4to2krffO+hdJEthpPJwOLJqYdWhJvU5ChxdVNVVCE5gbKl1KKDlJRarBwzuABo6yLee082S5nkzDw7nPnGTRUcRWZV+kjBq66rz7Ijjl8EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TsieEEDHQiKVn5G2LcM+tk49c9vBFScSVn8J4ArKufw=; b=DcF1imZljVObhRJdXslE8v5G3V0PTBRNB17XlUhMDK5Bg7vjh6HBCNwxl86RpOrd5RChO+Sl2C143i/7IIYubsDgZteqMI7IMazyi5H1WcVpNUj59TwLI32zokVwOjN5SuiSCWxfhyorMdk6MugjPuXXlVthTgdCkT5rPEgXoOUfiqKYWBC08iNNf48z8vD77Fd13ZFh0v+n4swy7Cyco5b5xbY/fr0CDqrpNjzsqr1SSOLbZ5j1I3Fo2cT4B6yM6F0oNpI6/PwqePSGf7lwCnWamA0jm+VrNuIOsA+3ulLMeSLKFYDZ/bAkxogvTTlyOud3fJhuK0DtOrxHxk1cTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TsieEEDHQiKVn5G2LcM+tk49c9vBFScSVn8J4ArKufw=; b=idPPElbs08hB3BvrIiMYIEgztcaN0tgXLaFeonFDfNarfHG6gUF6jyamR88tV26QaFcy9eON6IYGtedG1NNN7VXlYKyVxO5Qs/aIYPBtlGUXMRW2m+CMecSlQX57S55yWyzyTipEIxfyPYrcuXyl5EVPNtwhXT3VBWIziy8cgR2rBakz0yrf3chJJzM2rLqnrKeQ4y/C6Jtc8QHKV0mXQUT57vYm6V03chwiTh9+iZDAmpUAQgVNoh0vAE0dSQv2IFED1zvtwdON+qx/B3ftMio1wk8c/c80qPZ3T2J7wBmj5tzdRh1tLNS3wlD14qPumaR36i8CetIlnOL6oj5vPw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4696.eurprd03.prod.outlook.com (2603:10a6:20b:d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Fri, 6 Aug 2021 16:17:33 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.028; Fri, 6 Aug 2021 16:17:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Aug 2021 18:17:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [AwxGQTXDbW70fLiSmiFYNs7kUw0oU4J8] X-ClientProxiedBy: PR0P264CA0125.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210806161725.2999146-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by PR0P264CA0125.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Fri, 6 Aug 2021 16:17:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba039e49-3bf7-4c90-9942-08d958f5b23f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNW/RTKLcra1Z6S3RYdFw2XmhYluMMLVFlCIwxQ/CHd04liikUInNxf6AiRb+ZZJ6+keq+NHLU0Fhrzp5V/SBg+jT/Nu2WkJ4yWy3bWHuPVSLcyHtV8Bta+QxT+H89m+gCIeHRzVp/6wlkPAPztiQUJb4CBBmR2EExX2Nc55d7cgndXT7H8Viq+fa8yB+ztT+BV2+q2bahoSicgCX0NfV8OB6LxQMqY4pjQjrX8KT08Jm68zJATUR6aXDU8g3wv3AejjKwWeHI6DJiGNQJvsjuesNOMfkbtiSEhol16TGgq1YXv+guWUrRlRnkIqmFLdEr/qRHNwAj9BaRLhUWCtw2s330mudMmYeg5KemlFGefQdbTXALjYG+cBOrCziD8xwiAtIdV1v3+PmrMM97EJhWziBaRadfkafKrJbyq+aSO9oWeobXx0AJZQNth4eWVP2/H+r+ffBHGTE8sF3oQuSU0VV1R9Vk+15SMCwJjtDyJj3Oegv2DlDrbt8ZQGdtQ5C79nb9jt55y2m1UCnkRZLyVcSAYhsnpkWCt0zXrJHYZz/mHrb53aXLP1l4nynzmOKZT41vnsEP/ekvp1JC0kXFohkEM5hsLU444QNAAQNsm3M4Wj0SqWkwlF9M5BpGcYYGQN9UF7Y9XXdzwQwbRalpnN4xnYoq2bcx6tLTTiBhXlSk468UfU7HoMh55nyt7lZH5spcBz7sbGqbbdT0jlScWnwaE7At3OjO8= X-MS-TrafficTypeDiagnostic: AM6PR03MB4696: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1wVsaSkxsQ/97o7PVq23qniGUsRPKyOs9ChVRP2wwPTmGIgFdCSYp0LtEU1nenKdwR5YPT47lHhmyaeOsRXqoqz+xUyDqKL02enhCky6C1n0y5zzP8Pbu5NwdyPzz/foXLVci5KzxK4fZo5SbNExS727nm7WmUS2jpPOCcJnAZXcA867wqYF9IFNBvYC8eRkEkI0x5FZEMe4azcVDf2jhA8PWf3Fa0DONT0Bbb+lX+kd9qZqr7vBJ6sB7x5y1jGoWdArVxPg8YyYgxbO7fHdAHt+O8immc8DKFVSFakEOfFoEq2pxzgy9LHnnqN0jku9X3TxiKxwE4mnRk62GaDHNdh0jNmB7nU65mLZq00h2T81gJXw8MOgzU7cEpMuvE6/zl9nQebL69jaL9BHqY2R6gkEOIXaRX6RTs3aNaMa9UzwE/oxkGw0CTbdaFZLb/ia X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vmABZa7cZqBdQPpvzEWNKwL1GwUa+GIFexw6CMr2IYUl0GrCv1t1DksvG/gi0C1hpxHqNhvLXMr77SBR74tg8G/56feGcHapvCTyb0NE9kpAFW++WQSvwykfDoyErB3I1Gagt1iSiUv6Q4UntF9c5w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba039e49-3bf7-4c90-9942-08d958f5b23f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2021 16:17:33.2879 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4696 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/acelp_vectors: Add missing brackets 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GL4IG9Mbl1Dk Before 3793caa5e2d1d16ed45771574b2ffc932497cfcf the code was "if (...) do { ... } while (...);". After said commit this became "if (...) av_assert0(...); do { ... } while (...);", i.e. the loop is always executed. This commit changes the logic to what it was before said commit. Notice that the condition is always true in FATE, so no changes are necessary there. This fixes a -Wmisleading-indentation warning from GCC 11. Signed-off-by: Andreas Rheinhardt --- libavcodec/acelp_vectors.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/acelp_vectors.c b/libavcodec/acelp_vectors.c index 0d4de0e4c3..8adea683c1 100644 --- a/libavcodec/acelp_vectors.c +++ b/libavcodec/acelp_vectors.c @@ -229,13 +229,14 @@ void ff_set_fixed_vector(float *out, const AMRFixed *in, float scale, int size) int x = in->x[i], repeats = !((in->no_repeat_mask >> i) & 1); float y = in->y[i] * scale; - if (in->pitch_lag > 0) + if (in->pitch_lag > 0) { av_assert0(x < size); do { out[x] += y; y *= in->pitch_fac; x += in->pitch_lag; } while (x < size && repeats); + } } }