From patchwork Wed Jun 5 11:37:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49573 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp318864vqb; Wed, 5 Jun 2024 04:38:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxtLJLzMUO95140UJODVhN5fYTFEuX1DJjgj1SorB8tZc40Soav0XTlZFXYt4Y2hOZeqjbYCNVy2wkTlGgVYN7rnUuWGZnGZOqew== X-Google-Smtp-Source: AGHT+IE5MOLAolZVojptGwRS06I87Wz8EG8bNTX7mxzn/DDAd7DzW/sJa5RskSDxaCMy9LuWZnRy X-Received: by 2002:a17:906:684a:b0:a68:e0e4:302b with SMTP id a640c23a62f3a-a69a023627dmr154896166b.57.1717587502849; Wed, 05 Jun 2024 04:38:22 -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 a640c23a62f3a-a687176f8e8si559865866b.538.2024.06.05.04.38.21; Wed, 05 Jun 2024 04:38:22 -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=XLXjzHcs; 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 C4E9368D6A6; Wed, 5 Jun 2024 14:38:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2073.outbound.protection.outlook.com [40.92.91.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 669E568D52A for ; Wed, 5 Jun 2024 14:38:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oDFbXQAW5xKpAqd/gh5Dtg6jFbXzmyb1be35mKla+tJjtuspDPiwxobXvDsRcN3s5Mwh/DYsVPYti2ZIjO5wJgCTUE1ixf/VNoXmeURmNF1lTT1LfCHBloBHrla1i3QWXxXV8ju73LiZQgJyo1iMnSqv+j/+/f1K1q+rdgsoV1XrD7uwKhYaedS2Qd8+8VGy2pEwM0eCgBugTFIsWIukeAY3J3nhmEQWODUSp8FFfYc/KzIiEbdxKfjE9jkIH/syNS2juMKfgX5oIUiuZV0lxSYe80LVVIn/LMMi9ICgafjWs/Eli59DRuP4ffXO1Ms7fivHSWuP+rdSAo/jMg0Shg== 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=Hqs5Vmgjn0RURqisp36QFOxUuXFiD8t6BQMhqPDBoJ4=; b=NypMAT69NBpRo46PQM6yoMMao19up1SV9g0ieNE/kLliu707OdSIhpCVTMhc0bXURj+uL2pM3G2krm8u82x0s5kfCU563hV9nhx8/2GcSFhhN3yCnrhsGN/pUDUssC4E9Df9jREFUy4X8NvTZMErYEOqTu2ufjQINgy/xxrMQEIqs5yiYinJSo5k4fQooDJpA37CG8okuXztVUJiz4ovn51dfKBmYegVS+ASLBSQXPOlzVcllKotdXHojXraZxOamF6gWezkaFxuLRot52Bhp9BqR/KzONflK5+fuzAgSSWrefapN7eWlGXJYhnZZSaoSlpwVAVTYpfbeULmIhYTxg== 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=Hqs5Vmgjn0RURqisp36QFOxUuXFiD8t6BQMhqPDBoJ4=; b=XLXjzHcsA88x9QgNEhxFX3PjbUVl4iVg5w7T4Piauy3QJ+/sAQ/PvJx5vKr8v94nq+hMBOSzU0nXDefdxWJO2Gifln7HqYkUS4hASZCqrJQ/ZgtmvB95jraSpLPbsD/+26VIHtTXBKDvy2MzHTD3ft5C6BqyKBHNR+Ymecvj7MngJqqpgAASLYc2toblbERp3eRSelUBGJ68CQ4TmqXZQPqEyBjSRPxuD7Fr77uXnI1OdXkOFFFxnauO8LIE1tBhSFoVaHcADE2dakINy/f1yXv8GZGvPOcr+VSv1i4tsx5H/FeFmmHAA/Ae8EDtU8SokKNCznccdeN4SGXrubNJgg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PA2P250MB1069.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:40d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:38:09 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:38:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:37:55 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [KltIJfpAoj8XjnhCYKJ0XPUePQTsC940] X-ClientProxiedBy: FR4P281CA0438.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:c6::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605113801.1559329-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PA2P250MB1069:EE_ X-MS-Office365-Filtering-Correlation-Id: 6199a744-28f1-44e8-17ec-08dc8553f91c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: Kp2Zgup79Grmq9fYhOpjIGfTh4eay4eHyNisxeVZ1Zs1Bq3pl6nQmJ3uqPC4N2cyYzpHITl0lrBDoAAd9Z7O32maTYw8wvuvvb++yJkSvlE3t60P9sXgLtff5TQ2Bf8Kkbsveqg1S0ZceBHFqqzhHzGR+YwHeV01ugtXsJHb/KWTfYpnSbv3LTz/7HmTOZnMzCtbjp+cm57hnCmTl9lqHC74jKVYznk47PX5IaPuJUnfrd93MJK5TcPeS+os6PJLWSJooUVoLTzBTD7jZlCR99WO8KG9XyZ9P4FEjyAoc2cQrXvHOsn7GKJqo17af0ukQ4mgzQ0pvb6FokLUhy86+7x/TQZaxaPZ6WyK8PYa8C3UfjRt8sFhnVLxupwxC3z6ER4xi3xJTFXTJLgO+fu+5NVifu5UvCeKSBqulyrIoq2ZwjypFLUbhGa3zJNF3/RvFDBlc1vBGb/Q862J0v6JQIvEPDTZE/63wvEmRfMZyKduriZxK1CaT4tx0epGdGlpyTkEq0fkloPNpBomjvOpcua0ntJiVSn+JRtWM0kprC8zpgpDJvYlYhvvs/J+sgpqxHHwvZz1cKOB8gwLdYOxaJGrLUTPP/oiaCot/j5xYWdy5Yv/9OY5HsNoKg9vs+9B X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: scbOr9TtEw5Rf8gP8gEvBaF2f9a8vM4Dk0McN2kjxQK2qvnmnuZipuxXR6BG7ogxEVUe2kCZLjIZlGoekZeea2ZGR9n39r77LErB6wQe1sTQbvRQXrYpYfyRbVEihxtc6HumzPNGF1/+HWXYfZ5rqxlEtiQb6AZciL31bFI6HBV4bLpSq0eHKrrXXRQrSQLn89TRGD5A+UqgPlgt+9Sjn3YPi6RZ1T9RmQJWYHUzrS+DNiO6PI2TEvEVZvZKzZoLy1li46XRzX/X0gpc9gKjLhXkzRb0G6OkYOxLclB/hAw4G8PVkJj7OhY1BkitUjuWOYda+gDOMzHqBucGPBGJcTJEFct4YLSCArXcsz/FyO3rDjdlJQXFVUJVoVSo81osb801M6j82veYljr2rSJ0kgFTyr9vw5Z7BTyFHgYVdCuyz8XWljFpdDGMgKooyGgKAwc75/xx6ql5GL1mzUMS8SMGySeW8RcHrc4WjpvHDu1Naz+YDraq6DKphE0Vspc9bsHbfk0AasdsABu6NkC7qL2BEbP7qr3KfwRRSddzLy3B3XgRvtWTryJ+GfCe+0oCDg3KDPzHvH1fBBtpRtkheTJ5N9oUeeg3V5ZD5kJUwfIsDwFZw0gkoG4LPOgIpUAlscI85ogcl0G589lbPslU9bzAIl5nuJgnrWjA3ZUiKIdGHPwO/1FLMRh2u63/W2ijdRBY3b0BS3FBwCJtSdA5vUVykRoBY7ebM0ttH88GSP7jq/hCQU6sho0XcUPsMycgJnpLp5K7uPb+G6tBW3c9iZVQlxn2fFBc+rGUvXon4RbvOT7Pl/HIUVuFjZasI68GXTKE+9e+oNJ5dmj7VKEgv1Tb/tDMVUdACGUxB+dby1b8sGCUxIeDHoliO1SrfU100bffb5wtGEk9B6OwHjyY9kbgohwjyFJbVia0KBwp+ATehVp/5r+w/0TxfA56uVXwQ+Sqci9TkifjNbgIthl99xzvS+zo5Y4Uzxn9at9SFFO9XSFfWCM9icQJzz9HqBicA5cNL6W4wYetegmxXYZSMaq0DPnEIpKDmc2LdvtPCAOZeUKM07OEaI/Itp0Df+IUJCuIg5rT96H6f2i4ZXlesXrONNMNNjke9+skZ234EWADACfLUpnWmpiqk2YCg4QbMhEv42+42ziNQC0bW5tOZPL/FMeBMQ/lO1Xha6Q83vVROawIOKx/BsdtxxsF2FMFN+eYfSm1VV5IigSR7TvZe4r3N1IzgoRSbADecYE2t3cbvGraPQpmqewXLJTnRqPEknTBRf6C7DktkFIb918zfQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6199a744-28f1-44e8-17ec-08dc8553f91c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:38:08.9891 (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: PA2P250MB1069 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/hevc/Makefile: Move rules for lavc/* files to lavc/Makefile 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: SBo/K8MA6v6Y If any of these files (say A) would be changed in such a way that A acquires a new dependency on another file B, building B would need to be added to all the rules that lead to A being built. Yet currently the rules for several files are spread over the lavc Makefile and the Makefile of the lavc/hevc subdir, making it more likely to be forgotten. So move the rules for these files to the lavc/Makefile. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 4 ++++ libavcodec/hevc/Makefile | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8ab4398b6c..1a44352906 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -106,6 +106,9 @@ OBJS-$(CONFIG_H264PARSE) += h264_parse.o h264_ps.o h264data.o \ OBJS-$(CONFIG_H264PRED) += h264pred.o OBJS-$(CONFIG_H264QPEL) += h264qpel.o OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o +OBJS-$(CONFIG_HEVCPARSE) += h2645data.o h2645_parse.o h2645_vui.o +OBJS-$(CONFIG_HEVC_SEI) += h2645_sei.o aom_film_grain.o \ + dynamic_hdr_vivid.o OBJS-$(CONFIG_HPELDSP) += hpeldsp.o OBJS-$(CONFIG_HUFFMAN) += huffman.o OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o @@ -427,6 +430,7 @@ OBJS-$(CONFIG_HCA_DECODER) += hcadec.o OBJS-$(CONFIG_HCOM_DECODER) += hcom.o OBJS-$(CONFIG_HDR_DECODER) += hdrdec.o OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o +OBJS-$(CONFIG_HEVC_DECODER) += aom_film_grain.o h274.o OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o diff --git a/libavcodec/hevc/Makefile b/libavcodec/hevc/Makefile index 9c385ef3da..93ed4213f6 100644 --- a/libavcodec/hevc/Makefile +++ b/libavcodec/hevc/Makefile @@ -2,8 +2,6 @@ clean:: $(RM) $(CLEANSUFFIXES:%=libavcodec/hevc/%) OBJS-$(CONFIG_HEVC_DECODER) += \ - aom_film_grain.o \ - h274.o \ hevc/cabac.o \ hevc/data.o \ hevc/dsp.o \ @@ -18,9 +16,6 @@ OBJS-$(CONFIG_HEVC_PARSER) += \ OBJS-$(CONFIG_HEVCPARSE) += \ - h2645data.o \ - h2645_parse.o \ - h2645_vui.o \ hevc/data.o \ hevc/parse.o \ hevc/ps.o \ @@ -28,9 +23,6 @@ OBJS-$(CONFIG_HEVCPARSE) += \ OBJS-$(CONFIG_HEVC_SEI) += \ hevc/sei.o \ - h2645_sei.o \ - dynamic_hdr_vivid.o \ - aom_film_grain.o \ libavcodec/hevc/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/ From patchwork Wed Jun 5 11:40:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49574 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp320088vqb; Wed, 5 Jun 2024 04:40:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUaM0jT+NwTPG6HyPa2njYTcQibYvgIpanUnlUlIbFYpz8dZbnyyhm639G80sjeEWEMnLp48lKgrdSvsb9iKPhyZK55ZOFCPuwRJQ== X-Google-Smtp-Source: AGHT+IFTMqFyDkDpd3ty0G//5EHCBsWnwppx13Ca62DmLc7e1MlKQ9aHXBkJcpStinOd5HtvTKu/ X-Received: by 2002:a17:906:fc01:b0:a68:f6b7:1fe3 with SMTP id a640c23a62f3a-a699fcf3563mr152271166b.43.1717587645538; Wed, 05 Jun 2024 04:40: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 a640c23a62f3a-a67ea38d8b6si606863666b.371.2024.06.05.04.40.45; Wed, 05 Jun 2024 04:40: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=LRjzyCnH; 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 30B9F68D6B9; Wed, 5 Jun 2024 14:40:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2086.outbound.protection.outlook.com [40.92.90.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9055668D689 for ; Wed, 5 Jun 2024 14:40:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LfclLYukqDqp1Ux/4RcV4zuVjHBfvNd8JWF/VmGMlWUm7iDhgVRgi2oMnvp6y1B27/q+/9AQCk+FpW3kAvCrG/Q6htb7kyQhgSaWGcxWp4LBHj79YEMrFzERX27k0reZWzdNFwM7bZOVS6cfOWE5KtO/GEmYd9AmdllvtxN3IoVSb2BkTUOpks18YLMTTPLjPhbme7uUo4iMdWODXXRz3tw6sdH9NKkmlG/xUlag55F7RpBo6i8kQQo+bRwUMdqovjnnxof0d9+MLxYmnl3z7tbVpl2CvJl5X6M2bAiXZ92ILi7eKTjB/QhL0W4y8pIDqbYbha0yYMC6skdi1sJ3Pw== 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=fIOPVBkK81FsCCJh+xjlHPGTJtN8+UyjzeXsnvR9gWA=; b=n5i16l1i4r1VSsmF8GRGkNVaZyjTVyTvxFnO062fsM59ZF8MnjxpObSm1TFNvMTydNTN/ZKW0n2bOFSbmfSIG7OTpVYpUD/aPgY2biLYb4Xi9XpLzrgslcb5hHckh1t38MVLaQc5b68oFMF6SXZqMuZCTDdcDX2vUdyWyMaYXgB3RGuPFaR2T941B/CfxuRKrmGGQbO3Z1FyXEad0GtK2Fw/IYM4A/wdYMx92WW2bqNR/3HTfAAAm39K6kMPJT7qMnBcZZKXvx0JDMrW5DL3RVdHVhlBENx97F335MKSR1mKiiiz+nuutDP6oNR2mIb/kAD6OL8YzYMcd8vo00xRTQ== 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=fIOPVBkK81FsCCJh+xjlHPGTJtN8+UyjzeXsnvR9gWA=; b=LRjzyCnHRnJWLgzg/lEiEZp3496fD9QiJrxSrVD0ukIs6vSUIAzMZjHmlC6x/XDmT5ZXCkEpbOx3PEY3jg6kWLEgKB3AfnA1eDGC7Gc1Dvfe6BmQMR/Mx0wjxDzQSH9OQ5Fz+kQ2C5bUNS7dKvDwrioWDUqB5rlBl79305j6NJzMlWGzl6VAP5051aFghOkU5Gqq4tXPIr5XFgSPJt4TUhQFwbWjtYXJV3DeqNpJgRuYRozWxMFhcHoYPusPgIAlOJ+0saVjzUrXSh3cmi3TUoD7/2X58mFxTToHtBXR6fi4e87Rw6n3c9zN/W52i+ISGNtXQf8VUFv9lFnSNeMUMg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PA2P250MB1069.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:40d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:40:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:40:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:40:22 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Ix86opizN2/yP+hqU37c01eKxGvxDBRx8cyp6jpRbQw=] X-ClientProxiedBy: FR4P281CA0420.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605114027.1701387-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PA2P250MB1069:EE_ X-MS-Office365-Filtering-Correlation-Id: 06bb5c68-6be7-4638-c4a1-08dc85544fa0 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: /3kGKXJBl7NpCPakH7LmMQldBM6EFoBz/VmWJg5aja1FQkIGxkRfBq+MWlUN379PlWXaKMNsB/PlYi9pqKk70y5QHE+LVlMNovF6zHFXYK8m8wig1bn3L23dHIzU+z7GJaoAJT3xYQnOb/3ws7oZgLz5hAs4yEeSFTu1tP0SK7cjJJzdEHgWZdslw8u+gWDVV2LLav6dxpKZiL0vNoKLugN2c/TPa7rzqVRDOKRmtJx+YeuhI/qGVQXeVNZ0CF3IaFF/FIessOCyuCGO9zI0k9Eurv7AsjAXOv9deg++GPLtryOT+/SopJiCiME4jp+XV3ms5FY5yHDzeIB5JQOqJELL8PDMNgKEYH8R/AGqi/8csCETs1FGJxgWvMBh8QxJaMVZYUTMNc7Tn/Xvf/r0i0gralR5maLO/ZVR5A8PDSlg+mTC4LmpeT3gP137Am6QAu0w6bNCYsdmeTx0FqcWn3kpvbhx/n4c7aQe8v43qhWI+EtTF9puapFT9ojYkOmXt7B0fQz8MuBfymoPHBe0nVBmFGhqsub/1orz+5G3QsaMQN5kvkBLevCI2SNTgN3q6eO3jBU9FOADCEnRUJ3Yeqxtu9TSugFIw8ePDzPDXNLDvXfLCDOd4HAjl1tYUkij X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BgvVukZZHIYOu0v8P4iGfZzX5zylw5AwL4U8Rp9wCD50K+iC1+7kLoQ8v5c3e/OqhHtUlovpd8wvELgCjcOEORlQX7gL/P9sdLB7zG7/WIfWVPtIk5rqIdv5qgmm8dCNnm1YMIx5JDTazi52hLE35Uh2f/NLmmDiaCiCacy55UC9c9+rWmkpsIB7miSQnA3PiP4hFSlCIe1GicmqBX+73cmVWfXYeCT2ZPinRvBhdGbuRVMPcClfCPPbrN2WYRczqTfWu8ACCNBfp8uGiihZh9EHz8xhdnBFW9D5pOdF20NBgXO4rd8ocRdLaHk91/tN2C5DCYEBTMjRVJLz4zDXLRoISKThqKDljYnB6ybH7bz/DfeB0sq9PrQTghC3oeWA5PRIv4d4iOWic1/RE0Vvy9Yd60M5WUL2qpS5i2C1ZjyDIgyJ0my+1Y5CyMmoDUmadOhuM8R8M4GsWZbH7EgY9TY0uohr3JokCGtFLtxKLppV92w1qUez/3idx7Z73T4q/sHdwkFsQMveClX2YFuUHrzs7mHuSG8otS4lKarzWXgZ0RfYbnkRb9HpcOThmhFWnfvZSh/7cUldFYEB0fx11Z6Our4qqdrSVxFc6H3FLWbEPtnZfL7DViuT408OFhGJXskg/RF22taX7wnzx5P7Fm65Rf7xYKvPaP1KCDMIZSHjkHpLSd1KnoIUbZHWZZRfB1dmM4cFsbyCdz+T1ljJ3tUr0x0zczVDkJo+UfkXiLhkmsNE1PFiEYLMfAKz4btaXjgovdaqdthZE929pnI5Mpav8THNh0fADD8J6gy2MlIflTL+guDmG1o8YVP/voJhnj7MCps7hQpqhHkr3oOyx24LrdluUFpLBH+C7zSuNEDLg4ZALU8AzR6m1hz1cXxlHG9Ez4Il7GLTx+Wm7ef9N6k3mxLoi8GHrPobx9aTnc8TQ1OMJTCkps+6+XH+TUpp/bOLf0NKkwiwa966DndGWGpAEVUPwCbsyKJBfDv6OoGyVvmlEJROh0JaImpBM/hChAZR9ak4Ql5Et4J3xis1K2eWCohyDARYMrgr+vUEkdLZL7FdGgVohHFEEE2xTLpgjywDAXSOlzQjfjNZHVhmc3EwetzAVlGY2iT3IPTZtCZJgHUILZZJA0LabY+KLocOEVN6Nxe3TvlET+pMzXyBgISWL2SVZ6S/g1aYSsFKYWjfRzd/sFFanWICNUHYKmu9/8BX9MGz2QMo2OLzSK014DszV4QV0PIjBw+1HpJjoT8KEailer57vxj5G26JlztTjaS7KF28tLLyqBqLDNAOmw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06bb5c68-6be7-4638-c4a1-08dc85544fa0 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:40:34.2083 (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: PA2P250MB1069 Subject: [FFmpeg-devel] [PATCH 2/7] avformat/vvc: Use put_bytes_output() 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: Qq9IIVRFeXyU The PutBitContext has just been flushed. Signed-off-by: Andreas Rheinhardt --- libavformat/vvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/vvc.c b/libavformat/vvc.c index ac3209a01b..d8195f0fd2 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -761,7 +761,7 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) ff_copy_bits(&pbc, vvcc->ptl.general_constraint_info, (vvcc->ptl.num_bytes_constraint_info - 1) * 8); put_bits(&pbc, 6, vvcc->ptl.general_constraint_info[vvcc->ptl.num_bytes_constraint_info - 1] & 0x3f); flush_put_bits(&pbc); - avio_write(pb, buf, put_bytes_count(&pbc, 1)); + avio_write(pb, buf, put_bytes_output(&pbc)); if (vvcc->num_sublayers > 1) { uint8_t ptl_sublayer_level_present_flags = 0; From patchwork Wed Jun 5 11:40:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp320187vqb; Wed, 5 Jun 2024 04:40:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqStP7vz9X1ZgiH9HJofBObG1Nksx6fwnrbY8MYTxY5VZcJkGZFTjiMwLuzeOb9YqrMTV/qBYwbTCmL2So/IzTgQwv016MHTOLYg== X-Google-Smtp-Source: AGHT+IHbEUsesM6YXJYHXCadCH6ZRi4g/UKsQ4Iw6vfmFWgnFhPmDhr8YXlpdU/xAWeEkFZw4Shr X-Received: by 2002:a17:906:2494:b0:a59:bdb7:73e8 with SMTP id a640c23a62f3a-a69a002246cmr151862866b.53.1717587654989; Wed, 05 Jun 2024 04:40:54 -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 a640c23a62f3a-a68cba4058csi413203366b.646.2024.06.05.04.40.54; Wed, 05 Jun 2024 04:40:54 -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=YKYXk3aA; 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 5C48868D6D7; Wed, 5 Jun 2024 14:40:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2092.outbound.protection.outlook.com [40.92.50.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 078A768D6A6 for ; Wed, 5 Jun 2024 14:40:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZaezO8pwyrEcjqrb/RwvvSUFxrX/SV59nzW6LQJKJ46PjXFU0hW8dA1NwsFAXrbU+hUaS7if+9Ki2e3/uYfb3/U8/0G+Zb2ohTqGoG1G0JeAQJazQfHdAatVNw0S3TogcLTeT44byXkI4fFkovH4pVhm1iLjVOg1FuKHqc9GsbimpkXyXs10niB8vzjHejpuig/nVagVrksGqnFGNHU1UaiY/Yl1VFJFht7pEH2mrGco3HEtTxR7fEPCWbFe36zyj+ncHvK2GtSZlCjvsShQmlpKQfGQDLJpFkgtLf82rSerI73rP+iir4jIAKC5lGvYoH2VJfwK9a++Lw4jlHonxQ== 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=mtRNp//+HAkeQfBb/AWhsDPujumhQ9YRBCoQSGsbyl4=; b=my72/bi+2Icm3ZbuJ1mxcTGPqRHmFojBDiIokmDHkYRIHbqBw0sgrmLpyUPtDcJBzdcigf5ZWm6OQrv9ZfL0jx59YNra3ApQLN7CSCYhobr+5C01osD0RSp+AhTwd/sKDo/HTUyCga1IhSzhSevVKtxB1v0dMIhkVitCH4DZ3D2bM0tD8Dgq+bAHqcHuCZPWVBEufzEV35Oynv7Q70iQumsTJ1oBRw/GDo9W8+qS6+SlYfvLAAYj2alCDiPASW+/PhZ3O88lNqRo0KEGX3gpur+4lyWh6jH6R0TC6PsnxBgEGQbORADfivMx6Bm/Am5vJcuWAs/LOIObVMcHEz1nqQ== 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=mtRNp//+HAkeQfBb/AWhsDPujumhQ9YRBCoQSGsbyl4=; b=YKYXk3aAwUt9aTDjThuEKyVhEYHFqzwM4IkmAs9waQSJegltql4IEPSLD/p9zAXkzBptLEE7RSCKCsssmvmyJQ0mUeyZXTJ53CtID9W74fF0Q+AfqZqLw1VI1J993I/tPf6+8ZSbCGx94N4k646NR26LD8AKYxvUzNmj6C1AI3o2f+dQGETj9AGX+Uu631OKqv6C++1rbpOPnesMy5/Mytoe9pLrmfM6ADeEAmzmJVb09swQzRQy+3K+v0IMlWO+MIQOnmQGgYbA2NRsNbFBt0/KFBpU0c9F8HCr1RZp20u7TMXTeCRkMc0KzQJbnmcZg/L9RKq5MN5NtiHGbIm/Wg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0243.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:40:35 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:40:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:40:23 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [12Co8E6d6fnFTWlLWuICChdgAE2FUbWgC1q6qvkV870=] X-ClientProxiedBy: FR4P281CA0420.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605114027.1701387-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0243:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f5ee4da-b028-46ed-9174-08dc85545058 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|56899024|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: j5lYl9jHckr+Iny3i6UB4lhOVCJVSUqn2rakljhR4bkkUmVEeyWMH8n3q8pqS3ASS2uASj9adbHNalsAVjkpIOPrsNNHKQHsOnWsWfqwjpir1qBMSKC2qa7CMHcOk8me7fuQODwHcoDxbN9EKhGHPKMcQcjSBTWNFh8skVo0Hk5dZGZlQnqIzqiC8VyPo1i15evogdY7zHiO/DvedD2EuLtspaxBPDghKHObXY+LauBc7lc0w2PliUT++EujF5VDbkBDZF7w9g3MRB35vvmOkKXmtbkoJeBOPmDMOLuTtDWW2lvEKfhBRua9+hNdEjgoKVTkDtKahOKBztHHeTfKR20N6CObgKXys4BOB6UpUhq0FYaj8dgh37BbN9SLywoPeKpkZAMI6fjeVVWYkuQqI7taH+JL5OTSp6hIuHwFw4R271jJkZb4A1BNPBSYlNtZwU4+7pBEzZB435ZaSu5Bkhsr1BxR1tsYa9rI4xsaycrJQCe6JAS+Q7+3S49HUzRxsgEhY6x1rrnqfDO7UbLBq3QunRhcdMsrp/kj15jtmFprSiNE84UhouwDRlifmMpITsuAR5lHSH2h6C18nleZI7Z0DDR2q5w4/R//WNrGVd/j0wul9LOiLV8nHSxWnUeJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lKhzaMBAH578VAFKR1pELBIapI1JfYy5N4rcEezz3bMCFy3bO/VdPtH7WoRTQvKTGggwsiA52TSMLJvmjjj62/aN2333Za3m59ywmyObcxAiyebz3KUbXkCRPBSsFpYpwd5VYZWT0REp6yd5HY0CF7z8DqQemIyKys7yaIyZxv3jmAArGoo08TUULtckZnfns1IgjHKtHY7Oi8bpK5YIwU+yUfabqPd/f/aQ1+NoJDaYnds2T4HBQ7QGWrV2pHD4/lxkZluGH2kavFIfh6UJA3Xyii9FbmAioWA3G34ZumPnjv5aJtvqxDlrYBAQ3vqMOe2X5V0v3KNSwjyDFEMvwNvr5YuYlO6KiLsly9+54ZjYyxY1/g4gAWZt/DzDBzkAeECvdbCcNJx24rAUzXK5VFcjPi0ZfA0Txn+OAjL+y8eC2kyDeLssW32fhOpXNB97voDZplY//+Zr6I33PRsjnQiqXYbsd1c87ZRE9iNusJ7y6e/h5SUD3g1MARTLyAAlo3y1QsXUg4CIJZ+9Y39AXD7JLKCRjgQrrhedZs7s/GnsdEs/HgzfGON1+EeNibmoeXFxOLW6R75jvfHsFT/oqfp3tSR/zEXVyGboleGP5XPm5GMj4HZYlgWuYdKaVij24BKeXQmWCCu3omGIsDDMKqy7y6Xmje4uomOjfBkt64nhlKCRv4bK/CsZw0gKUYLyDR9+oIliLe6CU5OInkMUMCkx+hLFAScOP4mBPYEycuAAsPI1Qge8900Ll3D6/p4QMKm6cTR7/5+mW5ExfxoPitSIMOCJcv+HlLKsZn/7YrbVy7N+YwYi0bBXyxNGXkoXq8plW6TgH4lME65mE7J0QJ9FQ37jSNVOzkQenAQvG1ZV+2WpJgI+H9dLcnF1WAAH/eukDFwzEcrExe1Ki7f0JVOZjzns99uCYVIH7OmbSGwlKGEDwTMek53NV4U5Y46skkxmNd+IKa0gvXjmkl2HaCaqlQ17wheD6YzluPOnHzXO4xVz4C7xj6eC6MQlft/s3zp/xfvV4JcaquNwD5jpukeERI3dXpaC+uMhHMxT6j+dipxFK/wWQAHEAk1V8+cRPUX1CnSl6Zov6KPUP67tEXWgKLTTG0s6VHcIMX0MmlesUVnq3inPGh5ZbrI6AZyac0G/bwpJeCGMJ2hXCUJPuY+LKX62eTZxVwkcwKJKZ8RxLok9GWH4hL8fVnKA+qo8uRovmlV5IQ8g4S5pAdfrQaBlVrsqH0RebObLRpr80yciEZ0eID2WlB9ufZ8L/GRiJsX4WgCLGufRalK3YBpRNQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f5ee4da-b028-46ed-9174-08dc85545058 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:40:35.3310 (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: PR3P250MB0243 Subject: [FFmpeg-devel] [PATCH 3/7] avformat/vvc: Don't use ff_copy_bits() 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: hNLobnA/vFlV There is no benefit in using it: The fast path of copying is not taken because of misalignment; furthermore we are only dealing with a few byte here anyway, so simply copy the bytes manually, avoiding the dependency on bitstream.c in lavf (which also contains a function that is completely unused in lavf). Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 1 - libavformat/bitstream.c | 1 - libavformat/vvc.c | 4 ++-- tests/ref/fate/source | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 libavformat/bitstream.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 1c4d9deccd..af31d6f795 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -728,7 +728,6 @@ OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o # Objects duplicated from other libraries for shared builds SHLIBOBJS += log2_tab.o to_upper4.o SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o -SHLIBOBJS-$(CONFIG_ISO_WRITER) += bitstream.o SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o diff --git a/libavformat/bitstream.c b/libavformat/bitstream.c deleted file mode 100644 index 2afda37c30..0000000000 --- a/libavformat/bitstream.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavcodec/bitstream.c" diff --git a/libavformat/vvc.c b/libavformat/vvc.c index d8195f0fd2..679bb07a4d 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -757,8 +757,8 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) put_bits(&pbc, 1, vvcc->ptl.ptl_frame_only_constraint_flag); put_bits(&pbc, 1, vvcc->ptl.ptl_multilayer_enabled_flag); av_assert0(vvcc->ptl.num_bytes_constraint_info); - if (vvcc->ptl.num_bytes_constraint_info > 1) - ff_copy_bits(&pbc, vvcc->ptl.general_constraint_info, (vvcc->ptl.num_bytes_constraint_info - 1) * 8); + for (int i = 0; i < vvcc->ptl.num_bytes_constraint_info - 1; i++) + put_bits(&pbc, 8, vvcc->ptl.general_constraint_info[i]); put_bits(&pbc, 6, vvcc->ptl.general_constraint_info[vvcc->ptl.num_bytes_constraint_info - 1] & 0x3f); flush_put_bits(&pbc); avio_write(pb, buf, put_bytes_output(&pbc)); diff --git a/tests/ref/fate/source b/tests/ref/fate/source index a3beb35093..d7b48a8b85 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -7,7 +7,6 @@ libavdevice/file_open.c libavdevice/reverse.c libavfilter/file_open.c libavfilter/log2_tab.c -libavformat/bitstream.c libavformat/file_open.c libavformat/golomb_tab.c libavformat/log2_tab.c From patchwork Wed Jun 5 11:40:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49576 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp320284vqb; Wed, 5 Jun 2024 04:41:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUCTwi2st1YNUJb2lyi/1EVxlF26xnBLbICmuckBt3ooqJupPstyQ+9UdFpa5OwQAJ1ajt1LkEIE+QvnoxyFXuyfBuxcOBvNgxymg== X-Google-Smtp-Source: AGHT+IE7wfa8uk5jbOqipTCPxlg0KVRcSWyfNnyRAaLQWR6RVrrqBoXI9kgK9v+1uapaF5C9xCQa X-Received: by 2002:a2e:a58a:0:b0:2e0:5d7:a3a6 with SMTP id 38308e7fff4ca-2eac797f35emr19108791fa.9.1717587665808; Wed, 05 Jun 2024 04:41:05 -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 38308e7fff4ca-2eaa7ed85b9si23301931fa.324.2024.06.05.04.41.05; Wed, 05 Jun 2024 04:41:05 -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=DhBx1dmz; 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 7525068D6FF; Wed, 5 Jun 2024 14:40:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2092.outbound.protection.outlook.com [40.92.50.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7257568D6C3 for ; Wed, 5 Jun 2024 14:40:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hIY7FNBziLnkHJP7gjPLzTgJIRqanaHbdN69oBtkOS9h3BEjn82uGV+VOqBOdw1GaDmcV1ElLtsuaefKS4WMaK6KNQviQtP9oVlm/P2/jCU4TnGuwPywAnUpLb4SXTjfogYJNa8Pea4EMT3fIrl0TLKxNKUwo9fmzDi7UWChw7XPwVp/4cK/DEUxxMi2uE3exZH34IPt71FsYLiBKXZflrdi9sFKSk07YTwiByr8jg+LNqL3eN+gcoSkBZ8S0QGJ6glCUazxPznCDgXPXUgaYLdOrW/cBgyk2zXsBvMpTUbBFDulh9dX/3SNoW9LXjbMuAp1ablIGtplWkaoENO/CQ== 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=t223tM6ItNetostR66OKg8qpLPyjGc2Wof5HAGLRdNE=; b=dD6uvVmpp1GXAdl9dXpTVfTen83rYAZ4Fwl72ldn38PDrp4kksAV08HMNoQEMlL0jdIAaOAw6Jx+COb9XmqDsVzqEYzPc5XaRG6TaXlNKH2zbmBoxSaj9YQVNUMPVZPaAPFDepGTbNRWvQDpA2mxqzZVL+E5AehepnncibpLinFuiapEA3UXtT9Kxbg1W1g9CqNe6l9Bwo89VatJNBPYDBWgbxf/PFR7ul87vQSAyPhTf1dnlTpV8CZdDkRS4zwN9ywaINlMEQTsy4mx9c9ngkhwuRhYGSHbqBcUP3KK1avRld3HkcmwVwbri3GxTfjNQlcint1vV+Pfx3r7Ti6XUQ== 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=t223tM6ItNetostR66OKg8qpLPyjGc2Wof5HAGLRdNE=; b=DhBx1dmzTBuBUk9STGxSzhTV/w/IC70l3eHMv0IOQ7e8uu879TdVqbh41u8CtOwUe1oA7rP80fyL8KM1Ibeq2b8UgCEna6tUonrdaEFUcsKIKxzmaPj34SVCEUlae0vtABhf0flni6zOASUPxEiwY7UXKHKnUjSnsoesjYSSrqn9XNLt69uIT5xvbyiG/9MAT+E0VAQJ+RYJPGnPAoP7lFRYJYK4dxRkcfrgwuORW3mTs7w17356+j+yHukt37wJ95RAVg4kksjVGOGjAaPPHVAxT/gXxZxMZEDjKNeKIXizq+xAmsuRHp1f9Kzq/UpTEX4PLhXyphRxxwQ0kPgfcQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0243.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:40:36 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:40:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:40:24 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [d3N2PocU8ij2Yegw/uEURQcKWm/DnkAYS1M3HsLzpFk=] X-ClientProxiedBy: FR4P281CA0420.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605114027.1701387-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0243:EE_ X-MS-Office365-Filtering-Correlation-Id: 741f4f67-be85-42af-ebc1-08dc855450eb X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 6w3efz4yJkcKQtVj9iV3Vq9UshCv1h8e7se6IxNFf8Nrv8qBmgtDHmGPJu+OuHlxil+hZA6v/psDMfA1+PWfX4t+4aE/tos9xtLKhw7g0MUY2lWbztjQ2z1c9gYuJb97ExnVLGE/HZSZCITr76ZOc/AJ4v4p0bNO1T/uUi18uY69bx4VuelMw6x5Tmip+5UgIo9ncEazCoP7e4gGGkV80F7uAxmwWUQdFM+VcC+IkgHH3ZdNpHIOv7Df9CGm02tC92IfZU+PCpsPcfXGRF5y9cszxxsU+VylV0UamcOVVTebCrj8ic4PQcoqXgNXuoevIhCS1g2VzySaK4oVjDPfuCVyiNTSRgq3xvEn32aTkZmhvJrp85n6WuAZxeFgOXTBXHTE1WdF1pH6aP+K28zXp/u9lRjeGE9x/9K7m69jT7VBpClSjAFeU5d5bRvYKo9+PkAk3QcxFMu8pq9j57/Igx8RmFm6f/HM4uZBmg8U0TLJti0yOe8OcBCbh52Kj4q/Cmum8NKrvJiVBDcyZBwCi8z/c9NLaKSAZGN14cICJrh35ZqiF8W3HRa2zNoSJgVv5H+t8Y66HfuUhcsjRlTgHo4mwuXwz3B4JJptOv9/Kj9U+XgeSeRl7QMVcHooqmiy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 45dW1Stj0muiLkUAR3pnoXfD6Bv+Y2H261lIBOCiibNgoDn6VLO0+FEQ4Z7tcuT4njUib//D55ni7Ku6p6kQ9LQN1GXekSLZhlAa7zgDjp8vNb7zGLIPCaDNPj5CMGhMZov6CzVBzQ33XWnuYDpeF/x4DF/8jAYYvBGqIQnGOnbeQzqOrekaTfbSG4/pm05t/3OOO7+aHRlI0pYsOoCMGaloLEN0Jb9HMVaUO4Zvbq2iHhPfbpudFRV4Qh3LJHj80/h2HvvSewctYXWL2Fl5aXjEp3qPq6dyny3GZ8SEedTExx3SlXqmfbX388A7yHkyEhDIbsODiIGCQTjiL731JhcE9BhY9DQA9CBBZDGLlmythybq6AKIRwwcbUmGiP3gcEyTOje/6Lm+jCbGnFMyDl/MZZPbsA4w/U7MqYmEFhx19Kv6Wplq/cIad0hOc2R+O9oO7a4NEQ9wVCYovclbHPFe3epVMyArOPnk0defMqs5u6YkmWWxTuGX6KOEw5uNSR77Fo2NXv7k/8evel3mF7lR8i8VriVWVOeIcMXlx2MlPcRaxqHXHsvlNkg7t9KMOmwEv68JkwKtf5z+Bv1S0up0GPQUq3ooCcZsW389jEe45jouetIeQzbaBr6wGjn2iafloTg/0eOhexMNIcX8UlyyXDsy+J8nHR9jJ7bbaHWWYoK5ZIfng8p6qHmOvm75M202plxMu1Mmm/42V+Hlr7aGKCevfBbR4ToMAyG2WTqh0p+CWBEIJOpf5lwfwEjmiP0D+aNk2vhnWluzr51Fxd5rz63rjvm/CFE0QRhGLb9Y87fnoItQroUI0cVan18Unz6k6OrDkq2ZpdXgkNxGxXM7LSCdRwdN5q1cdEdkzrkt/Fs3qjsrK3fq+YwtrU2LeYdvujcxx+20gLqptybuIOIPge30bBbKT9Kk6rOrmd4K3DLO/IDLmuNTxKZUa805p7C8sfllIu2fP7oXOwzixRgMq1kZbfTfAhMZqS86ZD+ZcArNEQKl02I1NKTw/a0OscVWOvuV/9MAoXrJx5FhmUYPXJ0ojVH/7K6RtkKVSQQpXJ1hHVZixH0hkug5PTE2Q713yhwpNttyn5HYviR1BvzJpkI09ud3iHfXYZ9UEcazvRSra6un4iunNmScKt8eZbHV9mLce5MiHWivfYWfn30WmAjIKJLNg7pUsNVqH5Y8BYX+eOOZBfD9UTTvnypgJaMo8bBfWYX9W2ICnjySL/tKO8AbyoqTEV7uuZuEXTw77vLqeHEdGAxt0sQyRUWZ3CtjKrasxOhPc+jewZl8yQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 741f4f67-be85-42af-ebc1-08dc855450eb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:40:36.2965 (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: PR3P250MB0243 Subject: [FFmpeg-devel] [PATCH 4/7] avformat/vvc: Fix crash on allocation failure, avoid allocations 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: MAUX4QOZoN/d This is the VVC version of 8b5d15530127fea54e934043a64653859de07353. (Hint: This ensures that the order of NALU arrays is OPI-VPS-SPS-PPS- Prefix-SEI-Suffix-SEI, regardless of the order in the original extradata. I hope this is right.) Signed-off-by: Andreas Rheinhardt --- libavformat/vvc.c | 169 ++++++++++++++++++++-------------------------- 1 file changed, 73 insertions(+), 96 deletions(-) diff --git a/libavformat/vvc.c b/libavformat/vvc.c index 679bb07a4d..819ee02e2c 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -32,6 +32,16 @@ #include "avio_internal.h" #include "vvc.h" +enum { + OPI_INDEX, + VPS_INDEX, + SPS_INDEX, + PPS_INDEX, + SEI_PREFIX_INDEX, + SEI_SUFFIX_INDEX, + NB_ARRAYS +}; + typedef struct VVCCNALUnitArray { uint8_t array_completeness; uint8_t NAL_unit_type; @@ -67,7 +77,7 @@ typedef struct VVCDecoderConfigurationRecord { uint16_t max_picture_height; uint16_t avg_frame_rate; uint8_t num_of_arrays; - VVCCNALUnitArray *array; + VVCCNALUnitArray arrays[NB_ARRAYS]; } VVCDecoderConfigurationRecord; static void vvcc_update_ptl(VVCDecoderConfigurationRecord *vvcc, @@ -432,32 +442,11 @@ static void nal_unit_parse_header(GetBitContext *gb, uint8_t *nal_type) static int vvcc_array_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size, uint8_t nal_type, int ps_array_completeness, - VVCDecoderConfigurationRecord *vvcc) + VVCCNALUnitArray *array) { int ret; - uint8_t index; uint16_t num_nalus; - VVCCNALUnitArray *array; - - for (index = 0; index < vvcc->num_of_arrays; index++) - if (vvcc->array[index].NAL_unit_type == nal_type) - break; - - if (index >= vvcc->num_of_arrays) { - uint8_t i; - - ret = - av_reallocp_array(&vvcc->array, index + 1, - sizeof(VVCCNALUnitArray)); - if (ret < 0) - return ret; - - for (i = vvcc->num_of_arrays; i <= index; i++) - memset(&vvcc->array[i], 0, sizeof(VVCCNALUnitArray)); - vvcc->num_of_arrays = index + 1; - } - array = &vvcc->array[index]; num_nalus = array->num_nalus; ret = av_reallocp_array(&array->nal_unit, num_nalus + 1, sizeof(uint8_t *)); @@ -504,7 +493,8 @@ static int vvcc_array_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size, static int vvcc_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size, int ps_array_completeness, - VVCDecoderConfigurationRecord *vvcc) + VVCDecoderConfigurationRecord *vvcc, + unsigned array_idx) { int ret = 0; GetBitContext gbc; @@ -529,18 +519,15 @@ static int vvcc_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size, * vvcc. Perhaps the SEI playload type should be checked * and non-declarative SEI messages discarded? */ - switch (nal_type) { - case VVC_OPI_NUT: - case VVC_VPS_NUT: - case VVC_SPS_NUT: - case VVC_PPS_NUT: - case VVC_PREFIX_SEI_NUT: - case VVC_SUFFIX_SEI_NUT: - ret = vvcc_array_add_nal_unit(nal_buf, nal_size, nal_type, - ps_array_completeness, vvcc); - if (ret < 0) - goto end; - else if (nal_type == VVC_VPS_NUT) + ret = vvcc_array_add_nal_unit(nal_buf, nal_size, nal_type, + ps_array_completeness, + &vvcc->arrays[array_idx]); + if (ret < 0) + goto end; + if (vvcc->arrays[array_idx].num_nalus == 1) + vvcc->num_of_arrays++; + + if (nal_type == VVC_VPS_NUT) ret = vvcc_parse_vps(&gbc, vvcc); else if (nal_type == VVC_SPS_NUT) ret = vvcc_parse_sps(&gbc, vvcc); @@ -551,11 +538,6 @@ static int vvcc_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size, } if (ret < 0) goto end; - break; - default: - ret = AVERROR_INVALIDDATA; - goto end; - } end: av_free(rbsp_buf); @@ -572,22 +554,21 @@ static void vvcc_init(VVCDecoderConfigurationRecord *vvcc) static void vvcc_close(VVCDecoderConfigurationRecord *vvcc) { - uint8_t i; + for (unsigned i = 0; i < FF_ARRAY_ELEMS(vvcc->arrays); i++) { + VVCCNALUnitArray *const array = &vvcc->arrays[i]; - for (i = 0; i < vvcc->num_of_arrays; i++) { - vvcc->array[i].num_nalus = 0; - av_freep(&vvcc->array[i].nal_unit); - av_freep(&vvcc->array[i].nal_unit_length); + array->num_nalus = 0; + av_freep(&array->nal_unit); + av_freep(&array->nal_unit_length); } vvcc->num_of_arrays = 0; - av_freep(&vvcc->array); } static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) { uint8_t i; - uint16_t j, vps_count = 0, sps_count = 0, pps_count = 0; + uint16_t vps_count = 0, sps_count = 0, pps_count = 0; /* * It's unclear how to properly compute these fields, so * let's always set them to values meaning 'unspecified'. @@ -672,40 +653,33 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) av_log(NULL, AV_LOG_TRACE, "num_of_arrays: %" PRIu8 "\n", vvcc->num_of_arrays); - for (i = 0; i < vvcc->num_of_arrays; i++) { + for (unsigned i = 0; i < FF_ARRAY_ELEMS(vvcc->arrays); i++) { + const VVCCNALUnitArray *const array = &vvcc->arrays[i]; + + if (array->num_nalus == 0) + continue; + av_log(NULL, AV_LOG_TRACE, - "array_completeness[%" PRIu8 "]: %" PRIu8 "\n", i, - vvcc->array[i].array_completeness); + "array_completeness[%u]: %" PRIu8 "\n", i, + array->array_completeness); av_log(NULL, AV_LOG_TRACE, - "NAL_unit_type[%" PRIu8 "]: %" PRIu8 "\n", i, - vvcc->array[i].NAL_unit_type); + "NAL_unit_type[%u]: %" PRIu8 "\n", i, + array->NAL_unit_type); av_log(NULL, AV_LOG_TRACE, - "num_nalus[%" PRIu8 "]: %" PRIu16 "\n", i, - vvcc->array[i].num_nalus); - for (j = 0; j < vvcc->array[i].num_nalus; j++) + "num_nalus[%u]: %" PRIu16 "\n", i, + array->num_nalus); + for (unsigned j = 0; j < array->num_nalus; j++) av_log(NULL, AV_LOG_TRACE, - "nal_unit_length[%" PRIu8 "][%" PRIu16 "]: %" - PRIu16 "\n", i, j, vvcc->array[i].nal_unit_length[j]); + "nal_unit_length[%u][%u]: %" + PRIu16 "\n", i, j, array->nal_unit_length[j]); } /* * We need at least one of each: VPS and SPS. */ - for (i = 0; i < vvcc->num_of_arrays; i++) - switch (vvcc->array[i].NAL_unit_type) { - case VVC_VPS_NUT: - vps_count += vvcc->array[i].num_nalus; - break; - case VVC_SPS_NUT: - sps_count += vvcc->array[i].num_nalus; - break; - case VVC_PPS_NUT: - pps_count += vvcc->array[i].num_nalus; - break; - default: - break; - } - + vps_count = vvcc->arrays[VPS_INDEX].num_nalus; + sps_count = vvcc->arrays[SPS_INDEX].num_nalus; + pps_count = vvcc->arrays[PPS_INDEX].num_nalus; if (vps_count > VVC_MAX_VPS_COUNT) return AVERROR_INVALIDDATA; if (!sps_count || sps_count > VVC_MAX_SPS_COUNT) @@ -804,25 +778,29 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) /* unsigned int(8) num_of_arrays; */ avio_w8(pb, vvcc->num_of_arrays); - for (i = 0; i < vvcc->num_of_arrays; i++) { + for (unsigned i = 0; i < FF_ARRAY_ELEMS(vvcc->arrays); i++) { + const VVCCNALUnitArray *const array = &vvcc->arrays[i]; + + if (!array->num_nalus) + continue; /* * bit(1) array_completeness; * unsigned int(2) reserved = 0; * unsigned int(5) NAL_unit_type; */ - avio_w8(pb, vvcc->array[i].array_completeness << 7 | - vvcc->array[i].NAL_unit_type & 0x1f); + avio_w8(pb, array->array_completeness << 7 | + array->NAL_unit_type & 0x1f); /* unsigned int(16) num_nalus; */ - if (vvcc->array[i].NAL_unit_type != VVC_DCI_NUT && - vvcc->array[i].NAL_unit_type != VVC_OPI_NUT) - avio_wb16(pb, vvcc->array[i].num_nalus); - for (j = 0; j < vvcc->array[i].num_nalus; j++) { + if (array->NAL_unit_type != VVC_DCI_NUT && + array->NAL_unit_type != VVC_OPI_NUT) + avio_wb16(pb, array->num_nalus); + for (int j = 0; j < array->num_nalus; j++) { /* unsigned int(16) nal_unit_length; */ - avio_wb16(pb, vvcc->array[i].nal_unit_length[j]); + avio_wb16(pb, array->nal_unit_length[j]); /* bit(8*nal_unit_length) nal_unit; */ - avio_write(pb, vvcc->array[i].nal_unit[j], - vvcc->array[i].nal_unit_length[j]); + avio_write(pb, array->nal_unit[j], + array->nal_unit_length[j]); } } @@ -932,19 +910,18 @@ int ff_isom_write_vvcc(AVIOContext *pb, const uint8_t *data, buf += 4; - switch (type) { - case VVC_OPI_NUT: - case VVC_VPS_NUT: - case VVC_SPS_NUT: - case VVC_PPS_NUT: - case VVC_PREFIX_SEI_NUT: - case VVC_SUFFIX_SEI_NUT: - ret = vvcc_add_nal_unit(buf, len, ps_array_completeness, &vvcc); - if (ret < 0) - goto end; - break; - default: - break; + for (unsigned i = 0; i < FF_ARRAY_ELEMS(vvcc.arrays); i++) { + static const uint8_t array_idx_to_type[] = + { VVC_OPI_NUT, VVC_VPS_NUT, VVC_SPS_NUT, + VVC_PPS_NUT, VVC_PREFIX_SEI_NUT, VVC_SUFFIX_SEI_NUT }; + + if (type == array_idx_to_type[i]) { + ret = vvcc_add_nal_unit(buf, len, ps_array_completeness, + &vvcc, i); + if (ret < 0) + goto end; + break; + } } buf += len; From patchwork Wed Jun 5 11:40:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49580 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp324397vqb; Wed, 5 Jun 2024 04:49:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOV/5EAQ60LXLN7pKGV2+ZSqXpp1mgHMzU8aI6e2OLck7/rmYWkt00EZZSU+CLdGGHzba7lo38Z//wldfzyTp2KXTJCE2J/jRBYw== X-Google-Smtp-Source: AGHT+IGvWQLslnfKIMbZyz3YdLBBkL5c+KdHHbQA+4M7aEOnSCtbMZPFTmitBkra4MilX3RxoFlr X-Received: by 2002:a50:9509:0:b0:57a:3046:1cd8 with SMTP id 4fb4d7f45d1cf-57a8b697867mr1987407a12.7.1717588146924; Wed, 05 Jun 2024 04:49:06 -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 4fb4d7f45d1cf-57a31cc8e44si6229874a12.638.2024.06.05.04.49.06; Wed, 05 Jun 2024 04:49:06 -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=E8be+siN; 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 C4BFF68D6F0; Wed, 5 Jun 2024 14:40:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2092.outbound.protection.outlook.com [40.92.50.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C85C768D6C3 for ; Wed, 5 Jun 2024 14:40:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hpk9+b6Gg6+xI3ZcLEHqIExuw+nRG4R3x9OhCRtLNehuX6f7XqMXYF/7sle69vgdWzKkpJz2VgJJ9ryO8pj8akEo0FmAZqigTCJt7PZW9untGCIdyZlIsbhhK8i3kXLQTCoNRCXL1UJNJbgiqFPuaMkfpDgB6umsqcTV18+KMghRCUOfliyI6saAS46HUcvyb5rL6QyPaJslxepKE1y7y+3SGqsPpuw+ojvMW/borkOUjnfAKEhgtqibBSmhyIMRtQwKvmL54fcmnDHr2p5d+Oj6OWlmDN3CkOHKBKZqteNYn+44yZQoIDgxwJGN/Ji+ChsOVCwrXeMbGpyhc0Goiw== 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=y2Pv4UAebV+NRh01n8FHi+c3RX+ugZ/9t+X/Hz0BBmA=; b=fZKvN4hEB+Dx2NqX2h0jRtExohxP1NbWl2OcS9G29tduRKDAy7MZdecE8WwQs/i8UafBnGFm72zKeO9+yRoeXp2weHww5XBLX9ZsXA4VehBj0qKZAzc5Rt7GElXYvREJxrHrweSimt7zj85KIgLw7cSQfp89dQyZmbajxwcGT7wtWyNgT7ejDLYezsvVlsiV7/DRgiBA2p7V6JsW+YQYWD3U7mMrEERlHjhOuniBt16E87u9CalgJtqlhYKoGCtW+we0q8iq2ivR2p3HKaY5Ad4/kY0PN04nJkucOqEfo9DSRU6nSJJygu7YYtQKHVnfxN1jJVEaBEWYTZMgW3k6Yg== 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=y2Pv4UAebV+NRh01n8FHi+c3RX+ugZ/9t+X/Hz0BBmA=; b=E8be+siNyNsbemIvXs9QLJRLJOjcsl7t4xRHCWjoYAEKNL1Sfs3bde6b1O/uNEnH+ioIFklM/vROInbjPVuwRFY1CzxzLcUfokkDpfyFzysz2n5ZSb6Jt0AkvPt7Nk90/EUl1LuyNhyKS9cfZpsuADYTiqbHC1dpJAvp3RGnUc6DA5AFMlEHtV/c5zasEucnZVjtEOEGHnoztUtbnoHmS61DAqdGKPOlD8E6TmLCJCuK2LRywWibRxpqtQseSaBbeJQeWoZFNMfLqRcmupCcMih62+fK82nZyatRRxRm+TDG/b8BN4nmhhOg8ZW8wvnsnkXbGAPO75HuCUacLlNNBw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0243.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:40:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:40:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:40:25 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [m5ga0deHg2El0Q2U8qhzwUveiQlCO2AIqmToHd11rAc=] X-ClientProxiedBy: FR4P281CA0420.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605114027.1701387-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0243:EE_ X-MS-Office365-Filtering-Correlation-Id: be04e7d9-0d3e-4518-73a8-08dc8554518b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: caAOIv6XBJoWs8UzHB38+nc3FBQJan5mUBN3cPQ5VvN92spUh1QNiE5VTD3WxmcXvyF9aGmK6eShmD6RfSrfQBMJbv9j7O+8wX/679KZe4Mubx15/qJaiENJRL75gppt0qcJJ2CXL5dvWH79UyW3eo+0lDpA90KYH+J9pAy0NJsbUt/XPQDKyGsJQ2jp3sc1WvqdO9QjMd3sKTAUF9t0oMxcIgKhEac4NQYEg4chMPeEagaGiUX3cxkQi3QsNpo/mCgd7YWXvmk8B2wS0WBw5i3w2rjP1t0nOENlyAbe2WVjBw12YKUaBgt23ndjDj3n9N1/p3GqBOJbqr8buLCELKCIjnzkMiBIyOe2XCqZwLZdRYvZqPtWK3apayifYLdKCh4eLy9Mk8/bWXHR6ZhOhcgKPXBCBQXZLNjfpnZkTPSk+6MAM92kf6usfgtGRWAbNFeRE2pR1ijOAUxxCseBM7/zC3KJqHuKy81y2AU16mKNpOts/GsZCkmUPq1KVFXNIP4FoC8vIYypwAfj3/sE7rFE1VoOxqI7WJmUam+hgeQr6LdltMkEFjXCD7f6PUVqoqtBGqR8ylvNuIXv2XFgUqdY/PmoPj2RVF2IGfrtswNSry0hTz63PYHLslnulQXR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: icek2/PYyMdsyQjcBMkrqsFrwlskBE4Wo0iV7GIkI/0yHHvfRoB4pRvoEH6A/iSxQxYFSJRlPacXCYBUsQplWHGUuymj1T3WJS7iHDCup7tj6cWEoYURKclrqsM2JSb/sXVLSDQcr7VcZe6Tjxd4Ncl67Ci7elpYlBfNTx90W3EmV6g5i1IAeSxYSyCkoR8no+VbXWsO4iMveMo0xZZa36hRPRRYKY+IjDG42+0FiGIv/lbDJDsM2eOz71vziaHkGYGjQe9GOdeVdQEqILDEvIRdJJjRzIUwn1czJVnc2BUsqmE1Du2+Zc6mXd+j7baVOTDm1Tpz7KAMJDQtglF1XqV8ozunWViVoDpycjmjqO8q3O7xCM1kPdH/U4+PU10qfl/BsFMoK6psUEx58XqkY9j6NfeuWTBB7YuOBxWqRQ/sgm5XOWxIhKsuradb6zKTb7Zso9T6OuXG0llgddW346H5KLLmmS+euNq49ICqFWSmzSaAcg5Vj8DTp/FdKHH0Cy7XFaf995+rwqf0De1IkzYd1QG9qM05sCoN71CUhQR9BVUxi5U54+pxv0mA5bP1P1KlQ35Y+oFZuxlKYg2GcrsSGSlhbbZ9ZYKhvRu9kysJtHbQWHnQwXmQEWD/z9gtKxIleVNBoQTMXDQHwo85R+EosFEIa5Kcp4MuvvuN3eYYuOQwrA9y+CtXqNPmp7bFw2uGgiRlEhhA1qUt0bW7p2ECaxBQ22/2u35EWXRTbKuqT1EHwnHxJ3fFRVDFVWC1TzLBsRom1hPWUHy11CKHlgTERXO/NEuIJTlzvZSVO+5rOPLIfP9+6M7CxrICOsSwpD/C+82LyBdryCf3VTleVBpqkv5XOV/na4vChh4lmcbO1wKqOSTD+v09lEQQ6X4do6UJlijZWmbgSwX40OkpUhXvmxzaBYBRbXfmO7EQe0eABxutrdOOeytwK0Ur62rB0YFTZO5ocyXMD0fHvKa/PzUchvISJhzyx6dr36pNQTX4TZdSnhc+AWaXiieferXoboW8w8DjpCHVw+ewS53GfKhI53ycb4SIrPKPA5VsIVwo8sM7XNAvfThxohKmwWKgwclA8ulrGv6U9plTnILgowEuvz1Fm2P7obQaFjtD1usjPWG7z8j5ZgIxTsclEUuQDb44rXVrkbRtAxxZ0sl+hvJiFm20qeIhUmvDLyYPKywXK05OVhJkV2lt3NUYexsU8foQFy8LzzAjh37y7F2bZ6osjVIiBJeH0spSJhCdsr/hyieYbpx9c+n+NZXhCD/1IVsrw0yj0/a8fb/zHt+FEw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: be04e7d9-0d3e-4518-73a8-08dc8554518b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:40:37.4019 (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: PR3P250MB0243 Subject: [FFmpeg-devel] [PATCH 5/7] avformat/vvc: Reindent after the previous commit 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: +bgnm5YzNKAC Signed-off-by: Andreas Rheinhardt --- libavformat/vvc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavformat/vvc.c b/libavformat/vvc.c index 819ee02e2c..3821de7812 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -527,17 +527,17 @@ static int vvcc_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size, if (vvcc->arrays[array_idx].num_nalus == 1) vvcc->num_of_arrays++; - if (nal_type == VVC_VPS_NUT) - ret = vvcc_parse_vps(&gbc, vvcc); - else if (nal_type == VVC_SPS_NUT) - ret = vvcc_parse_sps(&gbc, vvcc); - else if (nal_type == VVC_PPS_NUT) - ret = vvcc_parse_pps(&gbc, vvcc); - else if (nal_type == VVC_OPI_NUT) { - // not yet supported - } - if (ret < 0) - goto end; + if (nal_type == VVC_VPS_NUT) + ret = vvcc_parse_vps(&gbc, vvcc); + else if (nal_type == VVC_SPS_NUT) + ret = vvcc_parse_sps(&gbc, vvcc); + else if (nal_type == VVC_PPS_NUT) + ret = vvcc_parse_pps(&gbc, vvcc); + else if (nal_type == VVC_OPI_NUT) { + // not yet supported + } + if (ret < 0) + goto end; end: av_free(rbsp_buf); From patchwork Wed Jun 5 11:40:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49577 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp320433vqb; Wed, 5 Jun 2024 04:41:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUnNnY1S6+8lxkoWVApWa9vrjpi/Ss1lDN1LmkUKstzteyn7FujBMRUpe7AjujJR8bs9LktytKCA7a5oaBImYqsA9dh/jDrXzUGvA== X-Google-Smtp-Source: AGHT+IHL7Qaj7C3Lz/EP096QD8OAL7j5D65HstaBbX6/MHzfp7qQXZeWm7o7As03vf1e2Z+HVO+O X-Received: by 2002:a17:907:20b6:b0:a6c:714f:795e with SMTP id a640c23a62f3a-a6c714f93a2mr17394566b.5.1717587683336; Wed, 05 Jun 2024 04:41:23 -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 a640c23a62f3a-a68a1dbdf4csi491465666b.53.2024.06.05.04.41.23; Wed, 05 Jun 2024 04:41:23 -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=S4GGvkEN; 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 4E46968D6E8; Wed, 5 Jun 2024 14:40:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2092.outbound.protection.outlook.com [40.92.50.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDA1C68D6EA for ; Wed, 5 Jun 2024 14:40:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WeBMEJI/wKeD02klla3RnZpLKc574NNpmWfixU5RQXSzG6Q2BDKQlHTSyMWW/1EDVE5VN2QJ7NqYXcyHvqR8RxojAAyhv8yA732HqhrXwOBrPyk7nfA3Hf0IfgGbovKkkxW1xbIRBRzjPfAg9FM+gHiaSxPOwByPNgXMqZYkhfdz0zurocGFe2GvPueFTkLrFgx2icU+st10r/IKJOCqZd83a2zPUjyhTr+7FAeqk/GVs0NdOi6GZ+dnmIZjpBCOza058pIYeg8v+kU3Ew5X7FRokMWfl3KOVI+iTiLD9pnfklB9lWxmLjkSwEPrlaRIw7oxDDQaIWp9dUip9BuRcQ== 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=unH0c2mt1tJqWGp+jJDFWjOzFgyfOD29B/wHD9a+Dfg=; b=AWx8rUPDdt5bJ+1BzqUM6/211e+xaqPjM1fzDpZrqLIx+NUa8jv0E25G+8iFTbjscFPigqsWW+C8h9xJerw15TpV2mfJmdxS++0BeFYXJ2zcXxAhYwfrD0dhpCmr9bavqjbriEDuv8Vu2lC1t2sYZfbYR5MnyDEQ7jFGQ+LKJRPp+nsYJ2MD7C+0unXK0Fjb3YSHRmHfNM88HENxK8ZJ9G0+KFMwp/z/uq8vTobFF7OIJVVdlopSsmLqmcPGIre70IxuTgiQMsge1OhpFc9MiSJ6pV4A+EobWoeU+I2qZbUJpZULJHLul5LRu6d4JyIKUr5YmK7AQUSYRddbNNR8yw== 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=unH0c2mt1tJqWGp+jJDFWjOzFgyfOD29B/wHD9a+Dfg=; b=S4GGvkENbudqVd37K45Q8dBnHdbZfqsds0Uh6rwUiKBkl1O4AncSkosPO6yyzII3zMkj/qIQaDX/ZIXwHdc+D6dZqsfawN7rsaLIdqeAZMa5NFWA6kg2guao4UaolH+Bh5b9RCLABVEBtlMIBs0hbES8x5g5sLFpjghnBRLTtJcjW1CGQUYnDmYxakWLdeCDxJFXb45PSzwcCOHqha8RM2wJJlas2GkBeJT+jtmoy/awD/XAl7x8maG0TF1Xuzo7voE653Yua0afOtsJla7N2wb/1t45Oud+VwxK8cQnGbGHLw+wjB9efBc+p4IpDx+T20bHe485fGODB4ZWkNIRHA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0243.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:40:38 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:40:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:40:26 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [6sF/dHyzzI/QrrzYR6XsJl+QRLijqZlPKZz6vl5N4Z4=] X-ClientProxiedBy: FR4P281CA0420.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605114027.1701387-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0243:EE_ X-MS-Office365-Filtering-Correlation-Id: 050d85e0-d84d-4a7c-40fc-08dc8554522b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|1602099003|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: KwEzVEjG3hjMsa66jl3JEaRTtBATadez6ywMukk6v0WFcVJADxzau18ZvQrN/I7NJLR0QqyMXQaiqLEkALYKViANHie+XdDFdJ2fk06XhLBhXitM0QbCG7SeTru3q8fZ+jwb15RKZ9z0QVvV++oUORB/hjLLkXpwNa4Gz5YVl3wDqR08mXKjC25B8nwIgsf6sNOMtQHN/KkYYNqQkKHc6bDvDDXA47/3UnRJWd0TM0efGknx7xrjt/W5vwxKQ/XD7HiLMnI7A8yfooUttHO1uE2WQ3dsHLm84/eSXj2jGWOk3PU/PmlvINJDJfiSa1jeuR2LDdTJR3PNeTJMs5RyrwIBBuxSC88M8p3vR0JN3U4zB4p08lE/txar6jmN+3TVs72r/vx+qxQ+wHrQIUITomujcWDC+fZpo3gsJR0S656rafoKjqBgQEUKQdKn5JLECYYVLu4FEGIb5lp+q4y6fiRAIRWFfLwanChZ34/Z+OBFN0IzwBxWhzwhLhocUtIIv4jPKrtD/WcN3OFtDEAnn919PrwGr2exOz6fZ3WZQ+cDw8Wq1Uua5YW3ajcQgbY/yqePAa5F7aCnwjlmWQBlxlbPvWaZezI36k1E2a5TSpqgIGAZv9SHG0iE4wJj5uZUkNrvTewcQVaNrT1HZTnfBUdgRzd/MfkdorQDdy0psnBKFSpwRJJWPVvkftO9+hsI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pUro+tCjC1JRSKsZ+B/a6OBoCwuivAreJ2onI9RinsPdO/M+KB8chSV1hz/DPu/IC0m+/X0sQQ+ov11avPFU/UrI8gLfilmBaXejnhrKiEzu0l/sK6VkY1Zu1EFSP4jvXXgOFI5spLJk94upht50jj/DwhTdGd/sN+mpfN3GFXNGXg+VPjrs60eouY8We6p0Gwl3Uz1tprZ/OBycFeLCScjdNm9DaKXvjT2iPgxU1QZBoiZVK2acEe+bGPIJsaJ1Y7XBacn4Z4c3j/F4EJ3FF6KWXnM1N5AAZ0uOlM6vc4mhu7IwcC/4K+BFjJbY34MW7Lh0qXR5IOTR/GD7bEkdCB7KkcG+7rgckoiCmqzY3LfizFin+1BJbDvWBa5msPsiqxic+bgOeboN5OMs+AtK6SFU3RrskFqN3hAAO4kmD3v6JlxQvO4NNSHb2T1h/jOXYBIkRBEaWFZcf7jEcK0rTMfjZ4yFYEdFUOB0gPsPHbyj1aE956xAj3DdYpTa1z/CDFRjkMhcLBRC9FTc1QYzhGSgESqzmbHXOc3PEAe6EDkvL9ARXe17UZ97wBaEIEeD4wmEbgGO/F4dl1logyj8kOqW5Yb74gGl/DB7gQIvu6zvf+Jjog+mfhPFSAKCbbYujPW7NBply28skunDtQ4tEfD/wgfVbg4bDXJ4kNlEE2jO+oAzGJwXMXQH6SJWky7XpHN8SBXPtVnmVukpOACAPGd67bkh9vshjpph1drZbqzfS2FGAyFZPLVV4a+yuiHAHtfReWEFiJ55UHDQC6qvfLE7HqZF6ujZ2A/fK5O+mNskGa+XnzvILk+9q5M2ZyQLQuYA7Uuwzn1SJcH1cXUS38vqHgpZpXOcJF8zEPBYKfv4y2Fjj15Rt7Rd4vTwsE1FwOuN+mtivXkZd04bLE1Ei6YkIsAyKceekVFLLF9z2MFxbw9BwjzxiUO8Edhe890B29UALy5Ajsd/TjfiXywBbSyVeU1wEVCafdDCUQEvDGn9rJQlssIXB3JWWAIUFXWUL1ublnnGNbKmt/4PIVm5OedOT67Nhy3rHYrVEOlwvGWITYVs+snBRSEMdzRyvy7yiwfkCPK2JiFaEj0Xp8WhGaTMI2abkUAKMhvhtBJGo/cXhAJCX1/8SpQNuSYS1hlvb5IBlWZzkY5WZ7sBnGL12rZu2XY31A/+DtnHxQ+4wPdfx7jl2XCY4N4aylhA1wVGcMdKeIk9aEGblyy4Ko1sIzcBR3zCzcmzoo8gbOMyREFfiWMMAaWuOjtZZkSkMAZGUwJrL+NS73mMOP/ANaHxIQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 050d85e0-d84d-4a7c-40fc-08dc8554522b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:40:38.3525 (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: PR3P250MB0243 Subject: [FFmpeg-devel] [PATCH 6/7] avformat/evc: Fix format specifiers 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: IbCZmGRB1Wrg Fixes -Wformat warnings; see e.g. https://fate.ffmpeg.org/log.cgi?slot=aarch64-osx-clang-1200.0.32.29&time=20240604151047&log=compile Signed-off-by: Andreas Rheinhardt --- libavformat/evc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/evc.c b/libavformat/evc.c index 2f4c74fe51..0b72a6441e 100644 --- a/libavformat/evc.c +++ b/libavformat/evc.c @@ -208,15 +208,15 @@ static int evcc_write(AVIOContext *pb, EVCDecoderConfigurationRecord *evcc) if(array->numNalus == 0) continue; - av_log(NULL, AV_LOG_TRACE, "array_completeness[%"PRIu8"]: %"PRIu8"\n", + av_log(NULL, AV_LOG_TRACE, "array_completeness[%u]: %"PRIu8"\n", i, array->array_completeness); - av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%"PRIu8"]: %"PRIu8"\n", + av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%u]: %"PRIu8"\n", i, array->NAL_unit_type); - av_log(NULL, AV_LOG_TRACE, "numNalus[%"PRIu8"]: %"PRIu16"\n", + av_log(NULL, AV_LOG_TRACE, "numNalus[%u]: %"PRIu16"\n", i, array->numNalus); for ( unsigned j = 0; j < array->numNalus; j++) av_log(NULL, AV_LOG_TRACE, - "nalUnitLength[%"PRIu8"][%"PRIu16"]: %"PRIu16"\n", + "nalUnitLength[%u][%u]: %"PRIu16"\n", i, j, array->nalUnitLength[j]); } From patchwork Wed Jun 5 11:40:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49578 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp320513vqb; Wed, 5 Jun 2024 04:41:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVP06e5cXIViy/023eP/GVGcv0pfheTWp/MUOhMH3cX2nUJGJhDTyUUFf8RezPzsQuDJHNbVEPW+NXbjNQdOJOhl2tCq3U9R7WOMg== X-Google-Smtp-Source: AGHT+IEiqMKyknxMpSXnRShrL8RuARKvLGCypbEZ+vzcBg8PqYIEkCv4ty008CeJKxJCoyxsk2cQ X-Received: by 2002:a50:9987:0:b0:579:e756:20ef with SMTP id 4fb4d7f45d1cf-57a8bc8d21fmr1574086a12.31.1717587692989; Wed, 05 Jun 2024 04:41:32 -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 4fb4d7f45d1cf-57a31c8f478si6223356a12.474.2024.06.05.04.41.32; Wed, 05 Jun 2024 04:41:32 -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=awjX+se2; 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 9880968D730; Wed, 5 Jun 2024 14:40:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2067.outbound.protection.outlook.com [40.92.65.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3140868D705 for ; Wed, 5 Jun 2024 14:40:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iC+Bo+41nDz2w2/qDzxkBY4rnYK/ZV1VeuVuyAILLYR1bqnBaQuQNcgiwmwgccQgNmOs7Nr2lxLO5vLYfiQtpt3ZWIYN+2Oa85yO86xeAAsOfdmKNKj9n0QjojofcZ7/B6RB6F2Rd0SLvuwHEeKab0eH7Hz85qtYxaPl6czRDSqvLwy+f1t6tGM3uE2VWIhHPg3F2M+GuaggdL8znTjzHQRuG/YrxuVV5KwTp0BPspbBN8XWR/IdiGdGCy0gXwNKeobbLB4pTO0HkyhJ8HfiG9WCWynjtoZTtEcJIENaIZUZjF4J4ZmV6SPM2zLvQS9iQyb6FZ/5+WvDoPuRaO5fEA== 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=8vta24MqyEpv7/4frByjR5HUjBmerqRfv1Rzs6RrKLI=; b=RIO30nX51MnDp98ET9802b/e1+cYjhJxGuuwf4KhdbeJTtuAPrF6irAZJzCypJ2lIIa+RnFd0LGDo41bQZDE56TlQhhwt09ybW/Fqo11YHpdqJL2r4lY91E75zZaVOzBwt/9fbU0eD92C/r13GjVUTnGIWYpjMmKzVBUZtcgCIZEgr2LdxlGFXj5eSw60e7EOaUprWfpXiLmjOEk8W2r1VwmhLxLMdAQyALvjp+rpHqSGVV1S1mNsowUPFxSJvm3ra0L206xYmSDIPlcoeixOGbqSAhXgcdwzr3+kK8m3BTuK2dTArEWxY2gqdxqhPw0bpRN4AgOHQ0m5F1dDsZjuw== 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=8vta24MqyEpv7/4frByjR5HUjBmerqRfv1Rzs6RrKLI=; b=awjX+se2KsCVP4cz5ng3wolsNd+CwKus/NwhjlH+p/hxjim7kb5slFxhdb9RPdZ5Q+RwDsJZqYP4qbQk0nUIOwgGW/z8CLEVbkf4twI4MkdnAljB5fqgdtS2gvW65nX6ulECo96RzebzMMyVr/pFUTdNFmoPqKC5MQMvN1pXM1SbQu1xIv4VJ7jYC+MRLYR2EwzhKWgdV7lkMImCfGkKdRsogTYuyTe0y+cXRotf99OK2CeK3/2peu9hBYiUVR+rKaTCLp21V8lwi3uNNuB3yvrqufRfc5kEYVwSxtVsbj6o3ndZfehUvgF6E8n9rSrlV7h60yOtkuJlNTtnKdG4gg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0243.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:40:39 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:40:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:40:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [nkG8cct34nMbRYiQJUCW4QseYeQIohdtCzfivd77aaI=] X-ClientProxiedBy: FR4P281CA0420.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605114027.1701387-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0243:EE_ X-MS-Office365-Filtering-Correlation-Id: e0f9ded6-7dec-40a9-7716-08dc855452ce X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|56899024|1602099003|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: ayGAEewM/mtw5yDhjBT3AExm3bUBWMLHJ1yRVV4hkCp38brt5RXVqX+d0DyY5dk7FeapbmIQgN6FM9qHBZzLgKglikcjxpvqxULBzbVOYMZXIPCbB+9GCwG8pAYtbpc7jL0RsqITAiqpAVnJK/CbtHkbT4OXUftKIzyBn4ZfwMjZerOFndMToY7lTKr+yRrhg7elipVJ4VGmGQ720qrbu7nn4ZqnT/ykKqsCvKIbmiaKVI54+r9/e9PNMCinWikSzbwiu2ou59VXgrXiTTQ0MWipqJvDoeE0ppj/msOTek8pELHQIx5JKcG7hf16kO+hwXf61GARgOA74B+DWCG0vxToPf+VFFoWbXFeLGyjCGaun3kBmxD05c9/Ayt9AFJN6qpXGb/0kVzmnQ/+n3P2ewtmXLC+Btu3G7FqbRpOZ7fQ6cl/ud3hBhjamN3nzz9l3uV4PwmpZr01D/RIVZGY/PzxtjG2geJWwcpY2Gwv1RrIazqrh5thp+08vC2WhW120vCrAqVcsJqZwiTbHnYIDIbocZ1CIQc//u91/1uXqPzg4mKk9Z3FcJtA6Fi/yh7oMnmWmmkd8YkT46i7QOQsn2tQjkGgodtII/3g5FIziWR43M/MoWxVNGSru4Gp7B/1+K1l1UMemlKk+2ZZK1pxdGpi77y0GXs0yw89pL2mek6e6tN+K8RvNGCM7HIwLB0J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NCtRqV09KPAeq3Q6OfMah9b6G08egOSMpQBSOZvk8+N6hm5XKvLVs9Kg00trdMLsghoZtpYI9n2XLrkJkC9OX0bz+fgoT9+05M6pihHMh+8rrCcPTYag5fBQYj7XGDflJeCPwdL01Mfji7GKuurKjtc7ecRD0ugrEMsMXziM7EVEfJD+J9OKGJzwWWG75JFXfpvpe28VEcVMeOLlhPedMe6P/cEFN7YDzKaL+bMCiqDDISwPq0BKkQYtfBsrHDZaVZ4r6Q/I45BpPuBZFJ5xaPiUGR1KuJ/aes7p9gRj7Uk96SSKVPHrXU64Ascm3ORJXTGDTo0jb5AS06aWmxcQoUqWWw20IF3TQpFuCijnAy+v5baaUkJXq1+0JBP7gH46wp310VjqJpFR/cwLIB3YytDCO3rnmuBjeEiRBrXF6S62cQus3UvyMpxZjfhLawcK+BBDh+GTVm/9dczM5zpJLxQZa6A5w0UeL8klzb/DEyFW8XoNYZjG2jMo7jww0QuH4f2trNs0IndcvxRHjABSP7BjeUmvmRZ5FGXzccfZCG8lcCHSWmxuUsuAKuFReMgBF7S2KJXh6qLF2jRGMJ0ao+Wr5rAqfKylPrJBavrTgp/T1Gb/utgWaeCtrpFgRCHhkQc5nbS72dQP8kgGJQwMd5bTv4Pj9oEYd7mVJ8u1V7wRSV5Ms654J1mkHl+7hRxi6tKyZtWNPrWg4gDvjFFNh6VXQ2KXHspEuRyWxw0pBesAkFZAwxoBYIUm2SvEZUE7gKYHmR3JrDzeQ/CnlQEhsUTI+/FCK+Hr/dPQI6TnCGEfqYQxg4UMasLebyDaaxyuHvaZimv4r+yBiG3FKHUA6Tc8ujPqVrMDKdk3SsVRf/Ob/l271HZw1A8FG95dcNT6hLW1EyS4xesu/YCas6OGDjgtfc6IgzrFB49KX7IrZURQzESyO5w1M9e/GBbPNLc0aDnVzEiZctjyBfJQeXEFehjmSJS2k34tWxM44bFmWu6XOPL9z86nhxFRMhZmNXSt1rmoa8EcomzhtCAQri4FcI+u22GucmtDalpoG5mTaRJ0T+mh8iA+xT8cJExCv6DfUezSy099QgRW8hD0tHXCHfOeKM9NT4Ck/JzVyelkH/XDbsl7Yuh6zCVTuWqT6ed0ja5O4vnTWfTL7CwUPdKmRNaPQpvywXDu8Pov+OH4IIbds+GRV/MITi5WsUj3Qmw3hVrdz27EqEiZGcqoPfzmEyZzOmWMtKM7bVR6PsUakY2y1EY2ICpBJxN+TYdPkp5ZjoOWaEwXwpxC//beJ3OcNw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0f9ded6-7dec-40a9-7716-08dc855452ce X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:40:39.5212 (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: PR3P250MB0243 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/cbs_h266_syntax_template: Use correct format specifier 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: VFadP39rAjte H266RawSliceHeader.num_entry_points is an uint32_t. Fixes -Wformat warnings: https://fate.ffmpeg.org/log.cgi?slot=aarch64-osx-clang-1200.0.32.29&time=20240604151047&log=compile Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_h266_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 38685704c5..53c4b60b0d 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -3426,7 +3426,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, current->num_entry_points--; if (current->num_entry_points > VVC_MAX_ENTRY_POINTS) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Too many entry points: " - "%" PRIu16 ".\n", current->num_entry_points); + "%" PRIu32 ".\n", current->num_entry_points); return AVERROR_PATCHWELCOME; } if (current->num_entry_points > 0) { From patchwork Sat Jun 8 21:13:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49707 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1753230vqo; Sat, 8 Jun 2024 14:13:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUx9Kl6IxDXmFwZf/aPJqHQJtYyZ3F6p1wm9j39G1ybDPpIX32pEN5ZnZuvFhQ7ASXcaC/7NbRSyzhMUXnndjiWGM8E265XPmbolQ== X-Google-Smtp-Source: AGHT+IFDdLUH47m3spLYohI9ecHj0gjdBo2X4uJEhSzakZJEtNyg6owWIVTSDajFjsCQ0nIVdOU6 X-Received: by 2002:a05:6512:b1c:b0:52c:8206:b986 with SMTP id 2adb3069b0e04-52c8206bdc8mr1596022e87.56.1717881207410; Sat, 08 Jun 2024 14:13:27 -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 2adb3069b0e04-52c82c4bb50si313484e87.574.2024.06.08.14.13.27; Sat, 08 Jun 2024 14:13:27 -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=kTSClsRB; 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 90AF168D703; Sun, 9 Jun 2024 00:13:22 +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-vi1eur04olkn2012.outbound.protection.outlook.com [40.92.75.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FA0968D657 for ; Sun, 9 Jun 2024 00:13:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YL29HAeHhE1gTqke/BdiwsMBFXNYrXQx1SpQOiokTvsBsxbiW3ilI9/+QqQJ7+SSBoFwWumBGBw++JDiPfF4qoZXNPJqY/S7P1iAbn/WmvZ3fYSjdG3H4mTGG/zI7m+CmePtpQ2JLDL6kwE6KK32Uj+2ygcQrNXvMYoyV6VKyWsEaqPA3r6AZqS2ACInnQlnYNakqBfYgPXMPgHlixjzS7IFmI3uVmuGA44LB62xC9IaiDygTSUM0wOd9OFdpy+5OAxLVG+uZVAoIib2yd2I1UAUEprxuEnQmfFqalznZo6bPR6VaPNo0qS1MN1ldJpWMdzeqFup17+BXgoTntlSOg== 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=DQ0P9SEFjR3H++29JMRvUpZWG+ratMFfh1rJOMDKs2w=; b=S8ufrix8c6y/TW1BUJxbQGM59t3k5YZNRQUIAxlCHMCJLNZj75pZHBIYqLo95rUYA9irEFkT+Z1Rbb9zbWSrHn5Mzs9XvCLW7L9i863rx+p6VhPUF8LGPCjYXTuXW9jm4clE3npoxeV9Dwzkg5vni/uXUHyD1J00x5Ox66hUfYSR9LCugS05pEVxKJ9LkSxUXy96pbXPgPgLH9CwHOw4h2uNe/z+vI6xPLyZnnbYzEFmk/CuEQWk2QwufShwlO7E3Vmu5NndN5FCeJ5rYQNfRIz1t832+oG4FhRYAbaYCpKY7Fa1d18AhwCPlisVYcdq7VLQKjQeWBQCcVUIOu8gkw== 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=DQ0P9SEFjR3H++29JMRvUpZWG+ratMFfh1rJOMDKs2w=; b=kTSClsRBwnneS3JForgpXk0xyYixn+SBBoyMcC4ntxMuhCD9dCZb9rzbTT75JMsXScrYna/8TZM3u4kH0asDBrL0OBLh+tSAtvIC64dddXpmgdZODMAwOmNEuK7N0qvo7HEoPV6r+rw+DamTA6ZEds6hmKDgJSOYpfdL3fWobeU6mtDtPdRtDsu0EiF+yzbpfuQ8y4lCJdUJ4C14D47U7bGvppL5ORS6CVUCokvmhOgMmQXfaXFcdoUS7LYZroLESm9uIJ5ohCl+HlNI2i4CeXUzK501y/Zaz7mvkFIDpsWWs9TcqQKQV0uLdUQyIBaM4RNxsuy1K6750MiBe1N+2g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) 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.7633.36; Sat, 8 Jun 2024 21:13:12 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7633.021; Sat, 8 Jun 2024 21:13:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Jun 2024 23:13:04 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [CzY5Ip2W5LocZGLPh5dennpCs3BSIC9Rkbp+Wep4mac=] X-ClientProxiedBy: FR3P281CA0070.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240608211305.2654904-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0376:EE_ X-MS-Office365-Filtering-Correlation-Id: 72bbb4f0-59fc-4726-5e4d-08dc87ffce04 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: mD3QlD2oLB5gSkLUwkvEvP0SlKP+IrakD3vdbBv7QH50//cQHCgMdiOP0RbkrxImBnPI8AhLcOg4qEZSDj3qGTbqkUVkpIHaIWnk7kJoBk11qgjSyh+xuF45Z9O+r3ATBQ6fcWHyFKOeJBo46lf42B1b7+YG+sJVaMlw6hF4EsLw6hOWxHznK9A7Y2lHRJ4krIzMwK+soTr8tPQXxHYLNYMmtaioNUrixvIDJv5281Pijwvz+UmJNq6TsxAg6BJpApSiUg578NhHEjZlGNdsVl0e+IhBalkbiBrrfDkosANHtktjS0wblcJLZ29pu1a79xDqDPLTd0db+9tzM0bnAq0ur0SCEZxYF5A5IGxK5bNRFfuu3aO31HRjvSvUpfmNI+YQBiNw6aHz16KIHC79Ouv1sKwAkqIWIROq9PowUMW2bBinz0tp2KJ6C3evuIbdb2ch5EARiqwuh29AiX+RVmVfd1V+lpchVuYkOexJc74zpg2PzuuPpQgD4gjuf+9U3n1uq1tNxKgWYGi4HhO8WxiGxsBU0P9TJ4bGVdf6uvoYBu3Ppk/SVf+65GB4J3G0BSRuzlH9085J2ia+EsYNSrjGKSkCelWwzk2iIAu0V5fIjKH/cufPgcxEe9yArC8/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rksEspthQwhmoZL6vUkVtULrBKt9EBYmUCmfyMEnVEld5psryjvpkrnj/XHmAJbJEF1192rYplV/uGCboR05CdS4rQZr2A1b+Iu8yG+SpyhanrZo7lYGb7LaADx0dQOYvTm2zVE1JEBh4YX04v4o3K1EgbCwZpe7GKDoyvZAj7R8xnuTgte6khX1V/cQdjF1jqeROT0ZRwyzpBH7M786ah8KVaBHFjWVMKnyx/bo3KD/Emnd+jsy70f5ZZMWifLx4ZVT7ZfxMz5w32kTQqZ/yUIVZ5FcxgNqJbuMiLgre+IzLpiZy6yqgJlTZgHem50LD9/VxPjhnN2r8wE5ZcIeE527ZGvnui3stcOQvXKxQS10vXNQSPx+elEr4X1kyJkUF8xcr3DMrnzasQxc/6sc3k8jlnk2xro+biKSp7Lb11n637EADZleComVtDvE3pp9V8a457N9c0VB1PFoJLh+/uRrySlT9VW2GqDr96FkTL+dk+qxdD+qYOM4YbmGA73L9LLbv8K46rRPcp3C8b3DRBqQ8IeGVlRViMzOx8lx14Wlbij9l8oSh/u1nNa+fBFxdG0+n9u15FEzvfQfq+mgBdMAObh4+ZIHfw0RQ8CMsNHC+oaX521QdsFqZzEVRiCfWFsRZ83qtOTBhyXEY+amnAnDcd4y3Yhj7FY5SKF2UDhy5OCDewoHWoMDWJMTz7Cjn0ndpUML8DiPx3hUuNWx52znHd+sLjxz6pT+OsfW8MSQvMnokvEegR11z5PItg9MmP91N46CihbYG0VMwBcT/0BIjB4SnuyHb5BC52bYJ63DZ6u7SXDjXMD0D7EwBBltGVDnMkchOp7zGMk3W7tNYu3ea6EBHgxc+n2w51bi8VV8jwtU3GbYQWpskvVu8qiV2E+OoEFZwy140oNCnQ6Eqjf7tckQNiy8QmZM83iVkJlr14zAHz7I4Pwjtim6CL88NQ9nPtNVIYjIqjk+REJbZeevla+PFQ/38lt5l+t/pYVaH+4LGtR9dTgYWQmbdLIaNKxravZTDdVV7VharIOSJysiLL98YTdQ6i+IigcNyVICvavRpD3XN/om+5aVOOoUpuBw0gHJOZpXspHh+6sgkqRqbFKJrIr/pS+Qy7EeBsCORBDnUBW9X5CjMxMipOqNtJ1b3sF8Gmp7TrjPwYsMaNcnaEpfhWn3hMOE47QO5qX8J0+XFXt0AJ7os/jukqAioqJxExjreuKSrIQ0XyjACyQbBDUmg0qHE74wja9TsGRlv7brFq60hCz6aT4sA3ev21oetHZnORcdwEbOkicO5Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72bbb4f0-59fc-4726-5e4d-08dc87ffce04 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2024 21:13:12.5113 (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 8/9] avformat/vvc: Fix comment 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: QWGY7HsH0KP1 Signed-off-by: Andreas Rheinhardt --- libavformat/vvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/vvc.c b/libavformat/vvc.c index 3821de7812..595492cd1e 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -675,7 +675,7 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) } /* - * We need at least one of each: VPS and SPS. + * We need at least one of each: SPS and PPS. */ vps_count = vvcc->arrays[VPS_INDEX].num_nalus; sps_count = vvcc->arrays[SPS_INDEX].num_nalus; From patchwork Sat Jun 8 21:13:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49708 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1753271vqo; Sat, 8 Jun 2024 14:13:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUeBbSZYZsSF5TCEo0Bigdwq4BOasPzmXO7bvTXIKtvOdsD1vT2IU5+IjxUhuYBWQZDYSyw48Zrv0t13gLzaGHAcbJtF32ECouPsQ== X-Google-Smtp-Source: AGHT+IEqbaxztMGV5WpoUFq35XMO8xdL0DvsAoVVa6jNHLU5O4crKM3geLbEU9egaw4RoTclnpgP X-Received: by 2002:a2e:b8c7:0:b0:2ea:82c8:c9e2 with SMTP id 38308e7fff4ca-2eadce3f99bmr44466111fa.24.1717881217082; Sat, 08 Jun 2024 14:13: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 4fb4d7f45d1cf-57c71537d60si636107a12.386.2024.06.08.14.13.36; Sat, 08 Jun 2024 14:13: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=mHttYyGy; 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 BEFB568D70C; Sun, 9 Jun 2024 00:13:26 +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-vi1eur04olkn2012.outbound.protection.outlook.com [40.92.75.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9944868D69B for ; Sun, 9 Jun 2024 00:13:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T+xhJLBB592UeI1Z9SNcf2gGPX9jc+9ESfFz8QdQD0rewgY320C1iI8GzKssz/ZktMz3wITpCVFdQ8KamapJ7K1ReZUCr7AtBlT+BuVKjr0iaHnYk0ppRoKSa9yai6C1s53vAxlMYGA+u2/Hy+cDHYI1IRRGzABcV7DYqqYhlIWcaW+ctcfKBgp9DbIVlhu0OTATbY4Q46y+ELErH7Btk4bk0jyTTIDvnOC5hC4ayNRO5BfMBNOlDZXTKmYFh7FD/mgHp5qqCN55+HV3Z0OermGt71mUn1BYIG4RwSEKMKL9UyEJ1rplyZGf2ffO7GvSjyT8jeI1cmmiJM+TyARNRw== 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=x62v6z5+rkbzusHi15ppo+X4gZ9eIsjQT7XxfJeqMlA=; b=aTTbIYBkCLgtFijWUUuKXUFI8EDJUqCJ+OTwvrniR6gh4akafhkzuL7gXYVX93ndONoHzBBpZyCZgNOiXfhujLV0W8C+ZmTRgGOH2PUxNtJuBN8DuR0ImiYwHBR3MdmQ3Ju7E+4tuzWFhSolNEgDGptDvg3HxVzN8BbzpzG8RUzRhswfRknF97DF0+pOCbB5fKhowkJHdN4/HJ9ZgNXakgWeMydxo/w5HkLGunPF1tcfN95d1bYhpZIAXVcA71lJeC/c1z2SL2u6s91sjMjOtjuBlnjc902RyzV6qq4cWCkGdJEBi1Swc/S/qiWoVXXgOMdfyyz5P6s37l9rAehAOg== 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=x62v6z5+rkbzusHi15ppo+X4gZ9eIsjQT7XxfJeqMlA=; b=mHttYyGykpMP+ccAaegL8pxj6iDhAsriVMdPA+7mVmYGoT0poSsmfXP9kTpGFOw+lWGBAS+wM1NocGTuKPvhFFwGA+Q9o053Wddn/e6323HrUZbtou8QRjloddvPhZhUSrbX1hPTwQz8alDglIRi0oV0SgXfDDK5Lo/OGKOjz708VtH9PWUXx3ahjeQ+/almnhBOcyWFxJapXJTOKamLeNiqB3ZxaTK/oTrLTTUnzuz7FPjZohg5LJR3KFUfGvyM1ReHZ8lt4fLCphxuA4X8g8hxMYOW8o9kwLtFQ6XBIR/H/ZElWBtzC7gytkWytRKeajxE11rdh0ancTezYJ3NIg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) 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.7633.36; Sat, 8 Jun 2024 21:13:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7633.021; Sat, 8 Jun 2024 21:13:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Jun 2024 23:13:05 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [rIndCI0S87V1BIdjls66j8OpwoUn60fqjz4859UHHfw=] X-ClientProxiedBy: FR3P281CA0070.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240608211305.2654904-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0376:EE_ X-MS-Office365-Filtering-Correlation-Id: d8ee2b8e-2238-4b9f-9fb9-08dc87ffcfc6 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: UdnkqT884Eo92Vk3R2J+xCF4pWm2X4jav9h1duh+vVVNUtwCSO+cxli32VXacCNdLscJr2SPPn8oQVPLrPVgYZr2lCLdhPysn4dwoJtJYs/rU0x1W/AUxAMV+fWgw0WyOwu+FmebZNjEBBv/KVN3+fXk3VPru8CIxj7EmTFE/InsehqQy6pSlEE/kKCpUIxMgagQ+uCddWvUycTkLl0etpRXjkQumR/iuetiv/eMQ/gjL38gwk3M2EVdfc4ZROU/TyJ6AJB++pfwZjgz2YBWz66mDZ4K8jlZCtDpU3IJfTaRbRH4d+lUjL4dTdZoJcdXg6OsFAwW4UBlFWWmBUIMsQzqvR1qrdVxEzLjD/1n+vICrCwfdviF2ciwDywgUj4jJiv6Y8AQ72lowwP1zWuYomQBoqybDNr8eeDZN4aJVx4b6cW3wNi75SrKkX+25TtGuits4xxH1PVUbxVHUWRBdL/ze28YKU77i/qFeKSGdrEEMmGmlQ4w7x9dHGCRTkYGHmVfJCtMkNlWdsqKG+V0hfWGiIznUOhBHFI68KSRRnfre32tdJRgW2jZeulincMDpH67iGs4qyi0np79Q0AFrdl0NFm7QyxoTqa7QMLXE/yei0ja76lRT2MVUtgSkgdB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ldbajcuO38Fz6JwPtMjrPCd9e3ps84v6DQ7wfzfwP1iAgbQwXV6c5gA9YXUZPZANsrgswqKkE94xiH9qIneDcx76nMcSZhdmLz1/ykO15GdG1tYrkXTNE4buyLJ37Kzkprz0PZwmE2Wgt2C7zX6SEqIX8klcNpH8G1VDE6zKyAbGRHzBVl3+RYvZPbx2YTgq1ORSTdBai5YrIWfgy4GxlxT3p4CCKBquVQO9sXQc+TZdUY4fiEsQi/7ecyzpab0/h0gn1EFCJlLS33A/SErMWsdU7Y/O9IMnX+mT3WFcIxxzeLjrAnzNYzBQjNBJ2UBVLRdHlrpOg26Nrl1W7onWJIWGEKRSPk6zcLu6hRZRvkMDy0dt2ATRi03SkqKgxi6qTzd3FPJLpnU18dPze5vT6KxFPA0B69aAx8lhxiRGmqrJzPEf/3T1CVo4x8r8tbBt2fQPgwGA3JW7YO/pIdHZxrNa8mo345VtDOGO09DQmJJ1DpFbxU25lpw0DsLV80+1SusORV3eDcZ37VX5dG21mWzhYxvdrzyturV3dp1oIkzlSTC2aZFTniSGRrTRLJ2ikMTevsItxsDxUcrJyjO0SdQ/1Bce4aGlYK7087POzSWAZ6APGxXpTg6mPG5G4RrgDjFld5EMw0j/7taibpK32qa+39shatKKTQQMZL2p73At00rV55gz1eHdbjw6KxhL57a/luGwERU9yagB3vs5XZZYSI1tQwKG61tIjvz8Amw/l659eZIfCNsNnrUPm71XuMp2wk5BYWXlh7iRPtboe9yOy/G/KOZM0DCCST4+dBVG405aSZzSoNSJikIoUbgu0S9uLWzk2vUK2Gd5RhaBDH025qyKzyrAxEr8SlolykwBAEO8okLx0vYO8qyIp6RsSgGFSH4ntpDFjrkwrR0TffJgvvBslt50LyVfTQyH6EVw0au6O7Nc6LzhS/wPv/WxaR7tXVFcxsRJaByQMnJBiSkFesWeSZhQ7lj4dLaKb/jrAkv+VlkaU8vqVSY8bS2ji7h/Rr+/Iiw/PwNeMl8zQ+zs/W9q00YcF9GReO/JNlyIBYHorN2zHHS7IUGzFtVXdq0zKiZTNOWz+UZzjWPe1yrhsBeZsSC/aV0A5zq+7Tomau9Byn6xNbxpGzuaQrgNBdS5PaIPMQs3f7BDwWf9q/vNG0O/S9q7PURtH8d0yulFcS/J5gnMtomouj8IXO/sx0/pfBMrNeWNzTJqByCzsh2T6lBi5UWSw029/Oad7xCdkc/qBRG4ZckF8mYkATDxSWTLAcm93+WKIN50DhCG/g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8ee2b8e-2238-4b9f-9fb9-08dc87ffcfc6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2024 21:13:15.3611 (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 9/9] avformat/vvc: Don't use uint8_t iterators, fix shadowing 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: n8xWq7tV29O1 Signed-off-by: Andreas Rheinhardt --- libavformat/vvc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavformat/vvc.c b/libavformat/vvc.c index 595492cd1e..3a686c9910 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -567,7 +567,6 @@ static void vvcc_close(VVCDecoderConfigurationRecord *vvcc) static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) { - uint8_t i; uint16_t vps_count = 0, sps_count = 0, pps_count = 0; /* * It's unclear how to properly compute these fields, so @@ -615,18 +614,18 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) av_log(NULL, AV_LOG_TRACE, "ptl_multilayer_enabled_flag: %" PRIu8 "\n", vvcc->ptl.ptl_multilayer_enabled_flag); - for (i = 0; i < vvcc->ptl.num_bytes_constraint_info; i++) { + for (int i = 0; i < vvcc->ptl.num_bytes_constraint_info; i++) { av_log(NULL, AV_LOG_TRACE, "general_constraint_info[%d]: %" PRIu8 "\n", i, vvcc->ptl.general_constraint_info[i]); } - for (i = 0; i < vvcc->num_sublayers - 1; i++) { + for (int i = 0; i < vvcc->num_sublayers - 1; i++) { av_log(NULL, AV_LOG_TRACE, - "ptl_sublayer_level_present_flag[%" PRIu8 "]: %" PRIu8 "\n", i, + "ptl_sublayer_level_present_flag[%d]: %" PRIu8 "\n", i, vvcc->ptl.ptl_sublayer_level_present_flag[i]); av_log(NULL, AV_LOG_TRACE, - "sublayer_level_idc[%" PRIu8 "]: %" PRIu8 "\n", i, + "sublayer_level_idc[%d]: %" PRIu8 "\n", i, vvcc->ptl.sublayer_level_idc[i]); } @@ -634,9 +633,9 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) "num_sub_profiles: %" PRIu8 "\n", vvcc->ptl.ptl_num_sub_profiles); - for (i = 0; i < vvcc->ptl.ptl_num_sub_profiles; i++) { + for (unsigned i = 0; i < vvcc->ptl.ptl_num_sub_profiles; i++) { av_log(NULL, AV_LOG_TRACE, - "general_sub_profile_idc[%" PRIu8 "]: %" PRIx32 "\n", i, + "general_sub_profile_idc[%u]: %" PRIx32 "\n", i, vvcc->ptl.general_sub_profile_idc[i]); }