From patchwork Mon Dec 6 01:12:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32065 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp5353937qvn; Sun, 5 Dec 2021 17:13:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzD6z3imTa0ZYPw0eHstd8LdJgcDMHl0xkINBGia4Ol9//W+N05/VOKHPYB5OSZg31vkoB4 X-Received: by 2002:aa7:c155:: with SMTP id r21mr50359892edp.124.1638753237024; Sun, 05 Dec 2021 17:13:57 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s2si15432656edx.402.2021.12.05.17.13.56; Sun, 05 Dec 2021 17:13:57 -0800 (PST) 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=orzC0Itg; 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 12C3668AC9C; Mon, 6 Dec 2021 03:13:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074036.outbound.protection.outlook.com [40.92.74.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28DEA68A78A for ; Mon, 6 Dec 2021 03:13:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QxFwVlhqxSt1MqX5LogHymWqlKxkyeBR1fYYmqR5PJSa1oIzFxXmWyeleAffaMitZt4ikRC5U60w+X5fWDR7eKTUPp0uwnSFJZ+aAVMO3IXjXOi+yguhsxvEk1jcxlBOTfyBuHsuAaadE7hNUBrBU4xLMZYlL6gAkfgOBn+13QQHhZVt79EquLGSjm6mgVfOLG77ta0RQfhqvcnlsnhgwLsyo26Tx5shh8X77hbVeRHqv/3VL+oEU9lTl9gsjMhSYdU5YLI4AS4im2I5JF5dN33PWl3LM4FCNgRMq82dpZW6U6/BC/J7f6gC/wXzgcffv+ZaVgS6yo8oZGp2h10UoQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WqndYr+5hFnio7+eGNdlbFq7+UBppKsrkdy/pKeC8oY=; b=GJHwixcjnUEJNdGpJtIjRWI/z7ggRV99nppegHHnEl7NnGubgbGAJHCxC13pDTYaEAbQ6xBHteelTDzFrhS4ipp81nb69h5MImF4SGJ2AtUmpLDuoROZ4KdmM50I4F84hsJioGFOxLob42dUV8up+eKSgNZdTBWJXNZReygJn8HYnsQ6xi6wvxpumCLJsCMUV5VvcKS9aCiFiwB4o5RdmOBt+90B9pigCl+iS42zZ8TrUwSZnxyIiN+2AQdpED6ZLOjwvEn3mqBzNV4mqdEdBZzUd6WTLZ5lC7LmD+nF+Dc9clU4GXAgnsA39dSb31VGBMiyG6g5nWWQtXiH7Bes3Q== 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=WqndYr+5hFnio7+eGNdlbFq7+UBppKsrkdy/pKeC8oY=; b=orzC0Itgs1iZ6TesceUSfh6rkjtCggL1WjWeJixPdywCgq43dXRfcc71X8dFizjfcIhmEVCNFCW5QthX2OSj6knN9g60Nac0nVzZZdAsV+45eXHQN+Ilczzib0VZOMMHPu131q1S7NBi0bJxS44PD9zSn1u0rkYrrV6J9UXwk5jwRP75s68Xl49tuqLW/LlbDI+larzWI4RlNZpzHl5ET7PJl93zUK1PIQAH7K6pefJ0PYiE8i2RolGjWP+MhFfc0QLLV9rqudFkKF0092e5SwrS4BQu5sUzGIRJtYJfpDsxifRTQQkNoxLyC5NSVRVck/dGqcFTljgyZlIPszaNAQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3686.eurprd03.prod.outlook.com (2603:10a6:209:2d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Mon, 6 Dec 2021 01:13:09 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.021; Mon, 6 Dec 2021 01:13:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [znf4187twsDFkH8cPZIiWlzuIMto0oiG] X-ClientProxiedBy: FR3P281CA0055.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211206011246.239514-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by FR3P281CA0055.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Mon, 6 Dec 2021 01:13:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f47bc581-2db9-4d38-4dd5-08d9b8559132 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT2s5ZWgpZq8Fu1c4CoKhX6kH77AbLS0BCOdkYpqWbyrFXpU7hu6JzlAnHvv4pOuelGC7hWnLcSPBwXJ27SBAKtDGTJhlPEeIiq8g2tpsO0zacdIc23+d0nnzjFOx4NhpFa0BrSdoopK3Wt/ffPrAb2GPWeJLITEMi7ftaLJ5djYLYFRQga+ElW4c9o7KZZLYKlPiwkeKWNouU2Du3g8asTrQNle3KMVdVZA1ug0/9I+hvbDkHtQ+dk6xnQyJ06fcWMW1sMUfN80309sND2uZZZeSRddg7Mbn9z194y1KtkX4C2T0cF/d5IJuOvnsRx1PlHLGx4SENVzfLxbZyYVZx3rGpXzwEqnEE27CbJ7FTwCYVFlDDTzrUeUqky91hIOmfrviRiFn1hwv2WnBSsfMzEm76p8P12AMiq0976zqSkKsB8hlQuuETw20+1YJGD8KgTox6KmsX0CLF1XslJQ6R6+cwCp8f6ve7wGusZ0l7RGdggXq/RnFTyO69NZ7rLQnwRk6RjW7DMvFF5RfRnd1Fo7E0oHJq+A4Flm45BsE91+n8EnR68PS9dJo464CODh1rFi+qN6bz31utc4sj9LHiby0i6IsngAGb0q9Jthre3SDSfvRY0enPruJKxpcVXZbMk4msLDAXxIlzbSh6diXVXprMgJuyYkab+IaLekrKwxPLrAGCt2UV7fs3SpVOn+8yTzED44GqzONKz8+aPcGIhEV02kGrw4u9ShSfgPXfw7V6i1lvRo/a3YfJIcKxdl6o= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FgoSkNcstGSsMug7wdSEnQtoSDn3qJl+48JLdHpggs3OXvNrYCI0cwdGwRkJiQfhkOiyMVVvte0VhivlOHH8xV78ksWLnBPVvK2sBqymmeW+wvmN2NAV7uDngqcEOYgw0ozWwtUQ5V2SGEPifx68mQs4f8NrD9LPdtG4D3KkYqIXFwjfT5l8lrHHGmsvkvEId6sRXehwLH6xssT+Y0gN7ZaCKchbBQapQMVCMj4wKUZxlhwhHQ5arVZrfSW64DFqJ3kOgMZaz79ltn97entwCX2ckT3EC3+nao/x9XvMoQhkpLJv84M4u8EQAWMRz/9eyx2Aa8wJTmPZ9Yj+K31tuvXKwBTaE/WsuFbAwAWOSP3Hf0ByBHZeSFrhanpTfKNyNCkH7Zokkq/QT/t/XOZISkKgtgh73DedIHWI8zHU52RScuEnDsM8uardxzESz+Yj09DWmG7U5txZ4wWdrmo3dn6YKy+fNaTbfHWJEFGnp4vqv408DlyGZ/UyPjDIBp9ZWK3BagCFGwTyhzsCzUtfTsYr7KerHSaxBLG0SSbaQLZKBB2ZQunkBhBXRGkzTnrSRsO1BW2dXxuwILApIdNJJw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i3UOj/qPGvbY7vG6zvGVNQdUOY1Vn3Z+PSWVbrA2tL9MBx5I/xC+TkT3veLNxnhTRbxULYK7FUtIpHEPGjZ3ScfbS8xnGx6GV1TWdpOEOq5Zmm4gaaEr0xszkpncRyDsOj+40nRcmKGfzv7wh48n7hRny8W1JT9wd2tGuHzBMH67ZjZ7LKOquMY/f2xdRBuy1wmLlrjzbTcd9Ig+LK83TgP/Jk7XgA0ZIpIFAtItN2KU87DwEyzO/hoj8Eqt7770MOONGUe9TILRPmnplRGOtEWfbB27FvPdTNOcKEBIXld5YzoMEWLD7dP0bUocEnHaMPOR9tpkVkXcUSRITqPOmK1YTvKKIoIcFdORQMfO8BT9BDVAHaJz2l9UeNCcGwIz4XvmL/jYfT//faPP9l2Ex/DYgS04DfQXk+qp/PyH8EGN4rJgESEy2dZAln6nAj8Ce9pU0EZPNJklu3kPGgwiPWJJKNnT/x5eJXnHo+Ee9tgwD126Sh1h1dMC8b5wb+EzK9p+aYxgJPLnB3jezgRSXzdpvBrsoeKvIigxoVHfmg8vaKnbEHZyywdU7CoYsQBjob8hxoUUGRTulno7/C6lynU8q+p2gzQuGcvMi3GeGu75DJQOch4qBakd5O/YuRRykd/ZMiHa36wFDzNEYPoeab7UzgoRzfmwB21WF0eI4TnBgVVpH5Nos5OcicXtPYtulvYzRIC/wIU8gcISgd3JB76cF718HIPy/czWow6eSjjdoqRu7mvzz0/HW41lSmNjLhE4ttu+dYRfOhVGg8H9f7sbXNrkUH48CHzLnYaa1paueEijeZEZnqlYKVki+ZK4JQEWhv5tkYKm+0fMHzb3DiyGpSnHKwXyZ3LyTsQSPm2Q6VZBsQNJEOrVFeeYL0dmJqjGW8G14s2gimGRIN62TKDGZTuuoGO7kcmAklPpcSSlNsesQ//RKaoUO5Qq36t97mzP52Mp/Z6IV5E/wg+lLQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f47bc581-2db9-4d38-4dd5-08d9b8559132 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2021 01:13:09.8922 (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: AM6PR03MB3686 Subject: [FFmpeg-devel] [PATCH 07/10] avformat/aadec: Use smaller scope for variables 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: 6vuyp4zxtxka Content-Length: 3310 Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 840a9968c6..b8a5428f1f 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -71,7 +71,7 @@ static int get_second_size(char *codec_name) static int aa_read_header(AVFormatContext *s) { - int i, idx, largest_idx = -1; + int largest_idx = -1; uint32_t toc_size, npairs, header_seed = 0, start; char codec_name[64] = {0}; uint8_t buf[24]; @@ -80,7 +80,6 @@ static int aa_read_header(AVFormatContext *s) uint32_t offset; uint32_t size; } TOC[MAX_TOC_ENTRIES]; - uint32_t header_key_part[4]; uint8_t header_key[16] = {0}; AADemuxContext *c = s->priv_data; char file_key[2 * sizeof(c->file_key) + 1]; @@ -96,7 +95,7 @@ static int aa_read_header(AVFormatContext *s) avio_skip(pb, 4); // unidentified integer if (toc_size > MAX_TOC_ENTRIES || toc_size < 2) return AVERROR_INVALIDDATA; - for (i = 0; i < toc_size; i++) { // read TOC + for (uint32_t i = 0; i < toc_size; i++) { // read TOC avio_skip(pb, 4); // TOC entry index TOC[i].offset = avio_rb32(pb); // block offset TOC[i].size = avio_rb32(pb); // block size @@ -105,7 +104,7 @@ static int aa_read_header(AVFormatContext *s) npairs = avio_rb32(pb); // read dictionary entries if (npairs > MAX_DICTIONARY_ENTRIES) return AVERROR_INVALIDDATA; - for (i = 0; i < npairs; i++) { + for (uint32_t i = 0; i < npairs; i++) { char key[128], val[128]; uint32_t nkey, nval; @@ -121,6 +120,7 @@ static int aa_read_header(AVFormatContext *s) av_log(s, AV_LOG_DEBUG, "HeaderSeed is <%s>\n", val); header_seed = atoi(val); } else if (!strcmp(key, "HeaderKey")) { // this looks like "1234567890 1234567890 1234567890 1234567890" + uint32_t header_key_part[4]; av_log(s, AV_LOG_DEBUG, "HeaderKey is <%s>\n", val); ret = sscanf(val, "%"SCNu32"%"SCNu32"%"SCNu32"%"SCNu32, @@ -128,9 +128,8 @@ static int aa_read_header(AVFormatContext *s) if (ret != 4) return AVERROR_INVALIDDATA; - for (idx = 0; idx < 4; idx++) { + for (int idx = 0; idx < 4; idx++) AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE! - } ff_data_to_hex(key, header_key, sizeof(header_key), 1); av_log(s, AV_LOG_DEBUG, "Processed HeaderKey is %s\n", key); } else { @@ -195,7 +194,7 @@ static int aa_read_header(AVFormatContext *s) } /* determine, and jump to audio start offset */ - for (i = 1; i < toc_size; i++) { // skip the first entry! + for (uint32_t i = 1; i < toc_size; i++) { // skip the first entry! current_size = TOC[i].size; if (current_size > largest_size) { largest_idx = i;