From patchwork Thu Aug 4 17:36:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37133 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp536592pzb; Thu, 4 Aug 2022 10:37:31 -0700 (PDT) X-Google-Smtp-Source: AA6agR7UBL8KoRAJj1KNe+ErjqyETmn230p+ND7c9oaw0ldruWkRJs1ZPdkEFhb6GhqfScFU2rcZ X-Received: by 2002:a05:6402:190e:b0:43e:1588:4c32 with SMTP id e14-20020a056402190e00b0043e15884c32mr3089369edz.76.1659634650978; Thu, 04 Aug 2022 10:37:30 -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 n9-20020a1709062bc900b0073082518a55si1374155ejg.363.2022.08.04.10.37.30; Thu, 04 Aug 2022 10:37:30 -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=GQGFFk+1; 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 AE01C68BA09; Thu, 4 Aug 2022 20:37:25 +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-oln040092073091.outbound.protection.outlook.com [40.92.73.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F24568B9D7 for ; Thu, 4 Aug 2022 20:37:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gg/aEAk/qCMi25xnnz97YJe5UEiBeIrqJAP+63DBcpRcEHNiY0mcfzQaII2wN/H0kzRSmuiOT/uusku0+xz8FFS8IdeUkjUMhtLmG9wLBj1iFeILGdUmyt3EmV788ILhK8l7vl1s5Kqyliy9ytdo53Z8pry2/s1mhrQbMztFVgSmRZhYjfHRqiIbbR183XS6GFikQE4J/twKGEcKmN98j3d1RXSFXpMqiK1AeLGnb6MTGMgwHwWsoKqIJSDtfwNeu1yJdot866EmPvMQBfrOVTssMCKMt+RF9u7bAgseFS0KAaPMLfdz1BH0ic19kwBw5GH3mHv1H8/wGjrW/RQUFg== 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=ynVwG7DyGOp70pYKvrjWCf6WyPz8/3CD/4hm39xqqCo=; b=hZnpsb9uInkI6s/lJEBsrfp3Z/1qJ/hjquGdO2NcoSlVW6hE47xkN6K8K4qg6IXbjOvwYZEIvOEBi5NCFTrHda0Gv2drf5SQnW2UksaVgF02sJ/F7gDD3xMN2hVfsqRb5mGmm5lpezaYQTggup8JpJWoiVkK6xyiDk6SWLv1iEtLHSVMeY4l13Mn6gHoWK04dnHxYBZykLWg8uxMbkpyx+Inc5svQ/FfTilGWy0EUSLwMiLlTNOgzEyo5lwRe0xxyMsPpnb1O0IcrSARi+/OaPnm1y7M07Y6jncBz6EQoTPCZ0/2vvlira/8KGEY4gpoh9xEkQ1GtCiM3JtL3SgvoA== 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=ynVwG7DyGOp70pYKvrjWCf6WyPz8/3CD/4hm39xqqCo=; b=GQGFFk+1Jps5+fqbW2XPwps+lkWPJ+1K7EiHjyjuFRa6gCtGwUWY33ETXNdI/jKPNcyB1hjb7r0ssAwVoO1hfJXWzmjQYCM/sXi5J/MNrkUG5J8aofPC4z6PjyaG28SCi12AHMgv976ogd1uepuCpDEHN17gz5kWU8wHj/6s+1yE7fwp8eCLHP4Ipq8ehTcwtw82OCvKzNsuFmNrv/jUDV56iN3pdps8ogZ2WmuQp0E/dg2coLnm95E7SdDs5NAN7V05i0jDJ8K1Sgd/Eoq7dacFTw/ATmlqbEyUzpQhi+hBQoZSaW7P33kg5fxbtUf0PRKMZe/nxt55v2n5ez92PA== 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:13 +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:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Aug 2022 19:36:49 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ICbK9LoyxzlzZ3Hb3J2xbdIyNaO+s2zZ] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54611baf-86fe-408e-96e1-08da763ff764 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIOfcU/WhyXx+8uuhyM+VSeft+tPVDDzy8sUIdzH2XFP1/tP3uKTUerXFWGFLkMmGI5yXgm4SW5m2avqksEts71ln3X0aVU8aHsmBIhw/IYI/YEhQ2YCS1cJHJgRsbMnvpzdKT6XB/+VNqltpDFTuMStFiIaxgosgFkVHYXrHWx9xDI6FBGeSQAndqxPZhmOXVMsiDh7mq2rzCkFhmNuUUgqyrExL1Mdk7psvnp9l6u7QG9zhLT32Jk58YA0RttUj1QjyUzZGiWWG4T9ZSL6ZCUWN/c1iNQ8UP0hoTU47RZbDWnhTHxhZAr74qY1pWDAxv3ZpfKcw00JlHesXYyYtZRJoiBJ+KEYkwlffyjPmTVFUyaUNiLn6FeLvXnJN2DZBI74WBUcp8fyRuLk1h6nBrED2M9eQCT+u7iryUAeR6J8uBJJIO81QXjif9RajzmynjywAa1Ey87LcGm+ASKHqy5MwoLCrtYfXh7BNVJ4V6JnR77BzYMWzJgH4e/BI8xOgEYHVaX8sILL9VGY5QP1L+FQtcWk2bNYkh2jRzlhhszC35+wiMDT2DshyxnUO3FALxQeOoPLaoiaQFw6vb/qY4CvIXst+hl6T/ONV+oA5yTlHvADewTzRyISl+VGd1DPWPs0xqVx+LwgjACKmOJNkzgUMjSomqTAdU1aRuXIbhbZboHAt3qVzzir7aq9pDs89qetdZbjrEREA== X-MS-TrafficTypeDiagnostic: DB8PR01MB6503:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YMjRWd4ejBdtCBF3/RJSu9tUGJvszKmionK7F+fL94QfvuWrRSu+sAy08++H9aJdkGexbSkVEqdfiPQqyDeYy5Laiwvc5dXZ8lTDgrK125FZ9Qp4yZTfWigMtnr5jl7OznpVTMoM6tiIJaHjaIHydQwXcimDJhbWwQ2Ra3FNaeL9sXbekVgr3bY6QS0h+D7v51++Qx/JmHs1sANfdl47QPUX11ZbWWjvYNOLqlbjGB0McZ6GcBq44B7j16UWKyRWeALFCJJaSACRhqlWi6Wnzg/1XRQzB7vlaQpBSvMC2ppnHpPHe66G6oNnIqyMB1rcWWK4cNYapdB5MqyHvwvVIzrhXtEezhmJNSgAzE2CB5ly5q/b9ZlY0+NBeebTX1lULjjP5HxfRz4jdFO+8DeOABrhd53QkHOgtNfX9v5AKSpTzN0zjm2JxJWeqJiY6Cc1wXJB1igCKpSFwIDxfsUQLF6+olnt7BJyvPbqPMKrAMfkpRkvdudF9rYC+CnuirtT6BsvrhfXuLMyYKgB5POD2bXyv+fi2irgiRkF676o/RuVWunPsvYLt2uVXxnD52nGqsROX/3BO9FcZ7HVIlrnULcUDCzcnj7luqjmYsYrA9JYOKzP2uNfHGvqLUSo4bnEWyLjCdmXti+i8vF0eQ5RRw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z52p2/z5uiDR0i2oSNxt+Uv/OG+7E1hVzQ2yns3zXa5YfwkF2TrtnhgrEARW6oq0BCxXtTomGqmRjkOskCLHKI3WQHk5uZzh9YxnHGDnIkibuV+0BZEl2a7oxi4OBsdcH066a+Q55mSP7x5p+8SS7Zq9CW6Kyh3gFra/ul15y18CK/CdcezP6bSg3CC+sOS3ihkuOosX9+sXGlRXXeV7GoKleBupZOGg0l08aOqIhn25sJwEiGJrzzIRCkPkKX+m5YOI077RrZHScQtAsnPFRASP2DFATWLWRPQkKu0YTTwc13zaX37mZVJkmo3HEWDkGogwjmgIykJHecaMjogWuE5vS964K5kuxdy/xd5wE1uFL9jOrNCVTMSGHgXW36rxPdsanClAZTkif1DBS5GEGdpSO/3MnGg4MKQ5gHLwjqxB6Z8t2EMy+syDahZE6/rspWfTMr4XQZajQdk5E4z3nfrrmuJiouOepfqrJAInS99Qb7DU9IQcjQeMSFmgoqOqw+ecbNkXim64lFc5Rq60BThE3ye4kKKtfPhYQ1FF/471mRvaiJcASrjCQI/+O5mC+75oITokOeSfREGdp9X9T+ye5P2vGzaOCOiaoDcZgygD4N4i8fcHhUZyCoKI72DxD9ME0RyMShXyXzwRBRZWazZrRZQtk3pvWiJkukYX0rVMAB/DHu9Kjvq2K4aVzkcm1HFemOSQ+mp8W8OQw2i5GGOQDPxlXa8+M8kt/TAKNacti8W/A4sgjaijEB12o7UUfrbMovqGqckClXlRFxFU8+J+j9CXN1WZBK4z17VhLGTEqjIBOmKTtuwr6HMD+nE1myGzJnpBk4/07fn7JYNRc4ZFzt4dleNDYsAh+3GxX10Hq9nYlpXccQhyukAfGTsraOQmgNLd0qUhmKYcdBnPOyWsfp9E3FLAxYXq2i75oCaQ2Jh6iYaEjg/3XrMz96j/3I+XDBGAd3XoRQzFxV3tJeNtMXh3W/j/ieOkTfIb5zbfFv01yQCCmrr7qglrFO04pCGeepHzmi9YGL0/ZXsc6VYg9hRZhu95Yui+JcJHIB5EprDoz4GKIP25hQvaGesQCl8FakcTgG35ChOex6oDudXOY6I6v4RjvHXMN0wY1AraoNLdGaJwHlUHQ2F68JHRiNMCSP0C/UtB1f2tUNGtKPCAfZjqHVUlk2nj3fK5rZf6aEkjGvj6WYNuhhLSOj5zXNYLCIbUwoEmW5Xoe6Xpu70FAFR7Bx7V5Ek7S1LWxVN5NiQMkVvYdVvi8mvvPFUoGA2F+EdtqPRv8z4rem3CorSz4EOR1qmptjKRbDp9N8k= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54611baf-86fe-408e-96e1-08da763ff764 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:13.5053 (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 3/9] avcodec/cbs: Remove redundant assignment 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: wnnftBpv+RTB The code just creates new references without allocating new buffers for the subobjects; therefore the actual data pointer stays valid and need not be updated. Also remove an assert that ensured that the calculation for updating the pointer makes sense. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index f715e463a1..43329a14a4 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -955,17 +955,11 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref, goto fail; } - // src_ptr is required to point somewhere inside src_buf. If it - // doesn't, there is a bug somewhere. - av_assert0(*src_ptr >= (*src_buf)->data && - *src_ptr < (*src_buf)->data + (*src_buf)->size); - *copy_buf = av_buffer_ref(*src_buf); if (!*copy_buf) { err = AVERROR(ENOMEM); goto fail; } - *copy_ptr = (*copy_buf)->data + (*src_ptr - (*src_buf)->data); } *clone_ref = av_buffer_create(copy, desc->content_size,