From patchwork Thu Jul 6 21:08:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42474 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp6811540pzh; Thu, 6 Jul 2023 14:07:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlHoxB5IEWW+yaYxzqdX1D+dTcOSBiQBi23gv0X49/K/VpxVI/p964p3l5S2iYBgz8PKs2hn X-Received: by 2002:aa7:c14e:0:b0:51d:e1d7:6cf with SMTP id r14-20020aa7c14e000000b0051de1d706cfmr3407721edp.14.1688677665571; Thu, 06 Jul 2023 14:07:45 -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 i25-20020a056402055900b0051e26e49e0fsi1308924edx.40.2023.07.06.14.07.45; Thu, 06 Jul 2023 14:07:45 -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=NQCWA1tm; 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 AC5F668C76D; Fri, 7 Jul 2023 00:07:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2025.outbound.protection.outlook.com [40.92.75.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4579468C768 for ; Fri, 7 Jul 2023 00:07:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LC95Uwtayv1s49N4yGTNR61pj0Zk9kYOpSPqC4rUL8SmBGBCneZg1Mz5K4CkvV6rrXztQNUIz9IMEzg+sP9FvN62JVxC7hw4hbjR13Y/MeoHWUxUwSgI8RL7bpHqtujpgxyrPB++5B8h5gIBmzYxHhyd+2UlaNOmKco51lCcti7hiZA3OkkG80Q3sfTS3DrnaQc9CV4YFre+fQtXuXIRBfnA1Tjk6i5NeX/ysv5XRnQF77zZqJMcFVirQc/af92qcLWXZj2+qetnbsv2s4fLFu3ZwiCllYHshADX/EOuz/8JO8uZsfEepXIxpqhxbAIgoTXuqj5RNPwxi4uOqDJX+A== 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=t7oLooNKmlfrboerVVOZeo5tIt3bgvf5IEBvdQfC+R8=; b=cNGJz1XnckYZKECfM5fiDlKdp0F52+eGC3adlfGQGZVcBC3HY4yqzcZcEV4pF/skexn80SMRGDFfOGZp8yQ7SmaCwwVIuJaw/S22nDU2OUwGnwcFhc3oznMPEV/+CgPtVdnLfxE3StsbgEfIy0ZbDSh4YYpCRLD50ccPoqaImvIMIJK2Ecu5XmkUgWuknOTm5uuWFf566YPHJAeVnDFUDwcndjLLlvuvuLbizg/cB0nqwTzvyLN9WTaGH44rFV+VeV0g97INMqsDhOlNPgcURN/YK03AaWGng1uul4FttINcOPlnxtFpHV0Q+8DovUZQ66cPk+IFIqPVUJsOhju2EQ== 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=t7oLooNKmlfrboerVVOZeo5tIt3bgvf5IEBvdQfC+R8=; b=NQCWA1tmw2ak9wF91+aJwdDVT7TDkRuNYUKMNJ+5XlpvItGSvuiS3qVE3sjqVQoYBX2UahYaJv2cQnidmA5MLnASDA9j+qxaZZtCnUe5SIL3fj8lIjZ03UAQQFLQlb1keVkZlBPgjLsFgrgKqmgk4/QbXtje+03F4LCJty1Twf76znxsl/ypePEjCj2vD6VsICRGPXkHNZUC+kNIg2+GxkpheRY7K3y8ukh+cEj/zNZWQnVcXvtKNGFWNvCbanniqDWjK4psfKWud28kG030zoEKW7um0poSjl7DZFNvxYuQlNUgQv+PYxs005096cUOvdQHpGIUrcsGJnrhQCaUGw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0376.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.25; Thu, 6 Jul 2023 21:07:33 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907%6]) with mapi id 15.20.6565.016; Thu, 6 Jul 2023 21:07:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2023 23:08:29 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [SyFLMhy7Uauwyrlxpn6R4OWY5+0OhSdU] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230706210829.2162011-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0376:EE_ X-MS-Office365-Filtering-Correlation-Id: 24e6ac87-e1ca-4d85-2cd5-08db7e65042d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqH3kRfXJefTgyd9a2EE2aoWyfs8gF3Exktj3OUuRJw1Crpco6wLz7gmeXmoawaXr/xArGs9kj5tdJ+WFqjvb98NK4LRVDOphokPpyAsfjYR9x4nxzqcrcka9WWxkoB6bb4ieb/hwqWSsfIxGiFK6cmAkgTQqeXd3cyY1QIFYZodmhTMFju9OL241DitDFVYqDPCMy+GTROtpZMMKuVnlvIG7GuJv0V8tb7JbGYco3Uxc5vcxI8GGwoutCYx7vRW1xcz4dh62zjl0aWpHSyxR7i27xEhgMzoZGS2T+FZubutPQPorx9/2SXotFyaS4Ua2tXxT9IkDdHb6MU2U1aCg8dDLTPmle/jWQp0Mj/qVvoV9AuKMb8Q0mI//dSmQj8yihEq3tLcGxXzfXXfWB20DEvB+tbwQYzFbfOO/qDDlVstFZgu9H1fy0lEBgF+fpUiyL+0m9/AfL9CutdXw2bf8h59d6gLr+dV3J0PSjho2MEaNsKiyH1MNomgtxCMLk71t5ukYTQPeNUpdqHXq7nAMPpd+Q0YV4xEr3y2ALbly/gLX107Wj1Jl2ROsMEJdSfJuu0pPsHIlqvvPlMK0cY059Il7LOkHC8KN9lMTgSC37LWubPEmbTBw/xJsQJFJj4izCNLFNhj3z6rF6IF43+B/OWi1DRzHauoG4vs7LtIE9sWny8BNEYRXjfy/HyRjxqPKMW2RuVJE9iQYDn/ei8uXP0clg5zqKPXKxVyBvUfhpO8Yn+Y0qWYpfIau4Q3VsobLg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6iIeoJtaJxBeAbHO09o/GdMX3Ngh2Y49gOgpaK02AbaEtufl/UeoilRDjCGXeGVjEBxPzjjh1CyJtHsUfMZZBiIvgW1gAf2DJEQjhaoLBlEpZbvY8+nRRV/+5ctluPf4bh3xP/K7AvwC4k5ruvR1s+mACAGIRXgzIiFkISOVezld6EP5mo7ha8VWya5b3CV4VAyIAHHpv+qhoRKMXZGPxacyTXkoR/WpHm3fD4LYAx72j4RH510YS50S/nmbDdXjY6YjS3vEKRCUg4diDdy3+bPvrUzAQBE3d2t1dGwR7+t0H9SkZ5jNvVPs4tkCtbmkLkR4ljeSzy8OLkEDLKv2jYsPcfM5BCVLJJ8MwRiVqnP+VLogZiaT2JW0wfKlS4PGI2diqENrQHn5f5n+l0KmRxrTNYVM1dMY6PgJAkQiJqonpU4KO3WeByV5sectcy8EAbk3kyQCQJlI0ZziFeD2j07PnE32feLFTY6vtoTOiVpBtGCzN6LHyaaq1UlD+rVSKu8uYI8he8jqdSKUwUZny6NgxhY3G4ZedxXA5tMFp2hrLqeaVpYgGA/JDd28WXTqkP8j7TcXSRICVAR3lp6Mx+n8rPDHITBfR0PjumAF+2dL1+kmQj9UkqJ1CD8mBxf2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0lng9zD/TsRt3VcC2gb7yGogD6NLqLOKtFN40qc+IvCbJxeJSy5ZuFWhcP2fTU9Q5srrGZB6liqaoEkbdFLhPge9NlGMTd09qadQwzn/CpcV9O2A6QCLsmvhNtATWytEqj/HQQDXO8fIB2tVlabZxJJVWxsFOZr/oZm/4PTq6+pHlAruzz18Bx0HYIKFZ/Nz0+aWiGmJqrbFya6nG35CmimzYNxgylqG1Cx5Acceo72I5TJ+wbVYLZ06CKqMNVJ9LMM2KBlyM9hvZNFCNNILXtQM1l0mxL/9BIQMRdZHr187VD/thpY+EIraguINeDzmPixME36SEXB1OqQxW8qDCCSF2LEa673lqi1lacgLbboxNc5oQWDWLK7MCOGEJrFj4AJmtlSFx7ttqg789eF2OFRjhhaok/WnKJ8a0irwbsOB3AI1UaO2+BCegNgyfvN/OpHPn3a2hpySvILbRIej8BNhFe/p/yUg7kpN7WfuQGr6RxkGXk5Ct2jfX5S1lxGLdZBIGEkvaoeZJqN8lY22/YGXYLIia9R8w4PaMYy7DeeExtDYSqhmj8BjvMB2ECGogTv/lqQKP8fQ7pFRuvaPsrI2EQ1zN2QqNX0KRPPaqBJvfgSRBDCS9E77zIDq+QCJmrDXlMSlF2mGo6jYZ0QEzohh+2A+jAnhaXQVdF1p/YRcPB7dplqUEYQHuRZoW7dqaZ5w5dyjdUC4LHvWqNvZNpY2GUWMew+GwdreGJQHka4+n8NCUuUID6cUxdGprIBlXTQUs8PlLPV602m+whs0glbz3nVFlThYrtUVo+j76Ntz7KO9LEINgnq+hxqcL/mbmzMXN9W2AjkQgnaizUmrugheh/8q3MeaGNug5vByBLGUFTkeDfGmXYPw/c8Fttt5ADhWZUl+WiWybTcXV26q5Mpcarr3dUM8/srUhB4hLcA+YQhBh50UE1n2Tn+6SjqQ3ky6d67geWxlBuPjrYzPyC+c5mJ3+KdWfZJ/RX46rKM5StLEGvGR25FzuRS1UrMEfKBATBpYMY6+Cx/FGVfEykK9Rl8ed7uHtriLTG1nicj09fuRdCpfjPagzEhAQvgF0BVxOEvyi4LZzkPr4V3THz/gfj5DkBCMlKW2jK4FmBd7QweFI07Q3kzkcVQXvOtiP8IDpK2kHapzl9kfwhZPoge/iKL9Y7LcsqtpNqwomwpLP9IleloxCx8LQSK25Ej3WyCfJvKi1LQJgtfjJES7v9sk60+kL7t5NdN8XOvYcifSghHqtSJ5E1UOJ41ZpQwG X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24e6ac87-e1ca-4d85-2cd5-08db7e65042d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 21:07:33.2644 (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: AM8P250MB0376 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/evc: Don't cast const away, avoid loop 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: EQphthS1y60t Signed-off-by: Andreas Rheinhardt --- libavformat/evc.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/libavformat/evc.h b/libavformat/evc.h index 46b27f7df7..f30831257d 100644 --- a/libavformat/evc.h +++ b/libavformat/evc.h @@ -23,16 +23,17 @@ #define AVFORMAT_EVC_H #include + +#include "libavutil/intreadwrite.h" #include "libavutil/rational.h" #include "libavcodec/evc.h" #include "avio.h" -static inline int evc_get_nalu_type(const uint8_t *bits, int bits_size) +static inline int evc_get_nalu_type(const uint8_t *p, int bits_size) { int unit_type_plus1 = 0; if (bits_size >= EVC_NALU_HEADER_SIZE) { - unsigned char *p = (unsigned char *)bits; // forbidden_zero_bit if ((p[0] & 0x80) != 0) // Cannot get bitstream information. Malformed bitstream. return -1; @@ -46,16 +47,10 @@ static inline int evc_get_nalu_type(const uint8_t *bits, int bits_size) static inline uint32_t evc_read_nal_unit_length(const uint8_t *bits, int bits_size) { - uint32_t nalu_len = 0; - - if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { - unsigned char *p = (unsigned char *)bits; - - for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) - nalu_len = (nalu_len << 8) | p[i]; - } + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) + return AV_RB32(bits); - return nalu_len; + return 0; } /**