From patchwork Thu Jun 17 02:31:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28448 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp202118iol; Wed, 16 Jun 2021 19:37:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJMt7P5bgkUPMNW/BCCqpGRPNtT0NyPfS3z6lhti9EUq0LhzyCTk4HxYMKl5c1kY1iEv8S X-Received: by 2002:aa7:cdc8:: with SMTP id h8mr3323185edw.323.1623897444197; Wed, 16 Jun 2021 19:37:24 -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 bz5si3921253ejc.12.2021.06.16.19.37.23; Wed, 16 Jun 2021 19:37:24 -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=UUhmUw9K; 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 DECE9689E9A; Thu, 17 Jun 2021 05:33:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074061.outbound.protection.outlook.com [40.92.74.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF2C2689B19 for ; Thu, 17 Jun 2021 05:33:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aLWSMkBxGwgxBf0lXONs1XN1g9nKdQ2N0MLOTZWhhKZQIblxshBgP8JSoyb4AzO8CqyoVUZbvEKfH9qxKOaKPctJVLCBjqa+XBKFYB9vjZ51Hed6pcIt4MfsitHzrthGYbJO0k0Nifu5g1M+RliwgWapO+XMt9y8A5TbLFopMq2USmYHeI2lbzoxpVVNA1LwfsjqXLE/Ur/bIWcqEuKJMVzKkhUGAuYpSTQyE6acDWe+Ta5ue9SmeUYU547If8ynQVob6uBSsGnkNnR0CMhFBZs+7I0r8BnkLChvLuHKDgMxDr+43JSpfqSG5mOwA0jRdF7LtadL67r+reyBLbgClA== 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=WiEajiDKGFQkCH52BPfRLwqByY77bOwcVhyaiE2JCLI=; b=KtiBWlvqc+pC7WWKYNyrFS55ius9y4ySekanHSl3iTEXLJLg9rAXhCp87bQF31htWIb3/Ee6D5yt80P7+gYamHkwAgyORg9kPi1KEoUWmi9DF+6AwaC/6AUwrvzq3pLrIf/id1ZKYtMBrlD3/iIsOfvgaxUuiQ1FhsbVS/bKAMki2/yc7pmYoZrdP6tQRvUpBMiVSTD9gMezbCBkv89eS3gg1jggaPfLOVo71FJrLUYiBLPQ389ZXQzfkNlY2gp+FGPk1E45F5m2EWyUWsMJ8a9abdNQdsU5HZ5JW8yLONlVp9h+GG+eUCEum5m6X66lHwv5AFUFyKeB4q7lWBJeZg== 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=WiEajiDKGFQkCH52BPfRLwqByY77bOwcVhyaiE2JCLI=; b=UUhmUw9KOF255z6MAc+GDZtZUr+ILVjxOOM7I+lEzKznO4MVoD6xeqpbuajY6+gA6UnIo1xtlS5iWz7+sHDPerMe/WwMYKaW+jVIiRIiqG/KPJXshXixA1k99RZu5mj5E5ltjndOCHKEVCY/m4lRrYcQLiVYA0WWYsCGEt32mJwufcqp7xaEG+TFg/p7MDYh8chYk404Af7AiLTvVcp10ALSXFmYmY6e8xwLxoc2V3NQXQHIbJwc01a9niMGGabfZASRX8P2lPBwXnMDlxIuKRhbW2cUl7eIO+sWCBOQguwR1UmYHpgeGx4bp4oFy9euCaYZLUnHQrlYkgYiUFEAfQ== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::42) by HE1EUR04HT098.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Thu, 17 Jun 2021 02:33:24 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::4b) by HE1EUR04FT053.mail.protection.outlook.com (2a01:111:e400:7e0d::298) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:24 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F8344DA133C779D5114A9996B6155F2B7D9AE690ECFE67F1B985EA3EA5B795BE; UpperCasedChecksum:FFC1FEB53CF675AF02CCF9462700F9ABB4A15938E4F142A09B1F3A27DCE34207; SizeAsReceived:7571; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4242.019; Thu, 17 Jun 2021 02:33:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:50 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [WUdDvMsZ9KnXT0uBK/2wl32N+wyR2d/M] X-ClientProxiedBy: AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210617023202.1318312-28-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:23 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c095ca31-ad46-4009-57c9-08d93138477a X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULuBil78Tl/c0OuVoBVXnkCpUUvezLxCsLJsE5pUO9uNQpT8ChoX3J1E3EfG/o5S2im1zWlvwoVs2lfyCkgaoRNK7/5vsTEwqhpseR2YCVt2FSSLs0CfFL9GHGJhxK8nj1rAur3zWmULc2dPXXWmOMA15FD0J6CHwRwMrKWbOUI8bvqwX9vjU4/pU+PcjTPJjYxDgcjfBgUS25eil2ubuRwsAfvqVZP6I2b+CPJG9xDPSEhxoWqTdfQhiK/mQKrYcGcHiEj1ofOIw9OiupCTM16/MSgBg4sWvAKomxrLz+6bi0bEw1QwTB58LFnICggm2ObudtYoeu2Z7JV9i+6b0nnDWDVyPcdHKhmiB4ZeUuWkmSQZ5RYeMEYZ24mOaI1zU0PANd+YKvgLMBZS5mk9yPD7HIH7XPcuRcrLoSxHPx8Z6C+6DLIYcZGlBVrwJDhLFT6n86cERQJWmlPs7QLmD04FYFdudWJ85voJsMc4PCUGtE2OTXK/Gscqbj2cMpxPeOrW6LMlV/MwM220lpenAZDCk9uOoph/Sv5XT0HgjZN67yx6S4LuafKdNdsQbr08J/DzOQFpGUIdVpJUjnyf+46vXgbrO4SkXiJNMAeZNHXy20mQdauLnbSTY+pV2nbPZIFY4Kh/bBjkWnTE0EexPPxQfzqFn9qX2pMXRK+/Uyjm04nhxf03/yuvrq5Yq5Teo3ugo47nGAglw== X-MS-TrafficTypeDiagnostic: HE1EUR04HT098: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +uRkEtFOVvO+c4vHiB3zc6BXXooffSTXuzWWdQX+JAdx3sie8b44v5tq9MyuWRpxIDECqmeqtc1Hal+0QP/MgUBnRI7LQsBK/1iUlhcM3E+K9x4eKXV4XcZcKy/geZa/Gn4s0aZY5NlszEkTBQwMapStq7KRiioA8nnsY/XukJGXSVvh0bLTxbEvFmE8t5eQ2CVinFCTrfGjYbr4ZwGcfNUX14V6f+PyDGMwqbrfq8Kg0HFFTyQC9JqxqyFDwN+85lfYwo8ZoBpLADTgcBWvLpomcK7+A9MWVQjadBtP1ywBie2YePvX5W+Fkl3CPWIB6EtuR/KEh9mU3Y8YLMsR3owq9J4pNbgcoEGGObmxOwEg/X9zrzdLYK0NX3wiotlu8VrDyXeuGzRWhEd9KiOVWg== X-MS-Exchange-AntiSpam-MessageData: RXoGmkZMnEZ09VLVpyt/aNXdQ0rYTETC3vzPuk4dDPj68VXmrdLbT09vdM4qGln9OGlVebXhiD5ysmUe8UVZCFOeS2auYJHGy4wYMDiUthlxPVqQ0FNAilM5a23BDCJeK/rvvLrTIVWz1VYfGzBXvA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c095ca31-ad46-4009-57c9-08d93138477a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:23.9204 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT053.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT098 Subject: [FFmpeg-devel] [PATCH 29/41] avcodec/adpcm: Fix indentation 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: cpcJAbIgSugY Signed-off-by: Andreas Rheinhardt --- libavcodec/adpcm.c | 76 +++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index f9e092af2d..15aea639dc 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1034,18 +1034,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } bytestream2_skip(&gb, avctx->block_align - avctx->channels * 4); } else { - for (int n = 0; n < (nb_samples - 1) / 8; n++) { - for (int i = 0; i < avctx->channels; i++) { - ADPCMChannelStatus *cs = &c->status[i]; - samples = &samples_p[i][1 + n * 8]; - for (int m = 0; m < 8; m += 2) { - int v = bytestream2_get_byteu(&gb); - samples[m ] = adpcm_ima_expand_nibble(cs, v & 0x0F, 3); - samples[m + 1] = adpcm_ima_expand_nibble(cs, v >> 4 , 3); + for (int n = 0; n < (nb_samples - 1) / 8; n++) { + for (int i = 0; i < avctx->channels; i++) { + ADPCMChannelStatus *cs = &c->status[i]; + samples = &samples_p[i][1 + n * 8]; + for (int m = 0; m < 8; m += 2) { + int v = bytestream2_get_byteu(&gb); + samples[m ] = adpcm_ima_expand_nibble(cs, v & 0x0F, 3); + samples[m + 1] = adpcm_ima_expand_nibble(cs, v >> 4 , 3); + } } } } - } break; case AV_CODEC_ID_ADPCM_4XM: for (int i = 0; i < avctx->channels; i++) @@ -1823,41 +1823,41 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } for (int m = 0; m < blocks; m++) { - for (int channel = 0; channel < avctx->channels; channel++) { - int prev1 = c->status[channel].sample1; - int prev2 = c->status[channel].sample2; + for (int channel = 0; channel < avctx->channels; channel++) { + int prev1 = c->status[channel].sample1; + int prev2 = c->status[channel].sample2; - samples = samples_p[channel] + m * 16; - /* Read in every sample for this channel. */ - for (int i = 0; i < samples_per_block; i++) { - int byte = bytestream2_get_byteu(&gb); - int scale = 1 << (byte >> 4); - int index = byte & 0xf; - int factor1 = ff_adpcm_afc_coeffs[0][index]; - int factor2 = ff_adpcm_afc_coeffs[1][index]; + samples = samples_p[channel] + m * 16; + /* Read in every sample for this channel. */ + for (int i = 0; i < samples_per_block; i++) { + int byte = bytestream2_get_byteu(&gb); + int scale = 1 << (byte >> 4); + int index = byte & 0xf; + int factor1 = ff_adpcm_afc_coeffs[0][index]; + int factor2 = ff_adpcm_afc_coeffs[1][index]; - /* Decode 16 samples. */ - for (int n = 0; n < 16; n++) { - int32_t sampledat; + /* Decode 16 samples. */ + for (int n = 0; n < 16; n++) { + int32_t sampledat; - if (n & 1) { - sampledat = sign_extend(byte, 4); - } else { - byte = bytestream2_get_byteu(&gb); - sampledat = sign_extend(byte >> 4, 4); - } + if (n & 1) { + sampledat = sign_extend(byte, 4); + } else { + byte = bytestream2_get_byteu(&gb); + sampledat = sign_extend(byte >> 4, 4); + } - sampledat = ((prev1 * factor1 + prev2 * factor2) >> 11) + - sampledat * scale; - *samples = av_clip_int16(sampledat); - prev2 = prev1; - prev1 = *samples++; + sampledat = ((prev1 * factor1 + prev2 * factor2) >> 11) + + sampledat * scale; + *samples = av_clip_int16(sampledat); + prev2 = prev1; + prev1 = *samples++; + } } - } - c->status[channel].sample1 = prev1; - c->status[channel].sample2 = prev2; - } + c->status[channel].sample1 = prev1; + c->status[channel].sample2 = prev2; + } } bytestream2_seek(&gb, 0, SEEK_END); break;