From patchwork Thu Sep 23 23:10:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30524 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp942529iob; Thu, 23 Sep 2021 16:25:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKIk/dYmSsRWdnT0FWqGI7Cjoz7nULIN4xZrkP2Y9LfS/H8yxOBw/jV0ZMgtELqXW3fWbt X-Received: by 2002:aa7:d0c9:: with SMTP id u9mr1693785edo.167.1632439507221; Thu, 23 Sep 2021 16:25:07 -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 f10si7442547ejl.258.2021.09.23.16.25.06; Thu, 23 Sep 2021 16:25:07 -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=iznwSIWU; 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 30CEE68A306; Fri, 24 Sep 2021 02:25:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068053.outbound.protection.outlook.com [40.92.68.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8484D687FB5 for ; Fri, 24 Sep 2021 02:24:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i8DCToIsbZDNgS+/FXIcbm7b5WDvSFDZXulMVVF7p0vvDwXhEARJAUBwkQ96kmwFoeU9lRFC4pE+isS4fxtqlL+8reQbwuRL7cHNIQW3u+c6xDH0IXpMRDWuriQHgAKiEEP3EL06ywqCQr9DsKjy2N5LO+quJZUfIiXUCHmBhoueYSY0GQ1+7oZH300MyqgmUuQ0pEvCsYAkFeIRzDd7rsQGQJ9YVIPKqVkBv1CrmEA0UcYbTcDYNpgqVugks9OYEV5TnZ1HsC1V/yLDNOO34qyDyYEL9ktO/W0D0RoFusr3e/iOKgeDaqL9npeMPizWzSWcxK7imPy4H3KQOoo/rA== 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; bh=IntfSxfFnSS8cCTLjcbTKZMBarigUS/Riy9zD8pDuKo=; b=ZiQ9ItD6Mjdkv0q/5Bt6hgx0b7CZN002iWzTtLVrX6a+qVFDUkdOa+9P38P+YMvj/NPGCaC+LAwkroJjPTcEZEt/iej00LblBgZr3xHHx8yg+WMLm7ZlBT0HsON7UmVleBskezn4xTHxzCVl/FaxrDCkQbuzv6MgVOMT6tzRZ3wYx/Qi62TAfrMJC3hKn++bcD5LNck8mKiAv+p/enCfZDOy0FoklH4iFnS2q5u9tuNIuOuW4szAmrSU9z7lQS7IZf+jvJ5RGEmsCV9GfBfjzU8sRFW5Z4Pbz5mk2cLxfnkKJhHOguyHFGv3pmFyE+ojEDht7TxJsn4diF5JuDCTdw== 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=IntfSxfFnSS8cCTLjcbTKZMBarigUS/Riy9zD8pDuKo=; b=iznwSIWUrw+OYJ0dpseYULvMeEhCiksq/TDojVXjx7T7PQMOzbEHKMz/dyQa4RGktsajYf+U9hWZv1PlQZFH34ZRobNkLp3Ag5U5kDrsKCMILfagJxx8H+hMQ/FU0dqXCa9gBk6Rr34WKiKGlWlgAwqo5nKuQeOhQ0BAs3IeIWLja1bI51sWa4R4ER3x5MHCeFt3orI4MZ/0JmJt+EcetkYTqubJoG4jGZDMTiJgMuRguAZAqU9VCd1w6u65fSMyB2JKUpXnLxG4oLqocaV66ob4B+pxwIJ6UgOZRMCXCTymK/33rt55k0tMgtx4LiWa3ppxEE4o2mJUrgc6tMwbpQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6619.eurprd03.prod.outlook.com (2603:10a6:102:7a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Thu, 23 Sep 2021 23:10:25 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Thu, 23 Sep 2021 23:10:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 01:10:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [r7ET5LrwhzCyLmBcfJNmqL2bhga8Ccun] X-ClientProxiedBy: AM4PR0902CA0008.eurprd09.prod.outlook.com (2603:10a6:200:9b::18) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210923231018.368099-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0008.eurprd09.prod.outlook.com (2603:10a6:200:9b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 23:10:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa667e07-a228-4e9c-2ca2-08d97ee75389 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UuTYk0YBKgUvK4APMbyXxgO8vW+VzWsrHgfHvOoGRQd4y7yI7VTG9mRHgUjs/25tVl1YsIS8IE5kRX8+EQBShBLEeARwEPH//TkMMaR3kJTvFoJ0hl/kNDFhPEruQ5wZeKpV/DnE+BaRYThwuc6PZBN9r4GJX54zCa7hIPcY/r6LK1gwUN7vwg3trNqz4MrNzREhk3RFZBqiEQMAzTnLRtAYgICwv9/Dyw4AQsSBu6XNmpsWZ7brfdjw4LeqkANjH/Qwzi6osNR512tj9TyxFjlNuZM9zXevAjG+ygZphcVgv+ZpNHwEFp+ZpOnGE+QIGUhJnOFy4ODMClO8FC7OLFCUrb6T4Jex04eXF5Q45ch8tBo6ky73fTuu8/U40HlN4b3g7B1qIDdSbQXSRCxKqsIS5XBnw/lm60b4uRL94Bq99ft3YuGBZl7I8I5jWkeUd+l0blW9WK1wM+VEl+yx2Qi8SEqUJuEa05Ra5ZwY57cLjJ0QDWp+7YbO6jymH4mrudVU7YvyCo5yZXba8MeYUNTNQh/EDz2gGJtaP++qA/dF+kNCkUagyLzsA2LCG3hUnRR3BNK+8C6keE50Ivra8wfDw8zXKiz87ndBlUFgY6qSWRfYqJFGLpwu5gWQ4rsTxgl2blbZe87sB4t0EeQ6R5WpqahuHpmupm/uEAWQDGVtw6Z8wC5gTb1NgeH8t/vompj1Pz1lGi2VLl7wpwTWJQO0d/GQe65xw= X-MS-TrafficTypeDiagnostic: PR3PR03MB6619: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lNLn+bKaGrj/Na24pXuJsKvV2x6EiHAKSbwa3eYTGxOxH1KDPk+QA0ygWH7urY9cQVEDs1N7cO8Sh3nfGoU4MXfFs0/8/swMmSuJSOEf+1F0kPUeFFviIAJ0o0nx9zWfXsobz/yutOeqCWMYKk0NoI5UD0yfmkkyDTb7zcFh7xKUJIfU7N1Nn609O5SzID5UGpKSG0V9kDQotzL6h+MzM1zF1mDngakVCQf5AxlqSrg9amEOygl5oUQqyY5tMvdnPB8FGQATxcaqjSwCe0u3xBG7JmuDKuCS+PObhpd+V3p8LZiHhSgEyBesBvUjbxb6RPBnfmaUmvt7AcF6j7gl0ol0DocKQoB9788ceNvDruffuHYD8BDdYrLHOj2OThcKe1pHVqRZRed+CcaWfiQuaMePyO3lvN2Zf9Yg293xU4UnfrwlagJVVCfRINaxRG4j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Vbv8X9SWrsXrabDmeNkux6B3WZgKipdXLD4pV3JzyXbK2ea4aubXvmE5ghL6/nGrg19cSuQeu6po05NolNsirxA7ENFrd2xZ1W7Fu6PnbfPgWboddeIBhxSDzf2kNQ51G4ituw09lZ79ntpQAOCSTg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa667e07-a228-4e9c-2ca2-08d97ee75389 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 23:10:25.6626 (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: PR3PR03MB6619 Subject: [FFmpeg-devel] [PATCH 2/2] fate/subtitles: Add JACOsub remuxing 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: /ybNPSZ3DRYi This muxer was untested up until now; had it been tested, it would have been obvious that it has been broken for years. Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 4 ++++ tests/ref/fate/sub-jacosub-remux | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 tests/ref/fate/sub-jacosub-remux diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index ee65afe35b..cd162786d4 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -22,6 +22,10 @@ fate-binsub-mksenc: CMD = md5pipe -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass -c cop FATE_SUBTITLES_ASS-$(call DEMDEC, JACOSUB, JACOSUB) += fate-sub-jacosub fate-sub-jacosub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss +FATE_SUBTITLES-$(call DEMMUX, JACOSUB, JACOSUB) += fate-sub-jacosub-remux +fate-sub-jacosub-remux: CMD = transcode jacosub $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss jacosub "-map 0 -c copy" "-map 0 -c copy" +fate-sub-jacosub-remux: CMP = diff + FATE_SUBTITLES_ASS-$(call DEMDEC, MICRODVD, MICRODVD) += fate-sub-microdvd fate-sub-microdvd: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MicroDVD_capability_tester.sub diff --git a/tests/ref/fate/sub-jacosub-remux b/tests/ref/fate/sub-jacosub-remux new file mode 100644 index 0000000000..b8868db891 --- /dev/null +++ b/tests/ref/fate/sub-jacosub-remux @@ -0,0 +1,17 @@ +51da69c384709ecfaec940bdecfbce9a *tests/data/fate/sub-jacosub-remux.jacosub +1065 tests/data/fate/sub-jacosub-remux.jacosub +#extradata 0: 15, 0x15a10293 +#tb 0: 1/100 +#media_type 0: subtitle +#codec_id 0: jacosub +0, 12, 12, 400, 152, 0xab022660 +0, 412, 412, 250, 60, 0xd3dc114d +0, 512, 512, 210, 33, 0x778307d9 +0, 612, 612, 170, 50, 0x32990db4 +0, 812, 812, 300, 180, 0xc92530ed +0, 1112, 1112, 250, 122, 0xbfc222a9 +0, 1362, 1362, 125, 111, 0x4c3a1dca +0, 1487, 1487, 125, 52, 0x57a40f01 +0, 2242, 2242, 550, 122, 0xed8d20a2 +0, 7612, 7612, 500, 86, 0x530d1b76 +0, 7612, 7612, 500, 82, 0xc99119aa