From patchwork Thu Aug 4 17:36:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37130 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp536666pzb; Thu, 4 Aug 2022 10:37:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR66USl70O5tf6hzca8DrG1N5cTaqcTJHfu9J3T9cDuGloTmDwDnfmucDgtsnHqnGhwCPt1+ X-Received: by 2002:aa7:c713:0:b0:43d:40ff:5f16 with SMTP id i19-20020aa7c713000000b0043d40ff5f16mr3135486edq.256.1659634659570; Thu, 04 Aug 2022 10:37:39 -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 x8-20020a056402414800b00435be2dc79fsi1299275eda.572.2022.08.04.10.37.38; Thu, 04 Aug 2022 10:37:39 -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=M3uDvjaz; 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 A6A4768BA08; Thu, 4 Aug 2022 20:37:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073025.outbound.protection.outlook.com [40.92.73.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EA7768B9D7 for ; Thu, 4 Aug 2022 20:37:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FASClGT9NEcPr2KCaWNZIWXGO4TZWXxJ7HcYz2QMppHqQLO8VQ1zhSnooHNBlxqZzW32cnw6pXB+19DaorJMAGLyRi4QdMFsDItJJDBIVoLoZCM3IuQ2z2G+RfMEBaUZqVuUL14iFLH+4KosqCbUU4Uv1OZWI+7jlV/57N5uPb/HLBWNpjfCP3EYGpa6L/SknFpV0JQ6AZGPd3B9VZIzfdhEFB7QtJWc9DrfTmm+faC/OXIfgZEvVs3u13UIOiIPcZzoSSvPsIfs71SFlWEgvhw1uzdYU4/P41ME0rVRilc+We2yhp5m3BqnhjDb4gB/dbLG419an6fvWlpGtklkKg== 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=Ncl7ssVexuggikjyO7d0/is99HTCpJ5qhJuBCZ8QPDA=; b=n6oUla5YLH2FsNzUfzqI++ua3W2yhFhXUAfJSNO5aHwx3kvX+MwdTHTLh0aHlI+utYcl0pFPtVKd2P9MZwdxcLKkKe/ADON+gignZFaGkF94Pgco8iqpQ4SJNU5fvnsQOrjsRLsyAKX9XFecGfCmMcdgq1acppAXcXwUg0YlCMkS4I2ydo4o1w1j6vrvsQEE7YJDDjIeR9vv81oxYE6ZTguJq/h72ybVxAei6PEyKBRihCla1TZfrYkjuPg+UE+2aVurcttJW5ZN0tGBvWBj0Z+wDx6sEhNcigOzfM9/AzLiTNmj+jivOhkRcBBFx0O6AuEB2Q88jKtkPu266ZFl9A== 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=Ncl7ssVexuggikjyO7d0/is99HTCpJ5qhJuBCZ8QPDA=; b=M3uDvjaziyu+JK96kWzkhrlS4v+gnZ0GW+z54vMcDIm5kZv3BGPAcCOdWzaWI4MinbwUoamgiOsi8hddz1qU4JW09pJg7w4nuvZ0/7NUQ04CYKZr/tLJD182Wd8sd30Kuvmkor7MIodx08G12ldcHQa33SO24J3Jwd9chhuagv9hbTddA1Z3/14/HNMeaArH1FNRdTomhwBznNLJUbB1uRmpNFh065jCubgUUnrZKZ/29hyHKaOfScAbW5Py2T6UXqJ3ylL9UYKnesx06tXqPPb5/tyTA7dqpDZpUiGmwXByiEMlVkndfwfHR6Vg2vfSBQh8V8sortQV82wp8PUVpQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB8PR01MB6503.eurprd01.prod.exchangelabs.com (2603:10a6:10:154::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 17:37:15 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.016; Thu, 4 Aug 2022 17:37:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Aug 2022 19:36:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KdL9rxULfCSdxFc2uNRs0RyjoHeYAfvL] X-ClientProxiedBy: AM5PR0201CA0018.eurprd02.prod.outlook.com (2603:10a6:203:3d::28) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220804173655.1561196-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 11675321-1ed0-4cde-abe4-08da763ff882 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVBLZe6CjjWHQcN+6fAcwmpl8vPY9KYsLkeUGaokcyalQ/bu+cxoxpYLv/X7aTnfzUKQfdKgQqYp3Sqm6UeMl3aSiodnuPklqbEkUBqBkfWXPzB+AGQRSYq+FCDM8ej8983mhCX4GcYvlVXogNfsr0lO1/2Re3zwtKs7YEbHcEju8BuC6i/N6a24HWmoZo+dtBV/R5zAebyrKkyDKvv6liDDDEcPz8jKFX2d9jmFKDD5DYLqljhwNnMZc9fLb/FV4pUHhwKwk+E2CQ6tGsvpinZfVGh6EDji4ZT90FAWJ1aBuIRjeeSC+jaYByp2K7Q5vP0byZ20WeFwKrOvPhG+oUBrI3QLYkrXL4RW2BZazHf9yU7W4AHazn26B6vkAzsQjl4qqR3+bSqpciMPU35JtjnS30dLuDskJ81K+ex4DqYX3PeuPkZc0AU9/hpSBSJB6FMVYXRSxFirD/pFaFiG3BLZIoWO/8ArCMCpifsehwW3saqPy4Sio0K+5hlCn1n2DwyenMDjm2EAEWLKdG7rIgdCIpYuUSoeX8iCik3mGgrqxDZ255ioxNt5Yfwb6rmsfJnuf1elk7J661LtITHuCBLPenGlF+sDY0AwOEbG3GQ3IpRrKNwtQVfCdNjOZvUqxhc6nbe6GFde1Vaqust7ZRbDl2nQrA9b84DJfej8jIC5M+/Ug9n/YxwkMNGHCUQckjQoDBHabvDN8YowWadUtFJkibj8T7yUqo= X-MS-TrafficTypeDiagnostic: DB8PR01MB6503:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +c+ZLkMRvq7xR+ifTL5fpQ2P6Rcf1+WSS3XhNS4vU5R/MB+aj6BsgxF6rXbVAyJl/Di9yq249iH7sHZr1sn21cPjyEd1cSuAW/mR/zivNAa7Ij0zPCHYNogKhy+Vi7FVm7nkPjkPM4vTA6F8LcjV3BR5YyAq8qiI4c7QFbTksDdzFMbWkUP2mgwp4SilWrmD9b5J+VUw1+lef5OsNF4WxnVdDg6p/fMcvt4o3oorZbPUfqmfPzZK/CTPpMgZMdiskZ47ztb3hgYjGqhv/7uD/RX0EvpPnCA59393ATF7nEedQaF3qHW+gJviSB6ah172tqSZqquErLdleqBhXWRjAZEhXpQEfslbKFaAs1GciwyQYCx0823avXqBbYzfEgm6V/s8eD6KzaJii7tE3fs6wwlzSCC7D4jNit27eICkQYuGJsoi55MSSyobQQ/9iZZIHL8n8k2WWII+GnblUJHoLD5+BxtE5twlP99vJou232kgR3MvY9uvVqQqgr0juIbA2QRvkiskc/iFIjGAhMerCnjtlWN+g7cFvqTVPX0MAB6Aeg7UEO0DU+eZlyLNVFPQynRZD9Xc8KLE7IMxDyE2RKls/ZqCVMl3tmJB51IjBkgQxR9XtMevHEo+tJggXIqnNqo9QZ+buoYm4GsW74Tl6A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: maldLd64ufnVbwItiKw4kl2OuExB1G/7eX47eMtiiFqU7suz94ylQfF86lBa+pznhbqVokM5G5JKIKqMKWQPMEdrfdgNG/I+xtyO9lw6Y33wy23QdHk6UzOB4d0G8deOr8sTO+xyKJ46yyRyqYXd9v81aZ2yLId1wEj6aqJKTKVthbGZZ1rEDgCPFmSesPUm0y+zR7hZw9aeAsfmV9nSzGSgBG8YTvqpudkVgvY8uuoZJZAPTsbht9r1PqVqxHgncHm8eJU7QHKf5FzRieWWr2OXDH+gQGaUuDhtCZQesIlClNM0+EKQrnOEdcUlRInFgQ+/mLkGrmX3klq5YgTus8COmbbXt5l+9TivhKTgNi6FxL85AUx3yC3720K3XcakcqaJkDiLKF1NWuQHLxcylFchQvClOs8PzML0UwHhLBGTmG5vV/PgcNwd+rRZE3vQO/ukkXJWE7/JPCetdork1ET4J1hL4cPId1CdMcEeF6kdGF/or5i+uRWXO1bAhdv4Hupk9JIP9fhVOu+KRVPwkLCm6o5MnBR6e2yMgSjiRht5hmFpMUZTBlTiv/422KtNSCUp+t/MIX0bAcnaK1uKiNZjGyggery2sXYwNXPeHZbTeOx5fR7FwNFd5UVn0egUNrTqdzwXCho53EO+Ukv8IaLNIV8WNv1m51Dh5QEBZCEmd9KHGOxNdAQqqdWS6l0RY4yOcIj+i7mGgjkm5XOl9owr44+wYzEhOscnhBthPPfAww8Ldu12tab9uJN4n0qA389LIjfJbqMIExgVkllF3IytHjZnS+IAr0n0SLiVeDLKHH/AcIRXkszx6zAnEmeggcI05Y1VmIxN1qQziWRuR6OD3vxtYnMxPZurmRqJY7Z3xEQ4cFT0K29TosHeilyG6PDFJe/wXaB4dTZSp5rmTks5AGNDCyMFl+rD2bCq/4KkqEmVeQTzj92P5ZqPgj9X31DuSo9SZREPhEn24XWm62H6xmu2I+VuuEBlbT4QT4Iqu97KrCbdOLer57kTxQqvvS+pFaElSDwllR/CD+qsWIjJ5nj1onWev4Vvi9AJN/qxzBk7hi8+loYWCy/RpaFcczB7dbSI7CYaYuspmWvH9TLM7oStXopAkj2xSeiAGyuTr6ryKdCX/1CdUzE0nJaX0+a3d8bl7L/s80fsXv+1ZmPjHAYoljdLEPRWvBxNyWYKmW6PEjGvpjkC1v09ECm7mj3KuUBwOYAsz/C5dBraQC+FPLoUb0bwaeQ5kET3o2smCjTrYJmVVDr/DOMInxIAD/3phQTim2JsmURUaGEKg60WqD99eRH/8NtkF2Ic0Ls= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11675321-1ed0-4cde-abe4-08da763ff882 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 17:37:15.3489 (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: DB8PR01MB6503 Subject: [FFmpeg-devel] [PATCH 4/9] avcodec/cbs: Use smaller scope for variables, add const 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: XRma65jjMh6E And also avoid an unnecessary indirection for src_buf. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 43329a14a4..c81297ec93 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -925,9 +925,8 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref, const CodedBitstreamUnit *unit, const CodedBitstreamUnitTypeDescriptor *desc) { - uint8_t *src, *copy; - uint8_t **src_ptr, **copy_ptr; - AVBufferRef **src_buf, **copy_buf; + const uint8_t *src; + uint8_t *copy; int err, i; av_assert0(unit->content); @@ -938,16 +937,16 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref, return AVERROR(ENOMEM); for (i = 0; i < desc->nb_ref_offsets; i++) { - src_ptr = (uint8_t**)(src + desc->ref_offsets[i]); - src_buf = (AVBufferRef**)(src_ptr + 1); - copy_ptr = (uint8_t**)(copy + desc->ref_offsets[i]); - copy_buf = (AVBufferRef**)(copy_ptr + 1); + const uint8_t *const *src_ptr = (const uint8_t* const*)(src + desc->ref_offsets[i]); + const AVBufferRef *src_buf = *(AVBufferRef**)(src_ptr + 1); + uint8_t **copy_ptr = (uint8_t**)(copy + desc->ref_offsets[i]); + AVBufferRef **copy_buf = (AVBufferRef**)(copy_ptr + 1); if (!*src_ptr) { - av_assert0(!*src_buf); + av_assert0(!src_buf); continue; } - if (!*src_buf) { + if (!src_buf) { // We can't handle a non-refcounted pointer here - we don't // have enough information to handle whatever structure lies // at the other end of it. @@ -955,7 +954,7 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref, goto fail; } - *copy_buf = av_buffer_ref(*src_buf); + *copy_buf = av_buffer_ref(src_buf); if (!*copy_buf) { err = AVERROR(ENOMEM); goto fail;