From patchwork Sat Sep 10 20:00:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37837 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1645343pzh; Sat, 10 Sep 2022 13:00:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR4mMzIJRr/5nQGEv2XAhkIAP4pekgzSzdl+fFBUNqS3jdN7+HoQHVB/TzXgr2OfVx0oiE1N X-Received: by 2002:a17:906:9b86:b0:73d:72cf:72af with SMTP id dd6-20020a1709069b8600b0073d72cf72afmr14008829ejc.440.1662840016881; Sat, 10 Sep 2022 13:00:16 -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 di22-20020a170906731600b007307f95bc5dsi3768847ejc.383.2022.09.10.13.00.16; Sat, 10 Sep 2022 13:00:16 -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=flaDtNtU; 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 B04A368BB2A; Sat, 10 Sep 2022 23:00:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072054.outbound.protection.outlook.com [40.92.72.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1603468BA7A for ; Sat, 10 Sep 2022 23:00:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UfqGB+aVLT436/ILDRhNSYCAipRdWUDkiJ+FtU5k0nxEzIaeacJRZQ7rydHDoHoH0fk1K1w2UQy/0oPraIxBa9z0xGQLeO50HvSPfoop+d2TxPJ9P/MBYpsMW02VohqTCEU8QoR/mrLaDd8FZoJJh5jjT74tER/7/67QgyonJoY+MglAetCee1BNHo41pb9DFh5S62nd50/xBARwFgYooEaBxztLhceepjSxzH5R5o6Qco4DVd+y69AyXkAq5Qtpsh8iAM8nAqJWiY+8SdzQkCAtCVmjZ7OjCBz1qtxGhS+BWgA774NrMAiOQxTql2DQciK0d60+wZnE0aoXM2wIsw== 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=FcUONzgtMRR0TNETjwTlYqFwPLZTup4IZdsOsKQw8aQ=; b=X/p+n3QYUnI/2h3y6TnEqQcBMfS/2sv3xwPkpeWo6ooPBk7tyxWUxykKR5QgI5RF7lLST0Tv6Am4xMUvWgrgOhRyCxJ9PyZzAwQS+ecR+dU51pzIcgsIxDgZzyM1Quwz+/w8EF5qCu+uVwCMQ/7YJNcSmKrhUAoS9Dz1WV80+KUIdKbY6BlDnfpeV6A9vkdCf/cn/2g7/4EEkokGOAkPXXXS+Nr1T+u4Teh2qacd7Qo58Ruc38dQXa28hHWsLKbcV3QNmVsl3vAvNsD8TWK/67E6vWYNn51g3rGTGWx477Vok9RddgV1Deg+ED+pOyK8BaQdqok/X7vVZvJipUlreg== 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=FcUONzgtMRR0TNETjwTlYqFwPLZTup4IZdsOsKQw8aQ=; b=flaDtNtUvHKkVBXaz42qBTc3/ZXMfNoIwwIaRv7PTr22v4znWqJPVHNJETWN28SnpTugnaRRUbeeTVKhEI8Sm2pIh5uZBrcQExIixShRk0mpvHc98jcwOD8FYaozlzqe83+AmgNxe6TO+mlVbWEIHzBgpxGGcnqN3j2KPRlNQU+WumbgtqTTvFWfYIooMZ1mxB8z+OOne07xaYl9JgzOVrn+2Qpz9TUoRTqjRMjJk/DrrJhSFZTAbxaADcUPJPShWDUrIp6gvDxhIYQL8h1Hjba/9vNEMHLVe3IdqNokZLgJT5isEWfOh+1hxuJIIVdLAwa+NL0eKlmLXSD72Z7NYg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0219.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Sat, 10 Sep 2022 20:00:06 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::36a0:c1e3:9fee:2125]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::36a0:c1e3:9fee:2125%2]) with mapi id 15.20.5612.022; Sat, 10 Sep 2022 20:00:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 22:00:03 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [MtlvmOwWSqNCwDB/GclKpgxetBoOvmsb0tHfxuprsrc=] X-ClientProxiedBy: AM5PR0402CA0011.eurprd04.prod.outlook.com (2603:10a6:203:90::21) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220910200003.3228292-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0219:EE_ X-MS-Office365-Filtering-Correlation-Id: df595b1c-37fc-4420-6bfc-08da93670ecb X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxxnu9+Jh3HQy+dp9k5aEso0giqOT34xyUky/GZz3x+MbNmWXjntKb0NHf/42z+zrdaCQV1UV1ZcRRwZMqjjLYiON6g2gcqIDn9Cx7P80f9ZeWlwR6OZVkKIdM6ixdn4c4UdCkKqv6dLvbQe8Uog9Wiux/4eZGmIloyhWRvqlf2h5s3PYMGyIOPFtyfEO+8121pcNs0mGqgrXVDrz2/XDSDFzBEyqthqv+NdyyW28dKcGNoFOUbJjDynOFqQ4QKzoxrDvWlD1bK6APdBdAsjSGKj7OX5bm6+uZid9t7u8iRPBtEJ+wRVRP8fTQ5770GKvTLk8ljQNZi/9GTIwTAOhJk7HNFt51gTxIFRfz6L4izQ/OGfTIZGv5mA9NgcdDbs03Bo4oMzBQtvSGE8T8zbQv7q7RypgAl2jR3gmclz56R6N4TAtORo0YbwL16OsIP2E4gMBdugSyPk6iKEEcf250fYtHdT+5dSHk19pNEbo2gzOjFDaQA3Y9DJK2wX7Qg3z6KnEBLr97uF8vjNhBcpGTYaQh8ewxh5KcpikliXXFIDDqM1LblZOauq2OzyQhwb9jzOb4CMvm/1BuQqgL+TVR3ghN6GEx8vr21MuRVBCaan5iQYlqX2LlXCLuZXtqEGII8/UbxVQ7Ek0jpzSf7fsBbm+X7JMreElMX1/INF2k3SBp9AEP1jto21eAmum9uO0APTvf1kxUIQyZtmIVnaqwo727EzV8bqPI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WiiB8WHO4cp8Q3slpZ6ypYGZkgIfclKn16qXrcxCUnYSBBhcg1AW5PzAdOuCFZFsNniHMCj8H8Yo8d+gAPZsomwv+Cod/lp5D1WLwSyNsOjuvBrbBn9cLyqDlBzwbSV0haawXEyGmZUdcXdof2d3nOiitddWBKZehSaYb0jHjV/jmaaN1opLW+9P+XyS/nrrGyt0oP7ecdiYxXAAWA0fM80AyidgiLq7uYa293cPFk4eXATtVtaEWn+pFqn0iaPQ4NY7NoAxUiFqmt/aYiTsuXO3HKrrCvkaHo2Pz2d/DWAyciU3SsV/Yix/pij8q0+QlP2hDsU8GKgZ/XoUrhx7XGSCos0qaH+A9Y7NnzPdnYCz9ezET6a8bQotGN3K4Y3aTImjVdhC1jCu85I4+82KBhA2jsFcDQrpjltRAai3L277kc0GF3zTDQJpwjQdcVa7Hd8pT94R68opDZgWdx+FsbMb+Zs8UeR0Mf0NpC6kEq4mAPZNeSkArwo3whvjNXmQlg9QQA4Y6Xaj4u2tRz180C8Q2W7nglo+5i7trXfyRfzxhDdwQ8Q7j4P+6vrcgM/Om7EeGf1EDpnbjjYjFbj7wK1uPLMooHl9u+Lo9sKZSCQrvZpXEDitVTvtsnG0OGUCaXLOni9GB0T5M1pKJ5IiOQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8HBiuEyhxMZbx9MkJvsx6bPT8CmljoFBWIWQE1RBqm1Y6i0auxcz50Qp+1eKxAuaGUrjVVwsICTm3iW9PK5g1pnDBH49a4A8va3KGdf1EpbWFT2ZVYkqI/48shel0RkLeXL2ye7hhY/oppfyHVPiR+nkJ2bcmix5rebCKgRpy1OlnXAtj6AFEfx/xoWFNQbnwZRALrkl3zkwN8BW7Zh0rC8JH2MQGQp0MhGBSFO2sm7sioq6JxURT0LGprsJdSs5H61ET4TxMwZvWMrUOnq8MsQZdYPzOzftyRQP0wWI1tKdgiWNwlawDsieHfxrHPL70q5HCDuAfP3un9gh85zrr2jJwYfLqvK2TbFN4k2taymyT7W1vDwv6UNG52bcIOxCiKrcloMdByovIAxrmeEGzNaAtkkT2cdriwF1zrLWOxOhWcA2C+eJ0GYF2soFDVND+YIWaH+sS08soNMrPq/Jhgfc2qbQWwEjakNnqbw+H6SuByGXmr/4SGxW2X8H1+pk6ZAgwLdoRtoZyjVAfysc5pe/CCXFdFeTrR1pptZs/1nVSJHI2/Cu3fLLy2/FWaHrHpKjD1k0TR0LylxP5G2BAAl1PnW2v9ziC/JmMZ2ovUu4Iag3cob/UKedk1eb4/Nh2p0hDECh9dcqMgWVdWtbEl8uKJc1/Pp/G6YGYwzVPF8fV7BkuKmhxirDm09rL81iw55hiQj6BimaA/7MhiN0x2KzmcC21e9zQdt0rvotY9wf9NXTC610ulWA67+03b/rRrC3fjT15v/w+3Wct1I9wpYI8k6Kl+tUMHzE94qASjgONMGEEcK0HRzXeNS2AgEBSF5ITi4WKnFrjfns5VB7tmlQ4C4z2TndaHZzd+t5rGL496wNjpImI1CGuWkPWMktFXvd968nbnzs/ls5YJPulWrayluvbBCUYEiU3ocwRH5GasrgEGmM7JkLVSGn7gXeEYBhwNsvSJ551KQKJhMa4trDZYtR2Xkf0MoMCbhhzs8++FmZlf58DUMaYWAEr5banga+L5px6m4tdXcnWnNl0fExq5qvwMcMHK83c06JZeS7EwBLQBwF00IQHUzQJeO6GqfwlYpzpPFKw16cCPDrYOqNd2rOIz5trlXIzvqNLs2QEXB1bqLP7JRIVyewr5JDBfQGjaye8APu0q6B1heLEWMd6UuapnwpFFibrrPadnU7hkDVC282i8RP/1yDgPlIGjEHWoZwcrzdHeixYJoy5bDhvxl3NST0vfHvMO8JpHJf+6nyNCmWgbaU/1XQQIZQDA6LlNYO2CD4mUlJUYHYV2jQZ/Mwb0XVZ7dtz/z+okmVGPOPjhhczIj5pZO8p/oZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: df595b1c-37fc-4420-6bfc-08da93670ecb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2022 20:00:06.8441 (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: AS8P250MB0219 Subject: [FFmpeg-devel] [PATCH 2/2] fate/subtitles: Add PGS remux test 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: bR+/V3MepQ4b Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 5 +++++ tests/ref/fate/sub-pgs-remux | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 tests/ref/fate/sub-pgs-remux diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index bc464edce6..e6684a814b 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -50,6 +50,11 @@ fate-sub-mpsub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capability_te FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub-frames fate-sub-mpsub-frames: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capability_tester_frames.sub +# FIXME?: The dts in the input file are not monotonous and so the +# timestamps of the remuxed file have been fixed up. +FATE_SUBTITLES-$(call REMUX, SUP) += fate-sub-pgs-remux +fate-sub-pgs-remux: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs_sub.sup sup "-copyts -c:s copy" "-copyts -c:s copy" + FATE_SUBTITLES_ASS-$(call DEMDEC, PJS, PJS) += fate-sub-pjs fate-sub-pjs: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/PJS_capability_tester.pjs diff --git a/tests/ref/fate/sub-pgs-remux b/tests/ref/fate/sub-pgs-remux new file mode 100644 index 0000000000..e965d93bec --- /dev/null +++ b/tests/ref/fate/sub-pgs-remux @@ -0,0 +1,15 @@ +cf306b7bc30122effc6429e35364f640 *tests/data/fate/sub-pgs-remux.sup +49382 tests/data/fate/sub-pgs-remux.sup +#tb 0: 1/90000 +#media_type 0: subtitle +#codec_id 0: hdmv_pgs_subtitle +0, 6072, 6072, 0, 30, 0x32b303ec +0, 6072, 6072, 0, 22, 0x27510416 +0, 6072, 6072, 0, 160, 0xe2024133 +0, 6072, 6072, 0, 22943, 0xc011fe0e +0, 6072, 6072, 0, 2969, 0x35604c6f +0, 6072, 6072, 0, 3, 0x01800080 +0, 35426, 36102, 0, 30, 0x2db303ac +0, 35426, 35862, 0, 22, 0x27510416 +0, 35426, 35426, 0, 160, 0xe2024133 +0, 35426, 35862, 0, 22943, 0xc011fe0e