From patchwork Mon Jul 8 17:09:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5920589vqv; Mon, 8 Jul 2024 10:10:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV42lMmpD6C3mHWMMDe6qbomaIRh6mh0itCv0jS2Ta0SdSbEJEsJBRF5Q3Fm7NDXtTuWOFuTSdES0JY3CuDba7kqkbIV+5/NJteoQ== X-Google-Smtp-Source: AGHT+IFpyoz3fgBBqGcQkNTFa+cbZBRcMgp1BRfC8/kZ0HCC2DPSwRZuVra+FCYwveox4JDWPd6K X-Received: by 2002:a2e:b0c3:0:b0:2ee:6062:b559 with SMTP id 38308e7fff4ca-2eeb30ba0d7mr2666111fa.8.1720458606670; Mon, 08 Jul 2024 10:10: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 38308e7fff4ca-2eeb349efbbsi274881fa.481.2024.07.08.10.10.06; Mon, 08 Jul 2024 10:10: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=mMmS6WwZ; 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 23A3F68DC8B; Mon, 8 Jul 2024 20:10:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2109.outbound.protection.outlook.com [40.92.59.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87E7668DB4E for ; Mon, 8 Jul 2024 20:09:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iimXSQ26jkn4QpDxxCjjdM/AoCv+DJIfuSGWdLSs/vcrkt46KS1Hf7G6IrK2Ppr8HkO5KBk2HzV1jma3ShQcx9tdLIZYXkrbZluU476Ftn8FPKV3yBv291K0f9WB2+xkYPJCSPVw4YtUAeyBrBaiE65VManLGb1/yp5rDntf4LrCpzGdHxEA9v5wF4ovDfX9+LHdBfsBCPTQqxswhDj3pEMfWxxkAedcImmTffW4LdcStg4tua8la2wEjlz56jC2lUYm9PToLHDs/jnLIVP3InNTyfy3zvEn8ZaneVnTlc/8xIyrAvsGFr3VPhurHDIWxFqJOlOJH/+QF4xgUSgN0w== 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=0fxME9OLO2uQtFr52DCqjcHEctagCFn85uT/bacOFrc=; b=LiYUXySH2F7k3ootUfFBCP6LBpqG4tMclXJoFXUpdngCWBF2HCgOQP0iAWs3TnYGyKCF2dJLdYbCqp5M5ZF5WFzOJTdEhLMLz7OVffvBiBYx5wqcCHdPPnSxy923sky0rSJnnmqq/590DPrMhSUfnKaiUmckdRjTW/L4pl3y6rXCKRjNYUPg6NoJLoCWU8/ZNiM1C6PgRieLwjU5NH5zplSFQYsHw2umcPsrOv0dus5zudiLhfZ+MyFoydRj1sXi9xNkfOijFtCJic+hXlGVpnYEsb/oJvFAe/yESULu5NNoLSkRE9wx1PVHVI1affkdqCU9xRD+LBrDyLUOTeEEKQ== 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=0fxME9OLO2uQtFr52DCqjcHEctagCFn85uT/bacOFrc=; b=mMmS6WwZO2Vvkb6XDJhPGkwnzgwTzEoTPKkkSO8Y3U85ei2pBY+CwEQ2Ze/bImPgEWeunhB9Lcishm8z6RqXl20WIUBdH68qSrs9MiohS/mdALLLp/sLBVjY2CJP7T7wJpx6kF5FfSzmwMpsjuPj8F/7eE+s9wISJo2OwCCj03CAwZlRduMaNrTjSC2sBGk6+6guHb3MriIuBfJoB0zNAOTjEZS091GEeDeqUG18PkDd6b9NpuP6UTwtaAf/F5hzkRKp4S+j07FqzslGLjuq9YyVY1j91WVUfRMmrBArKBOT7dCkE/FMKOOcPgyLW3As3pCM59r0sIjuGxc7IxCi5w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0181.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Mon, 8 Jul 2024 17:09:55 +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.7741.033; Mon, 8 Jul 2024 17:09:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 19:09:47 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [ehQkkrWgUaHEsNeo7hk1v8hqn0XVO9KwNs4m6MsMNDI=] X-ClientProxiedBy: ZR0P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240708170947.565760-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0181:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d573388-0b8a-4586-253a-08dc9f70c9a3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: wPHJLMbTFpsZBoYDNRHn5aLSk0tueYsIq15fOuETcVRmANI3AyhxWhvbHttTA1z9QDaJQo1XrBSFlVudgSfELq0at9jMi7c1O8Hfr92Fs5hXoDav+WPCOqtlIDweKF5LjQrt43uiQK0zLn2qMT2gYV5HPZxyhMhlO9qHa1arwI/KHFn0jGETvEnF6PfnUfGrJpL2zr04tAHuFhGjaYUfL5nAPsXsIsXtUh4saX1qMNfeXPiYa8mo4x42/mW/VHnTxUa2KzQ+GMPhvT/jjtSHvOfoI11lop3QR1dmi54ssbGjSd8rUkmDwa1JoCfjVgDAUndl832EiBvLKnmndVLZLZhg7y2EsE0PQDjMvw99rk2AfmAvO/ifO6oUDqVxbFnMvcS9Sab4BbcJXFIlYJdW9grYtGJKif3jsUSc3+Lg6Eh8lICBe2T2L+ckpWHaODVnIy8P46tmxX2a38hT9NFh5GAqyXrOuOD4F7ORgn/1TWAN8lMQ4jfSvBzIGKFI8mcpVrJq2gxdMe22se9Km3eIWiC5xWGMtnE5jH7w85LMWTTWMhgVXBB64Mt0wf3PUPTZTJHX0UeI8GUuW4cXCNkKb0HjYm3AEA3NgGFDEWk2939tVXvvvgTspwCrjy7gGUvmwg3sGRO0YqMyGNZG/27ROj41JTRqMyUvHdYOrKrZvP82Wt93uo9YjsW/FKeKJ6yc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NJ227qr241Ov15ZawC1ql0N8vllgcqStkKXjKWFyCULz9in85zfSpi7mbBeEqiX8AQTbPUHMAxkhUOoOgxniVpr8+Mraj75A1IH7lW/+Iu3BVInOemVxAZkDfO6r4Y/wGooTJ0RLTLUgFjsnJey8qEmNUEv0i+UiLfoYakAgZOpDIIAU4whYq7MI2XU/tt0bHhYCVtlVdULeut5utB5/2Kp3Ml9lljLF6AxKNTvor0F8jB5XvHxVkH6lVIVdbL/5qQLOUeOQJad70Bhuu75FnbpzGGrXeaxA0sDJIx4brKNUhdP7kL7UNZgSmqAJEJwYxNY2w5Rq3smJh7GfTmvKc11IpNkM89E4YF2VV9SQehmx7+20xQxIfm3VmuqxgoiRWSvcExBH0pkHF62IlUbaf3oF+PQz1rV3rBbQPxE9YhQUZqnxZV8Hoctoa8TtsMFsP+bMFElgWNAWcifeSb9EuKASDmiU688iLml9r73Gu1Ha4GovKQhYZG9Q4UA+PoM4gNvoOTq+vQ8O/3p7NEZxg2yDSKD6KZ75v6o1kzjEgu53W+KIYH1nu9OJKwnzfy8MNzWzNsqsU1f8P5WwQl5kKMtTH53c2rbBcgbyT8xEg6vw/OS+Ww9yXj+++LtC+MtGpsGSZCd6DXypgV7zqVop9r7BPb6OgAAHGckLV6sb9rkM4GpeL62x6+2t8ScIOtH4XVzO9vwCG3Ws1oCAfHBZCcQ1O/okFrhoVWsJ7CYucXDkWO559wAGV0Llt/4p9PWsIfCGCgzcDDJU01OX3UFYkO4Iy/Pf7qv+17IGm5MaXD1e7FlCq3K3wD61RsMOXvwuqhKpKsugiR/vG+z2sF1G/NKQgEIYnC77cCb40L3REAzcjk+D8NxnNDT+O4vRA1k24Wob9J5yZISStUbQ1cpACSUEsu5zySnfkpbP0RvNn1Ou4FRWGzixPGHyBsyQXvI4zTBcCVH8py01csi2J2O0uGD/26jYJZgZ3VyFU1WQUMTtuCPULe9O0Q2D4QyQgIKQeQq2jUKV9JRemCN67bhinax4we/eXJ/Kt3g0PGwjIxIOHyMqzl84wyx1oRmd3gKKY3DJh6dTFmBdgO7tjQhzsRRbKU31fYvdpxJl41pFRIoNrjAEoESXIAxHHYN0mpb0UJ33lWqdjmO8t9jrMBFAypUqreV9zORIExv3juk6XVQPdiIKakQXnju+sZ/NDzPqBuS69+SGrmIGGDjafaFsnV0KqxIX24nof5+D6RSCSwgXKyE4M5t44NfayhbzDk5GsyT75TjR9mQrmkkvZ5lqTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d573388-0b8a-4586-253a-08dc9f70c9a3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 17:09:55.0098 (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: AM8P250MB0181 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: Fix potential stack-buffer-overflow 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: p9L/jfTYAAO2 Forgotten in f194f291d8082134cdce625b0ca3548067428ea9 Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 216cb48884..e1adc0eba6 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1758,7 +1758,7 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, uint8_t color_space[4], projection_private[20]; const AVPacketSideData *sd; EBML_WRITER(MAX_FIELD_ORDER_ELEMS + MAX_STEREO_MODE_ELEMS + - MAX_VIDEO_COLOR_ELEMS + MAX_VIDEO_PROJECTION_ELEMS + 8); + MAX_VIDEO_COLOR_ELEMS + MAX_VIDEO_PROJECTION_ELEMS + 12); int cropped_width = par->width, cropped_height = par->height; int ret; From patchwork Mon Jul 8 17:24: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: 50413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5929054vqv; Mon, 8 Jul 2024 10:24:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWAK0GgSwmw4WCRvxPi6aLzlPLGjGliW/cdaeqqFtN2q4bGNaIaUAYSxru7s8ZoOBZD5FBT5J4ovBt1Mx9HNKRS4ax9byhtWn5yiw== X-Google-Smtp-Source: AGHT+IFyLGtjD1hOMaK7M4QgZDvMlnugf1xZXgCCyhWxbgoN+ZPQKoDC+1pR+3XAAjpHXvlAIMGE X-Received: by 2002:a17:906:d195:b0:a72:b4c9:2be8 with SMTP id a640c23a62f3a-a780b89f634mr12641066b.72.1720459491983; Mon, 08 Jul 2024 10:24:51 -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-a780ab2c994si11554066b.802.2024.07.08.10.24.51; Mon, 08 Jul 2024 10:24:51 -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=pvIvAD0D; 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 9EF3E68DC88; Mon, 8 Jul 2024 20:24:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2082.outbound.protection.outlook.com [40.92.49.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AE1068DC5E for ; Mon, 8 Jul 2024 20:24:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VyhIUhPuirq1XPwYXf9QZ7HDnyilk+OYTVWJOqIkk2/qK8BBAOrPBBabS21XuLOSaqhhv/Ll6jJG+BOoXZpu4jDTKjNxelqKkzoCFwGmiEtcDAdgR4JuX7r2M7YVtFasJyZkT3Gjm+OOuP9hvwUEkHtLZb1iuMXZUBTghKFkrEudGYt/YEjR+Q1LRl6Xhu2pJMw7JDxU6KmWwWSWFriWEkvg8RzLMtv+aK4yDaLXtxJHUmgPE7kJMxFxphPfjkvThzD+VE4lD4fbwo1m6K+UJQeWEubkt1hBCGC97L8LTSQWP+ALEodW+UUNVcFh/4GIzFo7jtiIBKq/cLNeHfBLrA== 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=JP5U+cdnmExM4v8SDnTQchbkwQM+kqcNBpIbU3pWjhY=; b=OgZQBvVNhf2pNet0gXINM2/oLmITiqaqygPMtdRXcDKwyoF5pBlYHWaEVF/L22qI1gQMKQgqcRAijN+so0zrZq/voBSZqydd44MFKn1waXGbE9IRRFu1kQonNgS9ib2aSiFstb5pe4IPMKnrktBX9iwgbzVLxESnlcCQZjWR6yCH08LrfbeDXJ/btpNll+NPZcWk2eEUkqalLAvlK8kl3xN4HihCYfkN/2aYADd3K5Z04g/bQ+p64OAbEKxOs3xzljjX11Wvza6bnzkrd9V9W4fAuI92s6BDzqQecp0zF2mLqEkC/8w5B5/raa7M30hkeV+1AMBEXWb1O/14Kjf4Zg== 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=JP5U+cdnmExM4v8SDnTQchbkwQM+kqcNBpIbU3pWjhY=; b=pvIvAD0DYzYq1Fht2EVdbINWmEuFovroajIzehbNj6lVjO+p6s5D0TbB1N+JsqDoYvlKC2rCpTjFrF+ZVBnsB7SofX1VdABuOqUHDPiOkLIjuY0+j6UidG+sjVdR8YGS/8BfxjTr1e5TVPhI3kBxx9gK3tmd4U3WOdhZmtg+q2sOzLW5ruwrncM+eTqcuPSk8w/0IRW4yxYOyQo3WQlFH7x3sEZloikBZacPd9u56IZJSE7jrm3m2I1VxBwQToYy0QaULsgJeHudWeMRipNLHY39PrwuayCRW8bsbuQeX3WO//f+55Y2znDkxCXjHdL0rpKJ64hjnrjHFch0bnt1fQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0558.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4ba::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Mon, 8 Jul 2024 17:24:40 +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.7741.033; Mon, 8 Jul 2024 17:24:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 19:24:26 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [I/gCPUumx5YNarSo7cczZaPHhzzYQr+x0RLcGWti/Ow=] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240708172426.729003-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0558:EE_ X-MS-Office365-Filtering-Correlation-Id: a0c59b33-4178-41a4-cdf9-08dc9f72d570 X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799006|19110799003|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: jHfrE4Kbizh8SAFl2dV5Pen3pEEQP72IKW4WVxYmGLWvAvflOEUTyG8FXg56h9SSI9sKn31CktWnMLrZdMpkCwBXUEgXnoIrkiCzof4df8QCHdGda8/B7LfEgpm7rE2yT7yo/Y+0SDJgjHnxc52inlug38D1x2kSXUTN184aEGXJXfTPe04vsZaWpDTT/YVLEqSVVmBJS/g1RRuKYCXRcf9Ax55GefVfqQUO4Pp72+H+SW5F/xB5P3ixAvfYysf9hEgo8o/83G7574uSNt6Chn7SI+HAcnZr4YnVGb1n25+C57EchoVNActduDM+cudCJ06VcuBnsaGEAoXEVpSAatHgGv4Qd4fP3pPJCbRgxcnh81CnJ2XbkZaMtc7iwxBmovku270R0Wxnsh/Xv8rmwc+QNdo+LXG1wmpypo0v9Ktce8ijBK2fQRnKaePHETzoUp9f/T+B3W3F1Cd/CJIREQJCxfWNSKAom49MWEnfRaN4i4YBfThXbMsMaRv2TalpQkwWqILXRRyBoEcOhcGUXiuRtRrL0seenee9sf73DiErHzRqLYbEHKntPgARJIJIluKBWwvv/Qw+f/Rl0W/fuha9ez21r76WG5CBaBaxH06eY0Q920nf3O3480Du0/CzsrF9PcGTPFT9A5GZgN27rgjGEIkptVA7IKT3wJE3DYMvJ3W7AB6dGbt98GAZONF3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6DVfOloPAeZB5tLp2sCQWmawuy3CY4e370T8rKKYnY5k0PAskfSOCs1o5oemT/OiqvOUMKPCJyFmfxggTraoD5bKwLP07ch2L3e57O3s55gnKjt7915m4DYm5tJkl1qiQU6Eizs1rz9DVZZ47X//txkDYHB3gNdTwYF2Q6XkIobD9UCaDIkMKoFVUe1NiHRYOiQYtaBGW53VkLdeAYKkjJPmuq31kq40Ra6tJGRsVwRf134wkbg5OFDwJ+TEaHbJUxo9GHRT57twYz69GwIpiDDmLSMOyvrokHAzOnjiHRa4Uf2Ac/0fx2nrDx2mRkYoDE3msJbQgnWMIGKNr0240mWF96AgAEK6P/mlb7Dy0/j/76N1QziqlLR6689AfGAJ1w6oEIvS0TLlBijDuiYd6hoNtyNmDygwdIdtVcGqL5jHn+9+/HW1DnTkIJwEE3mzYunkAVkPHpZ2tkctoLRK1T5VaUKmGl+P7EtQQqO2DdsMuh9crMY/X4Tog5Haty1ZUz41stxbTxTaj4kdHxXzgepYfkKGHjt6PmoQSodBR1IKWiJyt1tL8rZWCe3qdrzmo3zNGN3BaY+LdW3btzNw4tqMi9wKeRKbEQilnxlrBcM0pz83yDJ8tLiN0Q7OJ2pn4wqnp2JnAhHuI45BGKxq2UcIzBOvufsiTgqYN6AYUZQt+QCHTih7sANe8qf2xtdTNJupjmCZdttwQk1Ey+cdH4awKjNQYC3Qpfkd7ndDgvzfELwv8PtZ9+DLYLk3hO9bVBSaw5I4rsA1DqNdA0nP4c5uj5CZ/k7ka0U6uMLAVHjiAxqBSXX0S67srR7cOhpz1julGV8gdeJhpaXvzXlCNMZLNVBRyLxACrsoO1ivwRj36Bus3OwJHtBivJq/TJkmRlZPD/DKZntLOcCqAGsV+tL6X03S2RuFsRTkkYc6odzTTEkbn98nNOWoSZRcA7Z7r+hHS/pnw+nehZN1Y0N8vnqdwtwLMoTXRJLgTE8xGknuRPaf/ry6oOzUU5dwwQ8YM7209VJLt0WikBfDyE7qAe9xH3F7kTl8xOT9Gic310oCFQ3FtTg15wcm04CdgZGXuSPNi/Bv1EG1ozaUpkuSSLONIEpxRIG38HTRdqUoNTheo3nVFoyBp9astQ/dz7YJTBTmxHiahWC6UIkD/bXunB6P3Mto99dZ8w8d6O52KSUR/LdQNcxF+lpzh+LcJbxJJ1+ALZLErxB+mHcbJPgBHfp27kvEo1U6mafbkf9c2CyXkrSur2LIzLOin8bixwEmrt6KcqDZHLqqPt4fWNTljg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0c59b33-4178-41a4-cdf9-08dc9f72d570 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 17:24:33.7706 (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: AS4P250MB0558 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/matroskaenc: Fix and simplify check for invalid crop values 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: UcaM/KpltH5z The check "left >= INT_MAX - right" is supposed to check for whether left + right does not overflow/wraparound, but given that left and top are uint32_t INT_MAX - right can already wraparound for big values of right (and ordinary 32-bit ints): If right == UINT32_MAX, INT_MAX - right is INT_MAX + 1; for left in 0..par->width both checks will be passed. Fix this and simplify the check by using 64-bit types, where the addition is guaranteed not to overflow. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index e1adc0eba6..4b91283119 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1786,16 +1786,14 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, st->codecpar->nb_coded_side_data, AV_PKT_DATA_FRAME_CROPPING); if (sd && sd->size == sizeof(uint32_t) * 4) { - uint32_t top, bottom, left, right; + uint64_t top, bottom, left, right; top = AV_RL32(sd->data + 0); bottom = AV_RL32(sd->data + 4); left = AV_RL32(sd->data + 8); right = AV_RL32(sd->data + 12); - if (left >= INT_MAX - right || - top >= INT_MAX - bottom || - (left + right) >= par->width || + if ((left + right) >= par->width || (top + bottom) >= par->height) { av_log(s, AV_LOG_ERROR, "Invalid cropping dimensions in stream side data\n"); return AVERROR(EINVAL); From patchwork Mon Jul 8 17:52:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50414 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5941951vqv; Mon, 8 Jul 2024 10:52:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaeu+Z9nQeOLJ7FySs8EV5D8j31ui+eRbyll/GT9ZWyM2iJxEdI4aHnRGGnyaGsy+pJK2T5rVm3TXpuZSesBnsNeKDumfW8SMIwQ== X-Google-Smtp-Source: AGHT+IGgzuUGO1EqPBV31+eXZM0mK0XlRSeMKimmPTqAE7NTgQfBlqIFEiBtvdF27mmlNdNGbHNl X-Received: by 2002:a17:907:7808:b0:a6f:b67d:959e with SMTP id a640c23a62f3a-a780b87f058mr18557666b.53.1720461159854; Mon, 08 Jul 2024 10:52:39 -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-a780ab2c914si12960366b.724.2024.07.08.10.52.39; Mon, 08 Jul 2024 10:52:39 -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=C63xDqp9; 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 2C61968DA4A; Mon, 8 Jul 2024 20:52:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2095.outbound.protection.outlook.com [40.92.58.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C166968DA4A for ; Mon, 8 Jul 2024 20:52:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XwEy1KwfqYwqoLsvcCX60VmETuzamtBfF+xPOXMvhCBWLITd1GwPEN4xQ8xIACIWwXUIQbK+o2h8gSqyqWFjtYOTi6jktmXeM3haMcaUkLPDHF3Wzbjg/aCdtq8rdPaNBbXo2etyK9pciPrbOBfZXMFVvX3noEgfPi0oP6kDa5KN23jdpNWKoU9f1381cXR+bIzGmD60kaZ0MaOVivkO7m5rB98Y/VCr44z+xBZyegJYIwm/9tuGh9hHY5sab0k44EX4C6k8surka2LMMvTWtn5rNp4IpMiux3wqyTBwGSTzhmLhzuZ5qkC0T5wPNOM9dnd8C6pxAoOOZM/lbBnk+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yYe8v5hsSlJa9grDMiu5m56lBDYeOKdEOP5fdLvoV5Q=; b=A7Ipd9oJ7uIk4PVpocAhuoJl9E/5rppXaSl8CXwHD7JFYG9fLsjKaNkWui6mbFmnNDw7XeWs5cz6ntICFEe/4UO0LmFnU8V4jelgaohh8LGfPdMHmL75Yr7LFv1ZNDkq89XaN/e/ggL6XHTyv5rp8JlMzuo8b5R5TYS2m+xWIeQebdM//+sBDQVOTS+KyjAHBoonOPzXEYVWtxJm/p6AlWfCDXE2Q4CTD129u8HFjolbM55qm71znFWR/qOJDOCZrdsN1G67jlE8/Uhl0TR6FIsgjsKsI2g4WIMKevK5++vC1jA5tO4WUFyJBE3p5tg5VEc1TEDGZsMQ2zhmMMHvcg== 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=yYe8v5hsSlJa9grDMiu5m56lBDYeOKdEOP5fdLvoV5Q=; b=C63xDqp9UmxZ8F56eBNbVjmv/4g4ax8NbWlqRl4rD38L2xhqjChBG0cCekcYa/rjSVQgwzbN3NOqf2AJkGZBThm61hlQudQDvsOonNZLqlVS0UgH7wB8vqX2XAt0pKZ9hSUC7JhZFaAEmx6PsVPhgWQ2XqoRAdsHyU18qu4Fm8Og++KybyWVsMEOQhEGiMTQcaVgjtmmBuQ4xxXrzzeSxOObgGfEqvJcAcWSMkdPj98hzccyJ8EfYrKGkrnWNqkYGYzRnxaiwHnE1ZVDJI3lPUOEgekXqJZ0pdnXCtkCto6HGmzZ6Keah6TomA3ZhGc+/MpZyGg6okTkIn6izSLW2w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0179.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Mon, 8 Jul 2024 17:52:26 +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.7741.033; Mon, 8 Jul 2024 17:52:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 19:52:17 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [+TZ1p3HSrLePbjX8rMknXDHdionSC1dJc4A2kECMvyA=] X-ClientProxiedBy: ZR0P278CA0091.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240708175218.892808-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0179:EE_ X-MS-Office365-Filtering-Correlation-Id: b306bf40-aa76-48dd-dcc1-08dc9f76ba5a X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|8060799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: WiI0ewWsTEHy4LZT57HVoW98EgjMKQeSrSJB3Z+saPMx6bdh4nvyk+YDJVvXFAQHuKoLC7incvw7dqtShod0Le4rLlhUm3pDCE9kTgbvFSmlEmo6k7ath0TB4HltiO5u37v6eR5IhL7Y4zxMDw5m0e71A94jNn/AcPzr5Q6eLgRlUytlWXlDo0R+XDoy0Fo7i4T3hdOEzRMlbVF1kKyobudFa8cOMplX7IuqrPBWVY7YayIbWoT+mfEkPMAPecPddNbAnrhH/A2OaXDjdYIr9RWaiN1vWMoOodtLN1Ska8N/KpqLzQZSCcXJs+hsd/sVvu3vLuspVfUmWZ5pHdmwCYq/jeG2jc4CcpStPnyBZM14IRls7LeAOwqlsYkHDjiyZD5j9FqbDA/Flgyluor/aykHf9JsoZS0Mloh1XNGC7w6eaa7gag5dzHxRqWl1ff62ksmd9OmdAJpwvDxXUKZjTDB63zrQuLEL9vQe2CDc7Qv9umQZBekVFd6TAiPCLXXkcoTiyRrxxc2yHLm8YkWaCGY8jeRcNZCyAluUKi8Lj7Iuzyh1krS5Vt3KedLnU69cXBqJKtFsWUDFZzhGosBGqOdfgp6GNfBpIp6ixi4mKDm+J4eTRxA5Culupx2anoHY0LdU3Q47MZn58ubSo21fO0IrOAl6uapZ1N2W0FxU8MvOZQjaDUfUx7cHAWdgxCg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MOyfGTn0pfbQsloJuhDlc5WIglqxsswlajnumUwCZ1Blmf3+K6p31Y2OrT89JWA5s6UAyNpYbezU6BIH9PjThDZ4TebujHOCFny7jJX311U8g78iIs0UEB+bJFW4yK0dtjtSpvOODe/hTO2379SWpLTypHkTpVBw62pEqb3qySOs30HSdFY79dIi6Sqwc/xUgxFfSRT8krrwooPtM/RYzVr7drf1DoPSzLrvKdYRfA08xTFO9m2kQeQQq4vt/g7jT0vZuEzFy7LxrGrJtqkOpIeGCQv3EjhA/9CA5dhjP6c7Ze/JLgRlxp+hR88EB1s9xISYhXiUwb4Nef+1KKA9uH8gf2cA/bkoxwM0HJBmlTHShEiEZqPEP9TCK830Ve+VlMwNFqPQJ0vfFE9g8yLolqOyQHWOt1WoMHAKoNyU/8WWVlmaGGYnsjkEDdeo29vflDQQj+RljbURtiiMp7EjK8BSzyPlPkNLWr+/g/1miJDf7BHDrlWPFpfbEeGfcnRk/tHdbb81fo6kWIQIeN8EQsFR8hUJSHh90Go1wY61XAgGPIq3QgTliVeL30ltEC8lzSR+PvmWsKlgGyuHmZtpNo0j3JGawRVAWeePz2mYGla4Trcda5V4zpjuE6qJ9BLmz627vgq8LIx5XbNdXrsqmDcVCEHXCBOAOKJ66j8mEP1to3hW7vsESj3QkY9WaOZfUQqtClAYIV3+EiramgwwhFGpoNZHkI3eGJl93lX8TnzhxODcxe0zcnZ9g+6whHMqXbq23BxnVjc3t1IT8M9k8kGt04NowKfuT/uFipuXUA/nw2aTJxZNducy9A8xi319gaFU7XY5wOtNDkLF/MFQHeEYC4rnasuL+YmnDmoFWDjLKRCdRKWVZttGOwkedJEkyS7s/6jTKiU1ZvjIsAIir9+8uOIAPk9oPEFvSeBMwN/eG3f90k0ZHCahc6Wt7t23WwJiCqVTPU+QMyVMIGLDDuyyb1IyTExZGrmp2dKSsg14ugMPGBYHZcgIQuiyyWhRlBgaJa9MPeFPEnYpuSGVf6rLu/Dksu+46oX8uboY0Q8a7KCNuoPPtUdb1gurmnaajai7uK8J8HZPGP19kuueGahxB5Cy2v7XILEh8URuabPYWGfjs/s6VY4+IJsOmeqPCC3JKh4mfST9a8tfaAwe1bxeP3xdH4cvQ6l0GBjAn0I9hEyKh7OzC2kd6VB3xU/4EOWnYGFjcTaBSuvXlsXNwEek+IDFvrOYDV3WyXKEYFSGY4JGgeq+xoPJn11Z2aPX7RBzeN4VFfVzEuakFmM5+Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b306bf40-aa76-48dd-dcc1-08dc9f76ba5a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 17:52:26.3299 (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: PR3P250MB0179 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/matroskaenc: Only write useful cropping values 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: xYQyy6EW7mAf Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4b91283119..a98d33abf3 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1799,10 +1799,14 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, return AVERROR(EINVAL); } - ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPB, bottom); - ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPT, top); - ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPL, left); - ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPR, right); + if (bottom) + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPB, bottom); + if (top) + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPT, top); + if (left) + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPL, left); + if (right) + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPR, right); cropped_width -= left + right; cropped_height -= top + bottom; From patchwork Mon Jul 8 17:52:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5941998vqv; Mon, 8 Jul 2024 10:52:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXqTODk0R27vhSzlPdC5S9w1fBd/tOoxkmXNv/55/o/Bd/dzeAczXsQejA9LGafGQlcaQ0Oxg7VmVgKGBf3m0e0Hy6Akpx2tzMEQ== X-Google-Smtp-Source: AGHT+IEuvznjWxe6/vvtZffjtnk8tqme8SkQgKznOB9yjspdA7xqReE6Ih1g6zOdvUaseyLFzOFt X-Received: by 2002:aa7:c495:0:b0:57d:669:caf2 with SMTP id 4fb4d7f45d1cf-594bbb4b2d5mr248993a12.25.1720461168359; Mon, 08 Jul 2024 10:52:48 -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-594bdf56b86si81626a12.465.2024.07.08.10.52.48; Mon, 08 Jul 2024 10:52:48 -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=TVUvjL3t; 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 865FD68DC93; Mon, 8 Jul 2024 20:52:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2095.outbound.protection.outlook.com [40.92.58.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB8AC68DC5A for ; Mon, 8 Jul 2024 20:52:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UtfbWJ1WbuKs01aPbEhektGlG8iwMCfL20C+X+kV7Gv/B+urMIDEwYbijiD3/8Uenn1FK//FyQxJotSUqE5e4FJzY+JcMWaPYHdBYjpxpenbLk2QugPZhEKey4BSBheKvBXX2z3JLykfkoXVXZ44Omz8dqlLQZ3iafk7oHbJ3ThpRPH2gcSBaXqEaw1bULpckqyUIUrRSODGc42Vw8EM3UXwfGvjSFmvZw3GdmUUAG9dEaSe3eKJeyBQSW2MqthL7MZLkixP3g5nn1ChAP9fgVx6RuFaGpGcB5UunXYPpZJqCS3j0wd4lFKWN04jjyXyKGqw6mIdJA2FTaS0eb2BRg== 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=FVtma3kMXdVftvtNSKnWY6dckI8YbNoUs+g0Askkb6U=; b=Z/oC0Y9oI6mzhkeRxQpNQ2q+4JRN3ByX7ZZOEuiZelBVmhUaT5LcLi5+FFyAtwrZNyNmsVbsvfdrpufQSqN+dy8j0nkMzMaSlAm8fgc93qwgFiWWgVEIIR+3Iw46S810QyqcxcgAhyh+t1sDarniDZP2wZPceSOJ2+CIMlmvMjN/NkgURj4G5Nzfj+u1e0kOYdiyAVEvFW7xMmMv0ESw0shhdbkxoEXzYUuQ+8z48oO8KSY4W0+C0GbRtYHLA+CNDMKT69vfWVLgbP5L1NDq1VwLzLLKHAQnXNCRQBwFGhmHrLZhHtN7Po3l98S1SdXw0Zvz83WDhAEvzuqY4yvpvg== 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=FVtma3kMXdVftvtNSKnWY6dckI8YbNoUs+g0Askkb6U=; b=TVUvjL3tgvgH3nBfKo7Z0ZSRWWG5PweiuNVbqYDp7Ehc8IeGItSTDYyAOc0uuq4bwhscIqxaHWRKmGIaJUz/kehUl8wa7ovb0vEz58QyKKbAYb42f8X020QYsECUZUNiR34ILc6EkPfd21uhVCNk/faw46CdpDhs0GEyoVjlEjpRbvA1WyU7Akv1Enc1ZlSH1SDK2zkQiD4wDd8xGxttN+kCTtK1BEXiha4soxbIVRGrHZHBZrkrS5BqqT5lrVAJTxGJlyp0gqfYLX97M5NbKW2z+JYcgY7OHaGY7e0fbuedIUJu/dckQjprOufr3wv2FHnt6mVn88zwoH5QurjFuQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0179.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Mon, 8 Jul 2024 17:52:27 +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.7741.033; Mon, 8 Jul 2024 17:52:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 19:52:18 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Zgwc4fa1sgdqpFxSNeEuQzPrENi5XuQPKqmnyTw5rKg=] X-ClientProxiedBy: ZR0P278CA0091.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240708175218.892808-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0179:EE_ X-MS-Office365-Filtering-Correlation-Id: 98c73813-a665-4670-33d6-08dc9f76bb49 X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|8060799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: 6hTww6PoRf5OywAyRnRgzZJwy3gP6sXtB9WjJdHTHDtwdImQ66akr1IJy2We5ZA4mtnU6usDwzyKXEOIXMN4zvX/JMY3EOr7W19mBWc8sG6TBdzw+IiVe9jR/MtBWhb/nqLvlhRQcgBSsEplDZN18cIS72CnJteBGEJCHqAh7WaMTDFDBfqAUU7bLYj+5/yDa4mafc/lRUkfsLkfZ+P0zW8OCB7O566FoRG7spN4cjq4Jy+8iAb2mzOhFWAthJ/jz5cQIunf9UIRQwBTLMxk1wk9RG600CQzKg0SvDgs4cCm2UAtz/sdZCRY28tfIC5ixz62rOK8+Cf5fq11ier24utXCRdZGr5xhNM3u8XZYwpQXXxkHK73GyOpjQAObl4xfLZ/TDAw1WKxQa4AZPFJWPFjzn2XIb4/tv4nhlSPibdYBaoFpIiZoe2vBxp7k79BK/zuWoE79RBeDyLNLqH5iEyoklpw2IhF8A4K8GtlMAJhdSPWhrUdM02eESDbbnTokXr1pSjutcXEeYLhiQVQMUigqQQnoJG9QIwDQZrfQcvwkPp5Ov69QRTKRFSvMHtJEw+cC4jNCnzNhVR8miWMYOofMxCpZuWOBCjaFYV/IeKRWQSPtfgAZFuYcMHoKeu4IedsM91+iG+NZGpgBYemTCfZtdPanbl+lnXpCb89Y17kaTq/Qilr8aS8CHQv0JBs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FF/qFXIU1i30gZz7pLhUVOJWxubMeoLJGiGaEXz0RO3se0CbK8iBkxRwzi6uN2eKyX7Xm7KrLW6VeKM+bOy+kLjOEE+zhU009YGMIby/jfQAMhYxtQ2QY9sT8NShMZB07qIoHusA0ZPfScWNc/eLcfpStNicuFpUtCRgqfFL/EPK4UK4NrveQMQDmmoA6GZ+3WPToJ35vac2vNXMdyADqyak5ff8t+kiebGZ0sH1NIn26WliMSJX9wZ2n87s80y6iqrBUrKkpK6maA2ZdBROb7e+EhF7rwstPJt0KJcp7xHtnYYKQZxDH7Wrxbuna1u6SPO9dBXvclhY33eJpEO/kdNey3eUTahwU9/PL5yWaOxKj3npZm/bP3YQN5ePKBb+Z0XrcXnY0PMmsHgSEY4ZrPKM5RgT/VT4e1TTmv8DaHM3duQrxIKoZnxVuWppZVgc2kqeZAboL+Xu729wzLZ4f2Ys0qY8F/2yF8IKLvxT3cvnYIfajpf5DYfoAxyr0O7j5KuOhw2RplNzTPLebNCAnPVRb61Bg4O6PkaBGPX6aZSx7gXcZ3+G/k5/gwJKJrVIlV4KMZZGinR3wIL5cufmsIcqgBYvCGc2pTtKl5TvQ2453hrLT5L0sPnnP6uvjcPuYqw9Npj4L8foYgbYClXRRJ4ObUjevoFaMCazmvpCqOArEFRN+UYZyNfBHL6q5JDkRuAX2sZThYxJwsdz1plYaRjTpN7ga7MSGUBOwSv+M+NnPGj5RfP8NyMqn55RHC6gFBHi0qrgTTMQvH1ad5eTXG8R5H0txfLMEwWeal1rVfxlSJ88lHJGRK80KIvDblC0Wrm0Lgq+JUn58+m4p3o+nPt7SCe1kr5jS7/40gs4REpkROm1bTW1eXW0FehLxPVUYRBeWRcuVWHz+5HJORv4lvYu/v0lSpmy4Y3ZdgdPTw4RHTxVmwC3iJaJXWDoz1UU9d9kkAcuECRe4giiAsvkyqHeIL/E0woTIrrRNpKj0UgBxI4V2iRc5YP5AuIHdsV6TTZVbgslu4fTM899izndZWiKMJ8CwGWcWKRRv2hABOwrsxTQe/J+3RWzHAdPYc0K5DPUM8+RKvIFyYZTM4AN6XNKvSqZKaVU9waeQQIPZoHE4XJC4nh8bgz2QMTwDLMy0gJCLfzPVwJNbnZddcYLSj3wKLW5khDd0Pls+DgUWTXY2qRkx3ZXFSQA2w/K4sDf7mcUl3VxfkrTP5xi03L0gR2X30IYqK4V2ZvwYqkNX6ZLggBjb8PAMrIMlHi2P8o/DUwruaJWTd0ruZ9gGGS/0g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98c73813-a665-4670-33d6-08dc9f76bb49 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 17:52:27.8912 (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: PR3P250MB0179 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/matroskaenc: Avoid indirection via st->codecpar 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: J5Y5YWD6zb3z Use the already available AVCodecParameters pointer instead. Shortens lines. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a98d33abf3..60c896e964 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1369,7 +1369,7 @@ static void mkv_write_video_color(EbmlWriter *writer, const AVStream *st, (ypos >> 7) + 1); } - side_data = av_packet_side_data_get(st->codecpar->coded_side_data, st->codecpar->nb_coded_side_data, + side_data = av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, AV_PKT_DATA_CONTENT_LIGHT_LEVEL); if (side_data) { const AVContentLightMetadata *metadata = (AVContentLightMetadata *)side_data->data; @@ -1379,7 +1379,7 @@ static void mkv_write_video_color(EbmlWriter *writer, const AVStream *st, metadata->MaxFALL); } - side_data = av_packet_side_data_get(st->codecpar->coded_side_data, st->codecpar->nb_coded_side_data, + side_data = av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, AV_PKT_DATA_MASTERING_DISPLAY_METADATA); if (side_data) { const AVMasteringDisplayMetadata *metadata = (AVMasteringDisplayMetadata *)side_data->data; @@ -1415,12 +1415,12 @@ static void mkv_write_video_color(EbmlWriter *writer, const AVStream *st, } #define MAX_VIDEO_PROJECTION_ELEMS 6 -static void mkv_handle_rotation(void *logctx, const AVStream *st, +static void mkv_handle_rotation(void *logctx, const AVCodecParameters *par, double *yaw, double *roll) { const int32_t *matrix; const AVPacketSideData *side_data = - av_packet_side_data_get(st->codecpar->coded_side_data, st->codecpar->nb_coded_side_data, + av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, AV_PKT_DATA_DISPLAYMATRIX); if (!side_data) @@ -1471,11 +1471,11 @@ ignore: } static int mkv_handle_spherical(void *logctx, EbmlWriter *writer, - const AVStream *st, uint8_t private[], + const AVCodecParameters *par, uint8_t private[], double *yaw, double *pitch, double *roll) { - const AVPacketSideData *sd = av_packet_side_data_get(st->codecpar->coded_side_data, - st->codecpar->nb_coded_side_data, + const AVPacketSideData *sd = av_packet_side_data_get(par->coded_side_data, + par->nb_coded_side_data, AV_PKT_DATA_SPHERICAL); const AVSphericalMapping *spherical; @@ -1531,16 +1531,17 @@ static int mkv_handle_spherical(void *logctx, EbmlWriter *writer, } static void mkv_write_video_projection(void *logctx, EbmlWriter *wr, - const AVStream *st, uint8_t private[]) + const AVCodecParameters *par, + uint8_t private[]) { double yaw = 0, pitch = 0, roll = 0; int ret; ebml_writer_open_master(wr, MATROSKA_ID_VIDEOPROJECTION); - ret = mkv_handle_spherical(logctx, wr, st, private, &yaw, &pitch, &roll); + ret = mkv_handle_spherical(logctx, wr, par, private, &yaw, &pitch, &roll); if (!ret) - mkv_handle_rotation(logctx, st, &yaw, &roll); + mkv_handle_rotation(logctx, par, &yaw, &roll); if (yaw) ebml_writer_add_float(wr, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW, yaw); @@ -1594,6 +1595,7 @@ static void mkv_write_field_order(EbmlWriter *writer, int is_webm, #define MAX_STEREO_MODE_ELEMS 1 static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, + const AVCodecParameters *par, const AVStream *st, int is_webm, int *h_width, int *h_height) { @@ -1654,7 +1656,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, }; int fmt; - sd = av_packet_side_data_get(st->codecpar->coded_side_data, st->codecpar->nb_coded_side_data, + sd = av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, AV_PKT_DATA_STEREO3D); if (!sd) return 0; @@ -1715,7 +1717,7 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMux } } - sd = av_packet_side_data_get(st->codecpar->coded_side_data, st->codecpar->nb_coded_side_data, + sd = av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, AV_PKT_DATA_DOVI_CONF); if (!sd) @@ -1771,7 +1773,7 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, // check both side data and metadata for stereo information, // write the result to the bitstream if any is found - ret = mkv_write_stereo_mode(s, &writer, st, IS_WEBM(mkv), + ret = mkv_write_stereo_mode(s, &writer, par, st, IS_WEBM(mkv), &display_width_div, &display_height_div); if (ret < 0) @@ -1782,8 +1784,8 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, (tag = av_dict_get( s->metadata, "alpha_mode", NULL, 0))) && strtol(tag->value, NULL, 0)) ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOALPHAMODE, 1); - sd = av_packet_side_data_get(st->codecpar->coded_side_data, - st->codecpar->nb_coded_side_data, + sd = av_packet_side_data_get(par->coded_side_data, + par->nb_coded_side_data, AV_PKT_DATA_FRAME_CROPPING); if (sd && sd->size == sizeof(uint32_t) * 4) { uint64_t top, bottom, left, right; @@ -1855,7 +1857,7 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, color_space, sizeof(color_space)); } mkv_write_video_color(&writer, st, par); - mkv_write_video_projection(s, &writer, st, projection_private); + mkv_write_video_projection(s, &writer, par, projection_private); return ebml_writer_write(&writer, pb); }