From patchwork Tue Aug 8 16:40:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408448pzh; Tue, 8 Aug 2023 09:40:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMZgy+ULBNwRC4Z2YO5/X1a17ABNe2dGeV7yLqVSowCLgM8MyetYim0KSO21NiUDD7l1Z1 X-Received: by 2002:a17:906:92:b0:99b:c517:88a1 with SMTP id 18-20020a170906009200b0099bc51788a1mr98132ejc.67.1691512818110; Tue, 08 Aug 2023 09:40:18 -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 y16-20020a17090668d000b0099cd8eab16csi3319595ejr.559.2023.08.08.09.40.17; Tue, 08 Aug 2023 09:40:18 -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=EFNoOzUA; 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 4E9BC68C7F9; Tue, 8 Aug 2023 19:39:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2098.outbound.protection.outlook.com [40.92.64.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BA0068C7CE for ; Tue, 8 Aug 2023 19:39:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hk9Bb6sjzkAYC15rz2JkplIbAomnlzgHHJG4KCLfxtlzlDno0kIqi+sEtnnNBjF/HvkOExGvbdODIrzAxF+cvPMe3QS2kNvM0yWl+I0r90Z946ZFZFOAhR9D+gazAdpBEoNJzZ9F/iIOy87UuVRvfPlvbhyYp0UlQ9doB1249g2yIf8ED03iZtSv2p2uV7tTn0GKJNzR5pb/brima4Mc2Rt8a5l15Ke7IfjJ0QMIzYYYRKgIM9ye2W+mowHyKko0qJsAgR52UTqyBXf2aSeNQNAQPHe+CYHimgj4ueZCXtjD7MGP9w27sbPlLx38QmlGsxJmkLEe/b1vQnjYpU3dxA== 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=RxTi8kLmwp7D+4CccklxBqNeedyc6ljPjh5FjwnLxbk=; b=VVvirjUNBsrZeNeou6zyJQhZSWJoAkjyu1znpQa1hv7mlsABZ/LPxQ+WYtBuCpXgio+gRM0bRMcCrsrA9EP3t8cZQI3E8IPWn/oz7w2DbnWJmnifPQ1083efsnNGymIlmebC/rpmU6QgLqYZvaX2oO9kND7K0wyKc2HmLdw0qPntm9HjEvROEdm76RHnVzhfHOS1iKxIOEUMZgiAcb3XU2OHxyYovdDfFHTpr9sFTn7425Gg8PrvWjDPNVxDTsCNNEFAAjnJkPuP8LyXWrZycRATaX2SkCYWCO+3WBOwjZzfGSKLeNdSUeXu1PE7DkHErzs4me/kRU3psLm7MxiFJg== 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=RxTi8kLmwp7D+4CccklxBqNeedyc6ljPjh5FjwnLxbk=; b=EFNoOzUASOnl/ahrobxvJKjNJGCl3IoPVgtyF4603Nuppf/ZgD4DiEojBSjDIltwUKDIzovKtGV2TChDxq0d0CPXirRVUoQvD9b+oqhN++HNEJlHZnt5TZc074cDeJvhfL6hz+kv9paZQYYECFbjbWNKJeQGg1ZkEQ0/G/a+tMJbRDfI9/5d5bTD7lcqJDfGFdM6qqhjzUnyWNmQWPxo8Be06wqmQyMvSUN9fIMB1dmbQ+wDodmgq3JGEMmCjV7Ia2dslTRuQW5szdl6/QV1o7ZrtYRY/+o3vCnYf8Px7o16g/1jjPH7/HZRtdk+vwKxOv/mSb04B7Ot8GiDierXLQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0355.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 16:39:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:35 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [3xHIuLnIU8mj+I6Er63qQzy3LB/xwaAy242FwRjyL2o=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0355:EE_ X-MS-Office365-Filtering-Correlation-Id: e688a5c8-ab33-46f5-7bdc-08db982e1653 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2+k2bo8+gI5kcL2mvchAKOz+XTqADHFDeTibAM1kdjciW0xGcyXIk/yriH3UjecyKEQ9YOLWPnRaDnOf5x3NadPmNm008UC3fZ9wFieCGWNz+Ef/uTiYgyuNlGo5Kim1oWrAPnorl9M/uiDPYwz3uiPV+VCgVwzMDM8Z45pQH3cgNZstowkuPoC/DYWcJMylsoBlqIhshAAGpQRD1AVrFBSAG4geqHFLRtN2Qx81RbZhXSITPM6jF0+bxUjjxWa5o8ZGkA6DIRzGZW4zTVnGk+7ml+kYCVkjUuM2EoPRRMd9xCpHTivpdNpIZuzB6CnUbHRZPDw4TMAxgvmBxuzu0I3r8g1kZCzLcz0fb2PqatU88W875bXlTJVN5BE/03/+FsiOOQxuUHtU5UHvhJYb0EbnRn7vOn+K1jD19BBoh80W+ygCDYoEEnvaSji6TRWNeiB7OEDUhj7I2UXhJMyDGHk0/+qn6JOen7rZwkGC7QoazjteaOD0b7ch8DwqKcUuz3iJH1Ph8UzG9gF66B905L7nrpnNW2ciD1L2s/JIXMYE+PfQnzPreytV6P6Jbb5QyLc/YYg2L9CQu9N0gn0BUIQ6/DiQPvMv32WGnwfMMcIxDWjzwuwSwuFWAk5c8ljxqaGhHE6wGHVzp4x/+332dnJms7tXHcVwZ+TWmtPtqOiLLMDiwrWAZquspkeiIVgLvldeBNbZv0A7a0+qXKTl+p/qvBIIy6+dW7wqx2Cy14fI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 09FpZIEvqBDSrn3VK5NR33b2STZAjR5jmNLfc8LzAynxR1a9ImGppJypvkDWlx+s0ZHL2Y3Fox+UpmU2ysh1qMp0caGKu0bzDJXkRzzYlcErSppBX+HK7XGfip5Znki3XmvrAO/T65EbDnVnBgQTMk4E1Y+IfWKgqErZllr5U30X50p6joPcvDHFP/kFZiJ1Dy7Z3tp6vknT/aDN0osWNwBsvDTrDlNxlDHXPFtvyaK2BOKgQoEiit8mOrKcKYeT71a5Tt1XGsk/AZ4aXTTy5t/xB/WWvKU14JsRHdEkUL92GJLZ5MQQcsRMrxKyT5WUsbgEGzSq573wWYkObWYeNt54nyLn3Bw/eM/zYe62lJ4TZ1yiyEFQ14JzDy+9pbmu2Ks9wAAwqs0URvE2Gfejqwwsdwy5JsqkxdfMg/ufSOSSChBBytrx1KLa4RpTH8b3qZHWLCixHOydEXv1HwyZrgTeh3TCRtFniWBcta2FihZR4NNxsP9w66cU2UWCB/VD+PSAvlPjfrCEQejwq9EcmOQTvaaIcwCx5r2QD7kzNv2J5oxfMVeGeRJoZz5fW/27+ODDYqB+AJqnQo2jJROUnMj1XY+D01Dz2JsQyCkolZbrdOdkHQ5xsLvgxbqYjOYP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YFjOPWwTQTSx5cmKbUPsDPOr0lzrzFhK0iiVvhhlZs5oLTYrT9zGL7ETWbP33/g0m/lA4I0KRwe7lD7h1oI7cLpWxvjv1UsjP71un76IEhFKMZX1KnKDQv42CI6UHdG3JrBRv9cBMmFnSSnKbhK8F42zTx3tfsfV141CQVKumJLEnkxWFlNgANwqi2qvAX/w9gvDI9WxwHrgZt8RaWyuBcn7FUmToGZXORDU5awv7x7RUCb8YjgNRuiwbyNAkXhzCrhfstv72WTA2CHvCDY3g8xPXUpKXLxNGkk/nKm2+z+G3sJXEzgh4stVVjCh9vU3iKbXm9YEEpnx3jU5j3kMihrgmnzZ3svEXypA+pOO45fLW0Q97pJ4H6o3YjpdJvltR5Ghs9t+clueb6ac6cSOaz4JYGdOMOWkY/CgPlxEqpZ5CmrUi5UHTKSlfXKY2+gjVm2maKbHJmajuAa+ZiYTsl9tVrWJ6Wk6ET4lx5L/qAuKTShNyh+rIK0y7eayr7eTiDuwuzbrWgaNYc65BiG85Tio+IM1VrSsHP4OnDSNvYc/YHrg2sa3W5zw+Lj3BalUkyQAuJFolkxS/jQru+nguhpb0yS9xxDhVNRPE7m6PT9h+kJcAxOxp9he9pcTgH1eaznjLMz/glTkFFtbXpceMLOD6hiIfcLpOux2lvf8yVdh/7NzYY/E2NNKDv9qUHs/qLWdYtmpX0jH0vhRqgcLMi4fxQWWxHvDKEuJ0CBIjq2QujXkDL7GQe5FPyNicERcVDXMO9gnhLcmqhj2XTXHbKPv2r06azusiw9aBvyBaBe/k/dbw8tmgKs3B1mS4swe2NT4XI+C79vrEeWnayl911sYW3/wpafrmF0niHsNdObYHIztL84W8QBs1UDjF/owGA5a/JCvXcuUk4NQSSchkuDUs/cWXtDzQPs1FkhyvGa09yMmw1C8Q5LHAi/7Z7NyRz+7D3ZvZu5YqZJZfDeZDaHNsMJH9RBhKZ/Y7W4tZvZZ2wluJ2H1r8+ruxeuZJvLfZgSRKj6KVAIxp/rCSMii4bEof9o3REHAUa3OgDUEwgRD/71SE+U8G6FlROntkzchljg54m+3cGloAFIVx5MwBN09a0NB5niH/vXVzIKpDlMUY2rQj2iBGPgomwNIeynjg4qCT34y+jTNHPIJogCZ1cqUFMXWvNATXVPO7psJYH75nLqt9gxIiPD8ZxOIUETJQ0Uprp974PuTlecnAMyR1pLYRsV/8/FRecOFdoSxvAGlBAnwuGFJ7Dv49fFgMWq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e688a5c8-ab33-46f5-7bdc-08db982e1653 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:51.5846 (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: PR3P250MB0355 Subject: [FFmpeg-devel] [PATCH 14/15] avformat/matroskaenc: 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: uDAgqdejloSI Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 49 ++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5c251cec7b..7cbae47e42 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1681,10 +1681,11 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMux // be overwritten when finishing the track. put_ebml_uint(pb, MATROSKA_ID_TRACKMAXBLKADDID, 0); if (par->codec_type == AVMEDIA_TYPE_VIDEO) { - // Similarly, reserve space for an eventual HDR10+ ITU T.35 metadata BlockAdditionMapping. - put_ebml_void(pb, 3 /* BlockAdditionMapping */ - + 4 /* BlockAddIDValue */ - + 4 /* BlockAddIDType */); + // Similarly, reserve space for an eventual + // HDR10+ ITU T.35 metadata BlockAdditionMapping. + put_ebml_void(pb, 3 /* BlockAdditionMapping */ + + 4 /* BlockAddIDValue */ + + 4 /* BlockAddIDType */); } } @@ -2767,28 +2768,28 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, } if (par->codec_type == AVMEDIA_TYPE_VIDEO) { - side_data = av_packet_get_side_data(pkt, - AV_PKT_DATA_DYNAMIC_HDR10_PLUS, - &side_data_size); - if (side_data && side_data_size) { - uint8_t *payload = t35_buf; - size_t payload_size = sizeof(t35_buf) - 6; - - bytestream_put_byte(&payload, 0xB5); // country_code - bytestream_put_be16(&payload, 0x3C); // provider_code - bytestream_put_be16(&payload, 0x01); // provider_oriented_code - bytestream_put_byte(&payload, 0x04); // application_identifier - - ret = av_dynamic_hdr_plus_to_t35((AVDynamicHDRPlus *)side_data, &payload, - &payload_size); - if (ret < 0) - return ret; + side_data = av_packet_get_side_data(pkt, + AV_PKT_DATA_DYNAMIC_HDR10_PLUS, + &side_data_size); + if (side_data && side_data_size) { + uint8_t *payload = t35_buf; + size_t payload_size = sizeof(t35_buf) - 6; + + bytestream_put_byte(&payload, 0xB5); // country_code + bytestream_put_be16(&payload, 0x3C); // provider_code + bytestream_put_be16(&payload, 0x01); // provider_oriented_code + bytestream_put_byte(&payload, 0x04); // application_identifier + + ret = av_dynamic_hdr_plus_to_t35((AVDynamicHDRPlus *)side_data, &payload, + &payload_size); + if (ret < 0) + return ret; - mkv_write_blockadditional(&writer, t35_buf, payload_size + 6, - MATROSKA_BLOCK_ADD_ID_ITU_T_T35); - track->max_blockaddid = FFMAX(track->max_blockaddid, + mkv_write_blockadditional(&writer, t35_buf, payload_size + 6, MATROSKA_BLOCK_ADD_ID_ITU_T_T35); - } + track->max_blockaddid = FFMAX(track->max_blockaddid, + MATROSKA_BLOCK_ADD_ID_ITU_T_T35); + } } ebml_writer_close_or_discard_master(&writer);