From patchwork Mon Aug 15 11:52:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37284 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1225416pzi; Mon, 15 Aug 2022 04:52:37 -0700 (PDT) X-Google-Smtp-Source: AA6agR7U1W7RVweY592oMiyws6G2EsklyUsU8UlPZwKJSBvTF8j0PREFIrdT0y+t8dP+iHhfcuv9 X-Received: by 2002:a17:906:98c8:b0:730:7ada:87a7 with SMTP id zd8-20020a17090698c800b007307ada87a7mr10313536ejb.748.1660564357224; Mon, 15 Aug 2022 04:52:37 -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 p7-20020a1709061b4700b00732fb970fe3si5730327ejg.187.2022.08.15.04.52.36; Mon, 15 Aug 2022 04:52:37 -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="ad9jIuQ/"; 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 14B3768B8D0; Mon, 15 Aug 2022 14:52:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068060.outbound.protection.outlook.com [40.92.68.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 283CF68B8D0 for ; Mon, 15 Aug 2022 14:52:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZjwzqboW7V2C3VMxI1o8njGpweQHZa2cj58xKCNoZj58RE3gYWzQNXsWMVSgJseDev4lxFreHHeYcI1Mcv+lU+Asi/xYpMxshsPRvTyIYfNxs2/krAyI8ej8G4TQxFiC2Z1n28LRjdo+9zyX/QghTQjCAbr1Oxr8wdrdirIEgIFyCysFHDA4oziGr7fJ5FgWzIAz/yTWbzGc1GT4aPUDTEHl1oEROBDCTbUVkQjYIbPQ3XntC8qHUc6l2eX7649SHLZKCrprLH6AQIA0Lva8GQnVn494xocr99ed0W+C+NDZrGqlS9g6vGguEaOukeIeGnpErhmCU7qorHcPVdc6CQ== 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=ldu4zBJYr4jxmKIv/A4atkbQdXBROiORj2W7g2f1kXM=; b=TdCfp0bcsGzwVxWJnZGcoA7I6oyv3d2UWUKBTAAzH79Ga/zWqlZpJjtjEyR+ub+NcHpo2nnqXELQpR28FTi1XauceoiycmjVDjX8vb9Chyb46wEahi493xUw1w7zz8uPJEPRt0shjvNkiMYxEEzQTjwR2glX4DPwNX4UVTb/1f/Vd9Lg1qnw2789j0oe4FJVJicU7UQNTg2T39bi/CyNk1BkxwCr4rMKcmZYOAKZUqr6ltNIVOv3qqn85XMzkS65EjKRblY2D18i2L2wz+7qrwbstDzOBteyZWMJPWYBrnvCSdB1mEUA8UU+RDlWyO/OLuaMOc8+NiR0f2B/fgf7kA== 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=ldu4zBJYr4jxmKIv/A4atkbQdXBROiORj2W7g2f1kXM=; b=ad9jIuQ/dedgrmtrn/IT33QqWF+I87NnxWoFEg81EjcecoxmoRDfbThL7pMq69N8RSZcIrUkVkHr/e1ZiCQzJk0otctuepaqVXIM+i8X7BcDvJjqQKkHQNCErqEmPCudbmj5MWK/pSVYued47zZD9vYnNS+4IWizlnXST/SpB9y/luNo05gmWo2l/fa/Ks/M3Lj8exOLme2TD/g6gA25pxXlJQFJ60epPdyaN+/F34m4/VFKii+K6GlcWfM0pONpNoRCzE3jTe1o5J7Qp6ZE2wl6lWCcivfaDb7yFL+l+EYrYD8Ou7d79BgJTbcEpMfVMiKpKDyX1Eucl/3pOuQZuw== Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) by PR3PR01MB7937.eurprd01.prod.exchangelabs.com (2603:10a6:102:170::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Mon, 15 Aug 2022 11:52:21 +0000 Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e]) by HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e%6]) with mapi id 15.20.5504.028; Mon, 15 Aug 2022 11:52:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Aug 2022 13:52:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [56KnyDItHuF3qulBksYntFRF4TqgiSvw] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) X-Microsoft-Original-Message-ID: <20220815115211.2237279-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d90df39-617a-42a8-29c0-08da7eb49c47 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGLC8wm2swa7NnVS34XgXvSEHUdARgOT7F9wEhs/1sqzjctppOktFZVWFR1ikcmG/Y78e7IQ8h8MYRyM7so+sSg5G7U4VLlgnJvU1nBhh34xmhhcSfwBNjtbOOtNNxA4brTYUHJ6pw4sKDyADrwRhCSLTj02O66t+7+dAd0RHkYvWILCGbzzEhlrMV0dHDNPnZI9lETPTi5eeRNNEHhzSlMO6W0eA72B6ONQyfwrFUw3UFIUla8+OOwy6QUi2IPZrI9CTXrxxtdgDrv6XjwnCz+Jc8gX1YhS94rzTLzM0UQQ1wuOtz6WTKwSHIwQe5DBQOnXo4HDGC5HpxSmj7yGPeIDFpeDSWEuQ2XdJbL6NoyLB6J3b5QOqlEtqq9MQFFABdjXzVP2LGstsu4EXIbsmtW8bIT67mtkWIRIE6pMx7vfv0k5MFj8YQ8qOKj76ErdZGCJzFLIBDV5tMBVfWwavJWMsg01CqK/IL6rOUycciOcgCwE2nx/032w7BUp2sFd2jQ6RYIRKlQYAhON3qFoz2fJITL8qtXhFyqkr9xF6tMaKMrqTwGSyXiPrVt46tMUkKryWknCmeldiCXyyxC8KFuGZ9/QVCJvk7AjgTtimTmr7hozGIfEZqR4X2bsI6CVog5SW0b4qaHvYPvrjVTVTObqdfQGHwYyY7siZeKr+2CgBCFwoZ9PWe0oUYc2Dr2ZBTbG9FnUPywwAEm1dv3Y6Bgw/8KRoUb5U7JCnk3+dRZJwaXS8J9e2DyY= X-MS-TrafficTypeDiagnostic: PR3PR01MB7937:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wCv8XIK9PraQ0jqD3V71Fd9NKy4X9IcugkdyRav9nMs23EcvMp1ZCJqdcxnXagEpSzLBpq4CApxEsOjcmed6lDIFmmi9L4EQH1BtkXouolZIC4e14CS5V9T0Oj4uxR4n/0GPHm5zIejH/fB/jt56LGrvA7i89R93O5STtLVaJnOFu8o4QhntQ4oWRx4t3AOZAdqYxYYmTr1UDMRjXWwHM9kVrJ638vxTTwwpsM5L7wvrTsVM287NzzxvQDTT/c8WjLdyXcqTNoGsKkLxZxYDspbqRxPGZy0lv9I3jtA6PW/HY0csMuagHzUWpxsEr5yKaMzH5nQ7JdxgnwJHoc37zNtkXkd3ndkjd50Hn/9GGzDErL5LBixpgq9AsWK1NXSQnhm1Nup3rgCkHQ83KLIOiKObnj1304HnDKD620vX2TYzkauQxhMcQJvGM1ZCFjVYeAzESE9JfZrM/1Jv0yAI2VgmcmLBrlYu4DLc+SIObI0KXH5k/dbgZe2+CN/T8v+n1ogz9pDka0J2Okp5bVsx2vuDGG/75IRiXm5dCKVBFreGoePFragg7iz03dn2BlSRKa38tS0k/bU7McixygPrskwl/LO7MWPnjdIlIDxa82T1Sn2j+21XtMHIu53A/GGbE4bo95CJUDQFwYEtmdj0fA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vxgufvSgvjS3oPlrefv+VETbVMU9oiX0A8+XqWJva4MYtiQcx4xHaJa5iTgiN5Mxp4R1a2gdiZs6/1te8DobU+0B7WqotMKTVdeVw+NizsMgOlt84H9aMo1ooc6XTrM8eGPGbAMPVy5bBHwOgpueKEETjg98Ydi4hpd9gtVkYJ8fBAKoEFZyvpLWqcj9lncUd/NoLRxNY8qLcbWCl+tm3PO7GFfn2tG6qSLOBPs1vX1kyrPVBdF7tQ6G0L8dQgraSiFqwduPyELNE1fVJHzCYA7L6+PeQ/oHpW283csvz7tu2kzDZjofx/ZPMcaXBtHV8GoK3okk+prkZfPhfdSzzR4Rj3KWVap0s4XKlpXYU0LX23ya+nfjcfNsmAiHCKJPN2/tIeFMALmX1xf72wKu+Qpjk6fz3KTaO6I7CQBzTIiftnu6Hn/6+XgKmKGTWwkrIy1JpNzWF9klAJqLXv6P5ryJ1BJyy9tF4/3yw6e7IImCnMLpDMjPb+OklJ21zUuX2IHJ334rtLt7grso0ZYXs6BdN3mdwrA9WI2j6gPeFVvf8whDu7VuJH9oVlDGQaMzTr5f0LqB6XkQUFEGAXrQO6leBxaG3BArQp5AaVQ6x1uzbMsxqZ4OVKbYHv1TmsSlxNJwt7emP2SNx8QoltYDpaGArI/QEi2UNhQD20sDJY5dLcC4VrTqKLGPpcLazr3vgC0cJ4d2nIym0/ufy4ZLhDYrRZJ7pCBX3Mo3HUFuaMKLumKWtRgpgY2suPeHqtVF+Gsxhth634qTKyy4zn8smgZpFSJfHJFIFlZE/QT6PCaC3K5o69sO+xUxRNIc9HkmbKzQNsybAm+8KIY1QTlzxAgV39zg9DTGwz6qE4AZ9HUBnZAI1Wxcb+n8kMVPb4EFylW2Tw3yHqyT9/J0NY3Spz3VJtdUuvLbPpAGHXGptAogLEewoVuEH6UTnl1LjYtlPnyJ+/njIX/OOYxHDukrrNKHkl3i0+xViuTtuIvRATcLD8JCbId2jnAICWDRdsqYolnPjxUvUIXTUsDJSc2mBw8txFdzPe9rK7Lcr9icaoGzs15W7vxdK0M/9v7JZ6nafrmf+mfF2BzG7eYdcFUrW2c9teta+IocxYQFscjgD8EN7V/AZP1/WORq1eocVnavzlzCHB3NaXpq822svrULANlxPBNrCt9uidsHAV7HjaeQfDALQ9yl9pxpu+5fTHfm3nCvZYIe0LnqQ8q/ZxXIfpzmg3VVr5JN2dkInpZa4xYj6LF/D8Sb8nwq5XbxzLuJrCJV9GlsY/tMnE0XKRb0D6OR1PNjqgGB3N565Q44uIQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d90df39-617a-42a8-29c0-08da7eb49c47 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0101MB2219.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2022 11:52:21.0593 (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: PR3PR01MB7937 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/mpegpicture: Reset fields explicitly instead of memsetting them 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: GYGG4sr3Bz/5 Improves the grepability of the code. (Furthermore, I hope that no compiler will really call memset for 28 bytes.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index c57f149752..884af1731b 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -297,8 +297,6 @@ fail: */ void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *pic) { - int off = offsetof(Picture, hwaccel_priv_buf) + sizeof(pic->hwaccel_priv_buf); - pic->tf.f = pic->f; /* WM Image / Screen codecs allocate internal buffers with different * dimensions / colorspaces; ignore user-defined callbacks for these. */ @@ -314,7 +312,12 @@ void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *pic) if (pic->needs_realloc) free_picture_tables(pic); - memset((uint8_t*)pic + off, 0, sizeof(*pic) - off); + pic->hwaccel_picture_private = NULL; + pic->field_picture = 0; + pic->b_frame_score = 0; + pic->needs_realloc = 0; + pic->reference = 0; + pic->shared = 0; } int ff_update_picture_tables(Picture *dst, const Picture *src)