From patchwork Tue Jun 11 07:42:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:613:0:b0:460:55fa:d5ed with SMTP id 19csp216529vqg; Tue, 11 Jun 2024 00:43:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXfPbNwnTVd4JbPXN3P6Y7XzqYACqTC9lUoeeEUv/CB97aFSIIMZhR6IfYJu7sXcKcV+ee7X2jQc+cfdx4zCbovxNk/nxDsb/BDCw== X-Google-Smtp-Source: AGHT+IGqOn87zMpTD+8CzT6ajUWdFlNSL5ohltGwEPAP1Z9GbmAnJCF7ARmgpssWCeMt1LwoaTYi X-Received: by 2002:a17:906:a005:b0:a65:19f1:6e50 with SMTP id a640c23a62f3a-a6cdb0f5455mr756365166b.50.1718091782473; Tue, 11 Jun 2024 00:43:02 -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-a6ef8bde342si370466266b.199.2024.06.11.00.43.02; Tue, 11 Jun 2024 00:43:02 -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="lP/b2xUN"; 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 7884E68D7BB; Tue, 11 Jun 2024 10:42:58 +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-he1eur01olkn2010.outbound.protection.outlook.com [40.92.65.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4B6768D683 for ; Tue, 11 Jun 2024 10:42:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jVacVMWn68ONdu1MpZuKQ14yUWeOnkY1tZKR5FJclTOeUCRqhSDVXAZ+H1hcNByXJQASfKZ43Jap5hqtiRpQQISz3Bs5nboSdOFlBNDAGvZ2GvJ6Oz4mB6lpRoA0oNR4fO7o3AHrcENsPop0BmnS9YvyD/CyKmWC8/fSmQjyaPIbbh3qB4dkfOgmx/7rSqu5AZv2cqdr18qNtL7cjqc09Y2WyElEMuVThhC5ES8clr79vwQK7h97w6yLwMKhXB8OPde3EmrYlqx3wpLzc453K9zkl0m0DOrO1artXmxmB75PxLUSZlW5ZXKOKYp1XkU/ST9tKJiJ9E4ZPC/2d89RHA== 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=/eKcKL/ZLnkG2mvjFDolzQNSkpbJh03ZvsRI0ryixYA=; b=TGXcOKRFHPdEeibPwZoB3Q8KIigacEQMeD/EMEwQBfCBXx/UMxbVnLqPIVnyXFk+g0yGDvbf8b5Bip/RRGcRuBXjb8sY6I2HJ6IEfeMrRs/nuRed2fGarMOI2pNjqaQBHq3yes5gloe6WKcR/EbeoWPFTy9pcs95D1bEXkCa9pqUCp8Yzsfy5tgUmFiUcg3Vkj4xpwkXfh2ZhnrI83VJ+85Gve+tqZmqOKia9F/fMLanT0pChCO3imlT1dI+YRYhI4dWBPYHJgOpnM9Ln0T7bttAsAeyziO+YV42s3kbOQMAw6ER0M85d+Pz59f178t8fNDf+lc3OwsJc0/oY9YjVw== 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=/eKcKL/ZLnkG2mvjFDolzQNSkpbJh03ZvsRI0ryixYA=; b=lP/b2xUN1E1s+fJmJx/1HSzJD3fgKhQrKBVJxxo3WiqdBTGfAnqqxF3zPAipfruKP93N4JHrHyrmyX8+cHN8Uv5h2idKGeuMGzRDqvd/tBFrVnsBImJCdQ/VBdRuHZf6xdrd0wyw/y3OXhPXoREUCzh31w6KeIFDNWwLatWXoAUlP6Ft8XdAQTfjhBlq1x5IQqyJOsne+eyfk4jfcep6ank0kjSvM9fz0dc989DtNec0yDwd41t0pbuXBLoJdJiNfEiyEz0Fhc9os8iKmdnKw/t4Fq18fdZBQLXDYlXS8cTC2p2/WSLqlcMRF5GwhsKTDx4bq1c3x43kQ3p3YULzwg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GVXP250MB1057.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:1b5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Tue, 11 Jun 2024 07:42:45 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Tue, 11 Jun 2024 07:42:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jun 2024 09:42:42 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [eFvE0L5Bc3zEk8G38qYfnzXgtImiZKwld5+yBgPD3sU=] X-ClientProxiedBy: ZR0P278CA0103.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240611074242.465624-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GVXP250MB1057:EE_ X-MS-Office365-Filtering-Correlation-Id: 70fb9482-995d-4827-819c-08dc89ea1547 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1602099003|1710799017; X-Microsoft-Antispam-Message-Info: YA/tLzB9B4HyUXa0rMy6sr3OPQ8NplfXzdzXhJDmeR13x4Ws7SMy6vs4nXFz4gHOQCXdIhml95fa/t2QXXhpHQoosaH/cHjhfa67weJ2o3GrJU9EW3cr8WPn0TRQHTumKmXaLIfal8bjJ2eoOXppGzvL0ns+bYpBvSEv13OY38/rlISSL+l+SLcLx+7jUX7rvPmkSqOswXOo+lcpOuPuB4+2IOu9raHfrqi0+9jSTW30ibtT6hNOAbIf0+MP2HjT6clsgWmnQoqxlmp6DJeL6vseJ9oS2wYDjczHdT0/DxVAurC9MGoJjyZc7FPwdQD8q8wQz3tc+1aojtWdN250VnIKzwOrZy0CvRR5J2ZRnaPuqECQ76i06posfP94qM6xw/YHViPLzyPR/XcSkc8X9/CZPSyZ0nyesPJNADWToPqK0d8EO8V2eetpDblcMz6fZIUdLfKR3kOOA6aqL7rVfEcHZNaCEE/EC36N5vZK8bC073wTMUoqr9cE8Ms2tofv5SJk57lsck4LN5etvmmfRakrvlQrmNXCbj+/oMi+QyUqiUZdk2lfAgwFsg2hufOphMjFC7UvdK0VEyAGkfZWGMnVdubioXXmobx1qJ+oWW7Juazmdg23SPjcJSJ2Tu5399OrR4Ux8SqfvC2SM1pxXH74hleadIvS1f36pCQePVlO3Y+Enor1OEbzusYydXyH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jkrnKpCCqRlQ/yhEXmFkmFo4gg8P2Ykd2tPKq75KG+ptdylUbYySbm7GGaoJ+zX7aG0Phj1OMpc6c1M/95yFbM8HuA074WjGUuVXEbe84/alqsTndjWO0VCfOgAQXuZLqS9E3V995pzFxoE8SieguuD4bKXyO0kSRSdq3XnoHphzX3aHKLA8XMKFobjjqzzJi+DBjl/Q4WHoO5OkXGwCaGzLZ8XZU1/h05i4oCkcKxQy0ctK1Oo+x0oDak4y8EZXqQu7VH/mm03RySH4u0CWI7TeU3C/QSs6elENcCs7UWHh3zQJWeczbHPMSVNzXyjf2nnzXC0DLGU+9X/27UvGNxoVMz2LQl3j36Z1HcJ3/KzoUJsSsCNGelo5r24N9qsliH/NRWPEn0XvHHsTYlO72JH2TqQ2SHMtQuQbTa5yn4ySvFdlG9OyCWFMY5QT2dN5jUS70bBKmxRTcVzmx6mQsyomXhv2mtQwIk0jsGyKRyD2Fxgf/r2YVtJxzd9uc9hkwoXzxPd5s3P7eVqv2FvxvmHn6j7KU1AeFBKksV2kYr2kDpWzXeukiN4zA8N8MoA69OLZNNEImEiP+lbg833RY5dwZvaLaClmG4dC/5Wx6KnrpcEJUHeXW7/7B/j2tidfbZQqAG3XORw+Xu1LDMbw+Lw0FnZrRoFTIzJEbyUcgDMc/AT0q6kyVtW72Vtns2havdaHI2YLESTk7ksur/R5T7mKRD0kTrTud2iFAaKj2PIGrwQFRddbjNQ/MrmYg4UKFEMDBFS1J0FEWWt8tBCVfC0JILf2w8zcba8ChIMkAYQPvu1z+oqi/Ry0hwswVoQDd5zbZGO9eTpdUXiNO0rW4WHxdQgwaMjJBoSVbujYGMbvfMFqPJS1D7Y1MXv3lnFWYjn6DqYoSJ+Ol7AYZ4EyIoaU2MdVu/n+g5qBXUMGBT/uhfm9e25x+DR35gz7J49hTRB0l/88UNji0LMm+Mz3PSZ3WiBWVKK/+aSzyD0+p5ZNjAVX90C7JXEUR2ILxpu6vWvCMDe9Gj8pYA6SCA0Huf7/KFCJZlz0J/bFne6bEhispbWbk9/GulMwZxVXOToudo3SCJlOk1xI6rgO0Vhg0S1RfCv1S67BqsIQYEDCJ6/ete179acmdrFsKMhvzfLOODcCF8Y1F69srA3953fejbTon6bI5nwcMxp02s4iXPGGmxFCRapAEczVVoB57Jc7krQnbAwBsMD5oIphcRBhBqu7oVlEf4VkXcxZQdDsZ5w1Oon5b9nAFLVCSRVNIaoV6ZTNkAxeuL7UqrrVp05TLg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70fb9482-995d-4827-819c-08dc89ea1547 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 07:42:45.4098 (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: GVXP250MB1057 Subject: [FFmpeg-devel] [PATCH] avcodec/libx265: Don't copy A53 closed captions by default 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: +vauixRs8Qhb The SEI handling of libx265 is buggy and can easily lead to memory corruption: It reuses certain buffers, but when reusing them it presumes that it is enough for these buffers to exist and does not check whether they are actually large enough to hold what is intended to be stored in them.* Our users are exposed to this because forwarding A53 CC data is enabled by default. Change this to make it disabled by default. "Fixes" tickets #9666, #10411, #11052 and (presumably) #10906. *: See https://trac.ffmpeg.org/ticket/9666#comment:1 Signed-off-by: Andreas Rheinhardt --- libavcodec/libx265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index ac1dbc4f97..0dc7ab6eeb 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -948,7 +948,7 @@ static const AVOption options[] = { { "tune", "set the x265 tune parameter", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "profile", "set the x265 profile", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, - { "a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, + { "a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, #if X265_BUILD >= 167 { "dolbyvision", "Enable Dolby Vision RPU coding", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE, .unit = "dovi" },