From patchwork Fri Mar 4 13:39:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34604 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1604982nkx; Fri, 4 Mar 2022 05:40:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgwMHSNpiabTH/pAqI47hVwC1PGVqXj/6us5Y6nAY8mtzMgAtR8+ieRNMkUcGD1E+17TBf X-Received: by 2002:a17:907:3f9c:b0:6d8:116d:476b with SMTP id hr28-20020a1709073f9c00b006d8116d476bmr11858471ejc.432.1646401206408; Fri, 04 Mar 2022 05:40:06 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k19-20020a1709063fd300b006d6dc43f6f5si2904264ejj.12.2022.03.04.05.39.56; Fri, 04 Mar 2022 05:40:06 -0800 (PST) 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=hXYezJU3; 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 2E23868B0A7; Fri, 4 Mar 2022 15:39:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2027.outbound.protection.outlook.com [40.92.90.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB93068A8A5 for ; Fri, 4 Mar 2022 15:39:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M49nTfBINa8NVZNt1nA2dCgVCpdA3geyaDhDrXGDlzV9ajooRlCrWT16W+CM2MBCC2cbtg+lnZmvaHHkNUgjpeLTfwubADgvq8wZ0fU+iN4rd7pU/WKQRre+8oppm8UGVNAn9hBnA7Cq8j1oTe5wNQ257NAuFxdBKBYpRjExdAQM7MSNefxaX+3G2Neq+oIZdteXJxlFeH2u8NKOo1Zizx2tI/G2P/2NfsdNI0ByBfF1QoF8PnEI3KIupuVNfndmHalrt5ITCPRmcmGiFo9AvlDDOqP6SuJpf90xKnojR/wRRLqW5dAH5sFjFb5HuKZq0HKx2Z4GEYAQZJ0aRsyE/Q== 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=LdAKqXZ49+QxYrBGk6n2xqy/M8sQxdKDHvLJO1Q675k=; b=B/iT9pxuFpcdnV8KkZ+fkBvTbKv7g5/mzkOyzvfHPGfB/epMouvFjwAjL1IzWuXm0OO1S4Am93Q1kPDqlCiq2h3VKNC1VAjjGTGylV7QiQJGbFrguX/jZi2b4ENikoX9d2R0t/SVt/lBWLZw1WBOeHNzCdcjFsMoLz1qLZrJ5uKTqhDBA0VQ5mgJuHHptHlhI26icmaFdaLx5Bsbd/sezySGbHHfa52iORqWGKrJu6WWoIDT4+wkPppqtSr/mJ8feLniFHTOmo2cEVoSFdYMHJ5mp3s3Qo72FqKvz3uG7tSba/yaCw6ubbV+SHr2RmlFS/dIqoRJuOKJRsFoaBUtfQ== 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=LdAKqXZ49+QxYrBGk6n2xqy/M8sQxdKDHvLJO1Q675k=; b=hXYezJU3WhO0Fs6Ah3wtZeDweuQ5cNf8WDP/A4dk5iXLdg76Gto5yYNvhFPM19wxJUOgS+BXOoGggjAjt0Z2j6E8BH544GDGJted5fewOawK7dDL75OVuV0p/YjRjhfG7K3eHM9ySJNyOLuUf0gfZkgVPHGDFv+ZYO1LWwZYTbit1R+WC0SsrLQrC0d4tsfuQVUxTdjcPZ/1JN3TJNDT2EqEEnlIhTL3wA4OZQu7nqYYv6zbPfx7xkjiyXANO9Z3o4exgxDBhzgx9lOal6L7+GcuKFC8nVKh59qa0YX57mK1cwDuHob+eVNqEnJcYg7Z0ifxtNY4IGxvI3YFvk3vvA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB4691.eurprd03.prod.outlook.com (2603:10a6:208:c6::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Fri, 4 Mar 2022 13:39:43 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%5]) with mapi id 15.20.5038.017; Fri, 4 Mar 2022 13:39:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Mar 2022 14:39:35 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [vDDjom1SOObFQLU5Z3RyglhGFRcJ0WKA] X-ClientProxiedBy: AM5PR0101CA0004.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220304133936.123954-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fecc3796-9b30-4a49-56a4-08d9fde47077 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKpWil28T+Ru5oqLJaJQnsohsQ+gsYLkTbaVBYa4cT9bA29xSyty2uiJ7fpgfAb/p9bfpB04qBOcc5a92YiniqQEyfqAQGBrZHNR6S64TvR9CfuufePtG7QWX18r7wsh9S3Xdh0KiQu7ouqOi+DzXQ0eysLW7F29R8rE3U/0jy2IGUNmbdyRZsfZfbvMDcqOPRchYsRpfXNJ/m9NGBAwi3v0vUAowVuWHBykaTrCO3rMo9RiJOTfb1ID6uSENkDzIdGq2RFrlQZdGXWUWBxRwCRqJ1nR2hXZdpdmV+vn8vjyQnIA6+36wSJo/5wY6eFD6p44l3W1ndfFvvTbrI5EO2OgzXBShE8v4ZzrXjoPZ4gWsCoSv2HePHyYzuJLjJa1OzaGxeMbRHe/GjGEjNxgCfyuLr6YpJ6wpYq0YsAHAiLjDsfviJ4mJYOSxvo/nq2eCcd5Zt7fauBrGD6JimEv7X+GH5F/dEKi6remiGumr5m/0/MjwjDtLXV+mHSVUiUzSfM9BVQ9uDKNleKK6C0OVeetNUjO/pmoR44Ev1qNnWPcnhceVj2VAH/gjGq6gTICphWB8tPQS3gF1E+6+DFr6pAIReP/TsSJnkHHg4mLnN+iAH72fARa4U0f+VevpaPs7L5pyum/tdW3j548O8EtH64UXG1LvW4jpW8J33qUqkc9CkgruCw+4OUHrh+DlU0JZbGzDhvdoZ5tA== X-MS-TrafficTypeDiagnostic: AM0PR03MB4691:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I/kCxrnH4cu2a2Eh+2hPEWVSTm/8wj253MZzBIhCIOBxlYXSr3AjvgP9NvPkJrfF8YX43LUjA7F3dJS4+tmyCfRC3gTzXCRFBhy4LAGQHo+7Md5Cf8A6dLfX6dqmRxN4PHgt67Nh9SFx6/9cwvIx16fKQpwI9vby3OoLfFIgwBS9AJYycvVaYJZRQ3IfjXLltf+aYEkua9g/eV75kYblqD9t7dVJgXqI3qSaLn0zhj9aX4IyqECKRzOOXeB7Ql1XKqxK3x6lXxCnR8x9qc2PNZ+aocTc9FLdSXf+8xMKpGhjyb0DLW88T/zyVS8JPtx3OkPhxOmwu+7nniz6vK6Fzx6u17xMiBYNQ3knMsumnuIOr+eYip5fhrPUJGv/SIfnEwpdRWSgPnKFkIJniZm+F+181RAzt/Moorh5qIttk35MxVShwBDryW1P9hZBR4DcJpUYZebKUs/FtdprZyr334Ns6SOMM1XyUmxBlRWGeC0iIsmsNfhXDUYpCoJPsHlC+zPbOSVi7S44giuxgseaablMYK8v7uLNIAkAlybEkkQ5F3rlUxTbdVjkVOukrd7VKkHcB/Lp5hoAhHO3NohGTA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QlgL00CPw5Fpm+W6f4k7bvUHhPC+7N/aBIBNwPFm/cepiAywqhXFmp+FQrvztBi4YJ6LaEi5rJHXlYXFSTsO36RwI30qbCWL7wdz3y1/+XxACvdOSwULnco0Nyh6UFP8Piz8/xBQeapnahcBMRJg8cZ+VFya+YVhIDAXKAAqdVVsjN7TSBZgP9yYI/RnEp+kd+6ukta5qmf9e9TEZbbE8YTj+BOZfEBspCRZXJ4ufvyIr2XbHvmNi7kXuJXX4975KQgNi3A1L6WLxH7jZ2cW6y09SecmivqXkfKgZNCF8PoNlsSj2nlZnsv7lShMc1tELdatacwZR3YFKqyDy2leyrBOho08vNBFKyX/8cu5C/T3yNHW6dS9LdJGXpxq6Le4Zx14yftCaKpqBuhWG+W1+i15IuH1In3WiY9MLtfcw0Sv5kNPPkAEr6ltAX3REcMVcgjp2lndaqr5fGa5pIjEebk3J04x9MiB1tU78mn6s7QGLRi9P6WjSwVWWXL9ZczQNuhHZMUXFku72elThI18lNP//wNoz5w/u4zuUg9b3pzpJbKUuP4Ewpu4Nk3Oty+ttFylX0nzAxNvv7NtmajWxy1EVUnoKO2qV8ZeBGtLkioKkWr69M5QZIyFsv6NjFgHSAxvxACz5vTXHuHwnSKnPpY8aRHozmO6QmWFDI/slwg64oMZh31VIAifr5q7c8ql1ynNqnlZjmpfVCYHxtHpXJfNBlDbHMQgQ17UUWx8uidjPTAHcBH5aRMxoWF0Yiv2wOl1edZAcvJDxsTppI17zWJCe03GcRnjnwJ3mRJXNJSEpvreracNrUyzAshWEaxka9pgQqYJrKSj5DIAxkH7jeIholR7Rh/4AINgLMnXeYP1pQZ03WH85QlGzXTldBbHQhJIX1Kk1tsOETcKgxRtiEz4QO54ibz2wTb9rZ7x1QDG6xZ3J7Rai/W/RsFURJ0+Is/BjCVkZNMd/kVme3w2pA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fecc3796-9b30-4a49-56a4-08d9fde47077 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 13:39:43.5093 (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: AM0PR03MB4691 Subject: [FFmpeg-devel] [PATCH 1/2] fate/mov: Add test for muxing chapters 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: 2zFxrm10Umpo Signed-off-by: Andreas Rheinhardt --- The input audio stream has a title metadata tag that is written in mov_write_track_udta_tag(); yet somehow the demuxer doesn't pick it up. tests/fate/mov.mak | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index e956380909..b54c009f05 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -126,6 +126,12 @@ fate-mov-mp4-with-mov-in24-ver: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entr fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/extended_atom_size_probe +FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OGG_DEMUXER \ + VORBIS_DECODER MP4_MUXER MOV_DEMUXER \ + FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-mov-mp4-chapters +fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg mp4 "-c copy" "-c copy -t 0.1" "" "-show_chapters" + FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \ SCALE_FILTER PNG_ENCODER PNG_DECODER \ MP4_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ From patchwork Fri Mar 4 13:40:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34606 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1605585nkx; Fri, 4 Mar 2022 05:40:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwG8pbLdG+9mdVP6+3AFzwXmmoEIaxUqfC8ZuOdmokNkycCC5Nkp2Sk//3g7aHOC3JGKv95 X-Received: by 2002:a17:907:3ea1:b0:6da:633b:9143 with SMTP id hs33-20020a1709073ea100b006da633b9143mr10209946ejc.10.1646401254462; Fri, 04 Mar 2022 05:40:54 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qb27-20020a1709077e9b00b006d229828f46si4322481ejc.884.2022.03.04.05.40.53; Fri, 04 Mar 2022 05:40:54 -0800 (PST) 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="MpOvt/0K"; 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 7305868B0D3; Fri, 4 Mar 2022 15:40:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2067.outbound.protection.outlook.com [40.92.89.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A3AA68AED0 for ; Fri, 4 Mar 2022 15:40:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T72r1dJBH8k7P6mkzTKNg53Y/4+pmOznhvSVPNZ1FNET9hKDCux7KN6HVVH6ANsBS366Igm47SBGlJBKbdSCZ+8KyoligmFn7mpIJ9LxmovC/7M8DlQDxIDRl5ZBxcvxSJg2RAhQJ47YPSG2RCRIpbFRtbeWB2HL5wmKESXlYhfF5XAH/7iuwIBU3zYUQHD/DiV+ER+sEpB2/pxXZmJadI2kC4elSOS7978lncpJHewJn/vKU0IYVlyS0E/QIgplPLg3SAI4L0KG1C4XDle/1SeT5e0uZAEJy53hxBPghLtkf6aoj+M5FSsIh0W94yxtDwoz45z3iQJUILZ8MkkgNw== 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=Pt4Af5JWh9JcyGT+GmESmnsToK8D8UnkwtCLAWcoKok=; b=nkfd2tEt42a6nj5uMZHogGW4G1v6Gl9Sl1t2C9V0kah/k6YqatQlIhOgnUbviOfculj5uaqDW6vdHpsrN7IOLGn2dhpmJwnCGxmzfCLNW6QUgIHTZ1+jLmY4wAh5qBDpouU44tr/n53BXPki6ngIE+Ew9Bgcg9cdD+XezXSqKfh1R2CswTv5pbVKiZoVtjfZhKD8/en6YwO1gs4VrrSIXCPVQexbLezy7+vM5XhdX8bSa1r4xdhoEAGkAm2bEc87TivEH1WJUzexbw8pKdWt9zSDbACRtWUMqV5UJEs6sCppZKLPNXjDVpLys9v/1WZKPypbQjXwddfgOtt/ozLVVA== 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=Pt4Af5JWh9JcyGT+GmESmnsToK8D8UnkwtCLAWcoKok=; b=MpOvt/0KlGKSnGG9kMAJ3PS0Hi790O/TseHNw8G5KZXpPsvUveI46aAZi8zpEjv2wnF2CHLo/GCDRA4SC83oMLmSE9nB4CeSEKWeG1svCTavKHDeyuAeHyWiVpmObhbSpJI68j8g9KzYM5vje6hTyc4KyWk/sOtYX1MDiiu4W4BHCNsK4UIZv0uNuAB8IQooseIvVJu0mEc+++o+8tWUYe0LMsdtzvJ/n0CkqsxIfgVo6ViYkxdbZScMMvJ8ok1FBxGU33tvFQ6X8+pKqXTCsaDHJgFLVQUtu6LBSxud0xrhQxuWkM4ohEPpDQTsTWoXq8teanW4AJe9FezRyNZzJQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB4624.eurprd03.prod.outlook.com (2603:10a6:803:60::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Fri, 4 Mar 2022 13:40:42 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%5]) with mapi id 15.20.5038.017; Fri, 4 Mar 2022 13:40:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Mar 2022 14:40:33 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [0v4jhHqvNhY9b4a2p5BR7MZTDli5/dCO] X-ClientProxiedBy: AS9P194CA0029.EURP194.PROD.OUTLOOK.COM (2603:10a6:20b:46d::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220304134033.124105-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a832673a-a455-405f-a9f3-08d9fde49326 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSTpLjdQlh7tBxvgJwal5Xc/x66h/bcByM8niLC62j4w8RO5/0nGTi2WLlqn5XOMsW8UTEHUV8Fhdm4uIAchfcTXQDG3e+ZGfLufjixt+GvHX+yeqUUWwuOTUbC4jitgUwsX2xtyi1FOHrS4/wsvBL/L74+JeIJAcmnkxnzgDGX88Iypskpr9cCD4NKyHBl5Pjy3zX3yR4sxHmhe/fmOhEzkJ3Bbs4yb+9kGnMbQi3GJoDMJuZRPNF8VcMzH9+J4SHpF4npGSwFRRgqYqc/GnW78kns5SO/uBo3/+znBprDDy6Dw7vCU6tZW4ddO+WuToUmIFPA9rl2+qT+5I/JUog68ZLTK0WzJ/AoGEZS4HwMwktqQa56J7ShvK0cpqirp++QEhZFbp5BiGo+mABohA/ZbedIGrcElh9Ny1R5tFTTx710rg4jBug3R718lCuKC1vIQ7g5lV6rPlcMK7nmN+DbHQtbdJCcnqEGXQFUvNCD10wEl/N6NOWYOCcFUAf+Sg8r3Iqhy3SCNZRstTQ9DBIkQiN4ddqG3LIHB6/UfJ3nTTbTwqXKv7TNepvOa0xsqoyT+D5Sw7RUkffZ3K1Rugdld1uieV4SRBPDb3dC0eQJUPhQjUd+I8c5pjObk2WA4Kk2T3R4xr2/xMtpOX3KqqTQdTV1Q9344X5mIIczPbT+qvz23LHYGeit2g1LRCTrj31zxGhRIZGDa7rCfmE++gqER3YpytD9u6Sd9XZHBPeK63QMgnf4xdOZPg7RMLxe7sQ= X-MS-TrafficTypeDiagnostic: VI1PR03MB4624:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 18Ut+anfiGhK+3rcFQGRum+7zbjpBQNfc3zpbDd/MDi1ph9CrAuDn3kPkZRK6cmzcN/xraT9KdGUYw7SzbGMG1TWnBlnb+gPEb/u2ULDdeWYay11xIlowT3K6OPbiqiXl8svEyFEX/FFtleolsL/ZbQK7wWqabSrLKkOPr1ySD1sZwIoCFW/ZnIAMXLFGR7hk9vu0kPUeljd/4sqvPa5CYvKlQs1wlg7jnZqmEqavDRyon3F+X6U5ryr7vaPuTfQVIZpv7q/hf2tdtPD28ZcTgEoXDrThXVH/8oLLuSoDlsU08HKcWcCNgV97f5HiBsoDJaJQqtUtfpsMxMmLnuVEEXNnUcOS+6DXqpHD9ZJ3eheIiwIQ+Kwpdcacq/PibJOfNZgcy54e5oLv36rBBpqGm7tRY+OaCSIZdtgkVDvC1IfQX6+Zc8OkNzVZ38DLFIduihYxrkVE4gQNJE8343o+bSODwzOBT/svGBMdy9/V7pFD24CT4V3OlDfnEfyGV6H9ZFLcm9LzzsDxnsCjTQ7gJiUx98w9xq10YTBe9Z5FaFX3h6vjPK0Pq7z4D1irYDpEzyh4Iu8LOv56pq++MJOAw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FERCgfll4VC0QgNWRFyU8geeN43+SI93D2TzSZeCG+UfHPZqVES1n1DLDxTHJZfMyjZMwYaB1AsFdQi07R2wOSxDSyvti++6cCKiwX9pzJTBEkZZ+pOoG9kbwWW1wj4PpjyaXvDFyZqdzOVbkw0Z9uO+BJkg/bxMRCo4U6jHpUXrHfx8H2+splo+CbWyXDErGfZ++majd2jkI1X2Hk6V5HkVUSw6tYDD8SBteYWYCv2dYwSlSBY08eqBbl5ktdKC33SV0SXwOzr04D8rKgk0xh817lGmb8oBOTDis4zkhvB9dySHfPCeER4bGiRr/YDK26+C86Svv1Igodcl/bMW2IFGp2nErGL8/MZwvsxXzuAfpBR0xBaIDnb9unvuEWZLGiuYxC3EizgRpEWQiwPkWPDd1ToRSY/vYq7+3AlEOyY9840/G+t4aQo3ctp7vdW1vcQLEPjCONc7hnnofDAOOmpH9FNgQmmJmQKjN19q5s1wagkBJm9UJnzbP3o94kfNZjBIRxkXJTtq90TMjtFxdBNjmTb1V7r8o3LCd4C204srQai6HA48/fAgsmWf6YsLLrMnog9tLT5T1oXEJCdXkUtudmJKwv/kwLksH9TF1XO+C9Jfpiki1UwqWvN/B1c7ECgU6p6IaCl4paxVgxNHPDbiO5BBr/aausjG7FmVWjAYHPuiIkv8H0w51XarZoWn/ddCw/KviFfY9LdfqFyxoEBGmeJQF/y7YUrb/Shn/adHF0khybrZprsBfXkvcNOsJpqof2N3yN8kXrfVK32dWCBwir490ArTjjsj/irgfdhYBxvdNYD/q3kKvv9yPzSCbLUOrvEKqYOgn0PUa9CAvWIcZMhZxO/1irWQjraQnLEIyopuUNXC99slLAEzApZ3ydmeimVvLBDTnHp5saZwx4XqcbQ90JivEMZBPyDMh7RCj0Un9Yw2Q5ItPf1mqv2TxD9Tv/zU52OgPgHAFe2/tA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a832673a-a455-405f-a9f3-08d9fde49326 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 13:40:41.5290 (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: VI1PR03MB4624 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/movenc: Simplify creating chapter track extradata 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: 0ziUHptP5eln Signed-off-by: Andreas Rheinhardt --- libavformat/movenc.c | 79 +++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 53 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4c868919ae..2a6cc1bc6a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6238,12 +6238,32 @@ fail: // as samples, and a tref pointing from the other tracks to the chapter one. static int mov_create_chapter_track(AVFormatContext *s, int tracknum) { - AVIOContext *pb; - + static const uint8_t stub_header[] = { + // TextSampleEntry + 0x00, 0x00, 0x00, 0x01, // displayFlags + 0x00, 0x00, // horizontal + vertical justification + 0x00, 0x00, 0x00, 0x00, // bgColourRed/Green/Blue/Alpha + // BoxRecord + 0x00, 0x00, 0x00, 0x00, // defTextBoxTop/Left + 0x00, 0x00, 0x00, 0x00, // defTextBoxBottom/Right + // StyleRecord + 0x00, 0x00, 0x00, 0x00, // startChar + endChar + 0x00, 0x01, // fontID + 0x00, 0x00, // fontStyleFlags + fontSize + 0x00, 0x00, 0x00, 0x00, // fgColourRed/Green/Blue/Alpha + // FontTableBox + 0x00, 0x00, 0x00, 0x0D, // box size + 'f', 't', 'a', 'b', // box atom name + 0x00, 0x01, // entry count + // FontRecord + 0x00, 0x01, // font ID + 0x00, // font name length + }; MOVMuxContext *mov = s->priv_data; MOVTrack *track = &mov->tracks[tracknum]; AVPacket *pkt = mov->pkt; int i, len; + int ret; track->mode = mov->mode; track->tag = MKTAG('t','e','x','t'); @@ -6252,57 +6272,10 @@ static int mov_create_chapter_track(AVFormatContext *s, int tracknum) if (!track->par) return AVERROR(ENOMEM); track->par->codec_type = AVMEDIA_TYPE_SUBTITLE; -#if 0 - // These properties are required to make QT recognize the chapter track - uint8_t chapter_properties[43] = { 0, 0, 0, 0, 0, 0, 0, 1, }; - if (ff_alloc_extradata(track->par, sizeof(chapter_properties))) - return AVERROR(ENOMEM); - memcpy(track->par->extradata, chapter_properties, sizeof(chapter_properties)); -#else - if (avio_open_dyn_buf(&pb) >= 0) { - int size; - uint8_t *buf; - - /* Stub header (usually for Quicktime chapter track) */ - // TextSampleEntry - avio_wb32(pb, 0x01); // displayFlags - avio_w8(pb, 0x00); // horizontal justification - avio_w8(pb, 0x00); // vertical justification - avio_w8(pb, 0x00); // bgColourRed - avio_w8(pb, 0x00); // bgColourGreen - avio_w8(pb, 0x00); // bgColourBlue - avio_w8(pb, 0x00); // bgColourAlpha - // BoxRecord - avio_wb16(pb, 0x00); // defTextBoxTop - avio_wb16(pb, 0x00); // defTextBoxLeft - avio_wb16(pb, 0x00); // defTextBoxBottom - avio_wb16(pb, 0x00); // defTextBoxRight - // StyleRecord - avio_wb16(pb, 0x00); // startChar - avio_wb16(pb, 0x00); // endChar - avio_wb16(pb, 0x01); // fontID - avio_w8(pb, 0x00); // fontStyleFlags - avio_w8(pb, 0x00); // fontSize - avio_w8(pb, 0x00); // fgColourRed - avio_w8(pb, 0x00); // fgColourGreen - avio_w8(pb, 0x00); // fgColourBlue - avio_w8(pb, 0x00); // fgColourAlpha - // FontTableBox - avio_wb32(pb, 0x0D); // box size - ffio_wfourcc(pb, "ftab"); // box atom name - avio_wb16(pb, 0x01); // entry count - // FontRecord - avio_wb16(pb, 0x01); // font ID - avio_w8(pb, 0x00); // font name length - - if ((size = avio_close_dyn_buf(pb, &buf)) > 0) { - track->par->extradata = buf; - track->par->extradata_size = size; - } else { - av_freep(&buf); - } - } -#endif + ret = ff_alloc_extradata(track->par, sizeof(stub_header)); + if (ret < 0) + return ret; + memcpy(track->par->extradata, stub_header, sizeof(stub_header)); pkt->stream_index = tracknum; pkt->flags = AV_PKT_FLAG_KEY;