From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D8C0D40784 for ; Wed, 28 Sep 2022 13:49:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7632F68BCDA; Wed, 28 Sep 2022 16:49:50 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2048.outbound.protection.outlook.com [40.92.90.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A47968BC80 for ; Wed, 28 Sep 2022 16:49:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HiCak9uAoepsgC9ecXVvxm8zilRj7I+sBhlx1OuZiB6sRQ5ryt0abTB/wtG/uBVexE0/TpKW7nRXu4UZ2aIsXVmPUC9aJXCySqWZ66MFPGcDJtIgXcPM2ScU/nEM2VpFcY39cTAE9aOet3lobSiLrNkruUsgl+FNu7zoD8r7ieo7gmYGO89Rs7U7dxJdf5p69S8EW273peFL4+aPBBzAc71CIE1Fy0ipURyEtH3VmMJeWYO9AEzxiHps2HrC57A69tQEWayeWg50aG0cbCpWyEV++egJpmPlkY4ro+D5vzfA2lxEj7j13bpfHIQWOnLfqYlZayvBknMXDs7tcJEa6w== 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=jnE439dBMWV4UTHt82TGYACIyiRzuwsxBT1GUPaEMp4=; b=ZdkN+KmKpZcOVL/nhsQ9Glz4rezQae7Xms4DaLqDResA/rsXtu/jPD2kOSfeVSxfldO0h6qzQLjFKngvzvhtK4e03DhMoxgaEmvmBer/hwFITqgFtIYNUQjWu8PwmGm6RGDBh8jxyWI/691Sk0SQC9YO9NYkkfbSjQFv3xHLQvkrX15lXNDZP+FbGxrLyvLwbxbHJ7b8JmNbI+8oNuAUGILNFJSpwWy2ltGPYRScqouicQ43zMeyfEWWL4bmbsuYtOSrFW/N3AXFmaTcmbLYbKNKT2PPJJXOXkLFednbwFhSsZr/gqP3QfepI6xrCV95L3FmEafRgGTmVpv5PqisKg== 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=jnE439dBMWV4UTHt82TGYACIyiRzuwsxBT1GUPaEMp4=; b=acL+y/Y++2YCqCMUfqbA42de7tMUfD6q6yIn1vAnQ7Sj+KZByT/7AdxUhYMpzdvs8i3oLZTyW/h8eppZvZsQuYDJFCmHSdKy4Ur+8oDuODCUAVZJzzgJuaVH+QCanHi1GY3HwRessCUwJzABRuRlkganx2QZOxRAuwtZnPaazke4zpDtl6q3j+fPOu82QPLQKWA1pMRztamsI1prDVAKO2Wjiv+mhSDG+OGv3KSTWvlIl6JfPvMj8yiY/uf0wVxnyx0PoVDyM8j7RM9Yy74B6SKq3CEhd29Hzz2Q/Bfm57u/Hcy7A54f0pIr6NIxnbM+0+0bLIbDZHH4KQg1NccJ0Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB4P250MB1031.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cd::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 13:49:42 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Wed, 28 Sep 2022 13:49:42 +0000 Message-ID: Date: Wed, 28 Sep 2022 15:49:47 +0200 Content-Language: en-US To: FFmpeg development discussions and patches References: <166437259996.22057.15090804598058774563@lain.khirnov.net> From: Andreas Rheinhardt In-Reply-To: <166437259996.22057.15090804598058774563@lain.khirnov.net> X-TMN: [gP3S0aeGuZjrW/LtborwayD1DCxT2ys0av5EOStKbS8=] X-ClientProxiedBy: ZR0P278CA0130.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB4P250MB1031:EE_ X-MS-Office365-Filtering-Correlation-Id: 979de13d-a35c-4e80-01c0-08daa1584ba8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /+4vpK11ubaqzjgO3Re7qwZ1bgbGP5rikSCyNd0v2TQwiGSJJgnUYQIt+osU6fr9VMqMc5UGBanoqZZ2zx3wlH0fFjlJmSYFHCJIc4fk02+kSOEWhpUBJAGGWOg92dnoKoTm+0dOI2CYGSf1iHVl/S7TJxcFe1A/EoCDIcBziAPhFvURB8UVi/kwW/7DpTzMBzUGpJCuOwSIIoPGbd52xo2ywkSbXFyVat941Rh/+A4pT71DXkunq8OYIIX9Z1EClD/1/excDNHGG1Mqc3FtmrpNrHI0zZ4t2qEBNl8FObcS4N5Eay41DwKL8m3IIlMAcBjd6Wl7LD2YVzBev/kfogFHhACcCiZjyYEhCKyHGku/Xqljl4DpRYBR8+TM4cBTAP8mH0HGsrYoNjBWjJFACSMc3nl41RhRLpNdk24xJyJLvZUEHmtMaS7V4hN0OUpMCBJc0MLjLxaLDWAA3pSFvIuxaMo/zYq2ICErYe/m6WEuaujml7nCwO8ws8yGIkkvejt5h4jQGQyyfXTbuHY/lOa3MVctj5Fkxs+38MOstDa9MJo0T8eaOGccSxLgvg2OxI1zyQGCvgF/Cp6vSx27xtJIrGdxfJw1c9FJALuVh9lWWej4fWvTkg7QnySL9ysbeNc+Ubfj1lKFjRiWlCYlLG6oQ72P0Hy9g5hiqSv82iRow7yEhgSON8Hqy84avvOJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZzdOdlJkcmlsQldqNlFFM0tRT1hldkRKMllEZVdYakxxNzFObWZ5UG8rK0s2?= =?utf-8?B?aFQxbktPOG9ZbjJxb1JseW9JVW9lOENIa0U5c1gwL1lCdnlEUG9FN00vT3FX?= =?utf-8?B?UnhmekppTnhJUDNCODFVam40aHZNUDZnY0JwcmorMElmemh0cG9sNTR1aUhX?= =?utf-8?B?WjNGeVNKbFRsU2xqejNJT0VRdlB5OHFQS2JjclNIUnZSK1h3b0lKR2FCR09C?= =?utf-8?B?dGU2VkIvWkNzbnZvRkZwZmhzTG5VT2dUZU5CUmphS3pRL1ZlaThHMkdkQnRt?= =?utf-8?B?MHFHSmpVdGdya0Z4Y3ZadWxSamhsblovWUVKdVpVcThxUGF5VWVseTVlUU9h?= =?utf-8?B?QkM2L1lrWVpvUTdZRjZMMC9sTnVpSG5BcmpPV3hmbUROTGMxVkczNkFNWmFZ?= =?utf-8?B?L05HZkZFVm9xNUZzVzA0SDVieWxhRGgzMTU5UzlmSDBEeHJmS0o3bkpmUmlh?= =?utf-8?B?bzZBTElzVVltRm5hU1JqcnNkc0UyWFRUYzhnQVlINVdHcGg4UFhtWUlqZmFs?= =?utf-8?B?aHpJYk1mSFBFSjZCMWFYbWd6cDRaeER4bGQ4Vy9wRjhPZFBCN3kzUDFCYnBq?= =?utf-8?B?NEJHRUZkVjArekZQTk9rZG5TVTN1UVZZQnh2cFRVLzMzeDdiRWxHYThUWlAx?= =?utf-8?B?NW5GTCtFZ0h2NUxieUwwSmVpTFBqWEZ0Z1cwRXpTbHNHQ3FYVlhmeG9xL0xO?= =?utf-8?B?d0I5OVZxeGI4cXVOajNHVVpwSFIxL2RobUQ5NURqbHV2V0RDeGFldVY3eDYw?= =?utf-8?B?bUEvNjFrcEd2K1VNeDFjTXhMZ2V4NzRoYlVKS1duYXVGWG1pdUNZTm5RVnVQ?= =?utf-8?B?OVlrNFNtR2pnMDhQZXJCL0ZPai9CWjFwTVZCNmNrb0dPTzVJVEFNcjN2bDEy?= =?utf-8?B?REIvVHN1V2VNc1RTR2lNU0hIL1ZNaitYN1g1S1hEcVF5MkFlZmw3ZE42Yysv?= =?utf-8?B?UFM1cUV2Y1pWT1N5TFlraWZneG9DUzdRQmVMT3NIbkpuZVVqYmFQNCtFUlBq?= =?utf-8?B?WE41R25FbDhEb3d0czdzUHZTeStCVEFmbi8ydElYVGNHendJd0RZaUJQVUcy?= =?utf-8?B?SVUrVUx0dWNDekpiU0hMQUQwdVNKcWxEZ0NQdzh0NllOcVliYUpJbWZkZTdV?= =?utf-8?B?bTRJQVBvWDAyWXYvOC9hWFMzenMyMjl5dGR1b3hXMFViYTM0dzVBU3dIVlFn?= =?utf-8?B?a3VibzZkM2lWWlFaVk1zVXJ6K1VPM0F5NjdGeGk3eDFUODBON1krUEtrUUtm?= =?utf-8?B?L1kxTkZXUXpjZ2wwTG14OGFMdkN6VWZCYWszWU1TK1EvRkgwajdSMXcxYmg3?= =?utf-8?B?SVlKeWFPMStsUHNoRkRFNkpKRWo0T3pQaWZzMVZ5b1FQTE10NnFnaGtMd0RS?= =?utf-8?B?MmlSWlZMMkIvWXg0TXk3dTRRbkp3cWhNdkM4S3BiQk1QTmQrbXFJRlJEeWxD?= =?utf-8?B?RXB5U2V3OHY2YWpMT1RQRHNKdFI0ZSt6T2oxRUhOemxRWDdiandlVU9qc3VG?= =?utf-8?B?bU1DcnFXL1JGTWkvZXFnWkw5aHFGQ2dnSkNFYzhScWw5NHhiNXQ2cUNESEZI?= =?utf-8?B?SXpGWE9lWm1kaXh5MThueHZNK0ZEWUJ4SzVSVWlubEMvVThqdTNOT1REdHo4?= =?utf-8?B?OEJZN3ZZQkxpUlUxdmw4bXE1TWFLNEpTOFRISzE5TDBJVTZ2NDUzV05uL0s2?= =?utf-8?B?WGFvdEYvc3VDdjVoRkF3UU5XZkc5VGJBVVU4WHQ0TllnbUpaWiswRXdxa0dW?= =?utf-8?Q?FkhU3BfXH64aUbRX1nGKfd+TaXvPgFKrqsJSlN2?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 979de13d-a35c-4e80-01c0-08daa1584ba8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 13:49:42.7184 (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: DB4P250MB1031 Subject: Re: [FFmpeg-devel] [PATCH 2/5] avutil/pixdesc: Avoid direct access to pix fmt desc array 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Anton Khirnov: > Quoting Andreas Rheinhardt (2022-09-26 21:58:55) >> Instead use av_pix_fmt_desc_next(). It is still possible >> to check its return values by comparing it with the >> (currently) expected values and the code does so. >> >> Signed-off-by: Andreas Rheinhardt >> --- >> libavutil/pixdesc.c | 17 ++++++++++++----- >> 1 file changed, 12 insertions(+), 5 deletions(-) >> >> diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c >> index c42a0242c5..f6755f41df 100644 >> --- a/libavutil/pixdesc.c >> +++ b/libavutil/pixdesc.c >> @@ -2913,10 +2913,10 @@ int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt) >> } >> >> void ff_check_pixfmt_descriptors(void){ >> - int i, j; >> + const AVPixFmtDescriptor *d, *last = NULL; >> + int i; >> >> - for (i=0; i> - const AVPixFmtDescriptor *d = &av_pix_fmt_descriptors[i]; >> + for (i = AV_PIX_FMT_NONE, d = NULL; i++, d = av_pix_fmt_desc_next(d);) { >> uint8_t fill[4][8+6+3] = {{0}}; >> uint8_t *data[4] = {fill[0], fill[1], fill[2], fill[3]}; >> int linesize[4] = {0,0,0,0}; >> @@ -2927,9 +2927,15 @@ void ff_check_pixfmt_descriptors(void){ >> av_assert0(d->log2_chroma_w <= 3); >> av_assert0(d->log2_chroma_h <= 3); >> av_assert0(d->nb_components <= 4); >> - av_assert2(av_get_pix_fmt(d->name) == i); >> + av_assert2(av_get_pix_fmt(d->name) == av_pix_fmt_desc_get_id(d)); >> + >> + /* The following two checks as well as the one after the loop >> + * would need to be changed if we changed the way the descriptors >> + * are stored. */ >> + av_assert0(i == av_pix_fmt_desc_get_id(d)); >> + av_assert0(!last || last + 1 == d); > > Don't see last being set. > Correct. Will fix. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".