From patchwork Fri Oct 1 21:08:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30876 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089670iob; Fri, 1 Oct 2021 14:11:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrxICRJbE9QmfvNJp81PCvuBhOwb1Gn0ktXYDIZwicPJ13YrF+SctBMkyf57zmhyMz3Fis X-Received: by 2002:aa7:d78e:: with SMTP id s14mr276816edq.171.1633122696629; Fri, 01 Oct 2021 14:11:36 -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 d15si7526991edj.560.2021.10.01.14.11.36; Fri, 01 Oct 2021 14:11:36 -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=i1nd6b0x; 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 A976C68AA4B; Sat, 2 Oct 2021 00:09:53 +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-oln040092068094.outbound.protection.outlook.com [40.92.68.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A35F68AA24 for ; Sat, 2 Oct 2021 00:09:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nWtVLipZcHi+zFwG+38Kc7OvAD0nUxzwqAQ789+iZJgJF7iKpNcf8tuMSaRrLUVpsw5O5om4LZ5nSwqfb2XfKhg97fHbqcKNdJbbvStFq1+NT2bJhcnTzY3Ae8lMpmkcMhciaZJMXR2PTS8v5wHG8IwkBmCUNQQx6ujGH8nsdy18groIlxMO15yvC0ty3ssk79Vhk5c4BRtuFwylHwJdn6Q5ztAqxvsZLcPO+bNocxbrocv5QXNt9lHXivnDhRGUC4aLwLZZlD5l7bQdkX5cIpzW4s+86ik/PWq8Umn+6aZl8X47WOD9pq17x5JaPOEmITnZxayWF8QZGIqbP1t+BA== 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=+VF5gfQFraDCRdkHnsl/OX/q5u73AqQ0ciynz2jiGXk=; b=bB3fCBLeC+PkfIIf6Tii3ZZCRJ8ImvAHwJueZWjohRcvGoxxvwNc9E9DMpszvDbu1+89fHA9Qp70YHOSZVk3EbNAWY7dg9TI8DV6qcFgeu91p/DX+jXKltKNYBEoYe9AOvwFbkX92UiHckIv/JYusoR9hS6tveHLNXZf3vCpNJB4aBdPdzA1VvAZ0hpTeCPPkGvolVNpOedEV2vk9r5aawqAud4JAgFcJFymd0mkUoFXKPUk7LXoTiv+TfT8z6F34nvsgbikJT6XlbXktSMCuXYPe4+rzvKVie7odWQBniS9M/LBrv0LkajBwIU1eZhOmAUm1DfGHNBd9k85vR7qag== 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=+VF5gfQFraDCRdkHnsl/OX/q5u73AqQ0ciynz2jiGXk=; b=i1nd6b0xWqB9V+YyW8uFMmLrn1jcL5LbLKTXp85sHDU6W36ke/a35/UA0DqfW4KYbYL6q/K0q+saQAmOA54JaLNeBRXaTlypZEey3u2ZGERcDvME/nVUNsQEF7Tco/IJ0dFc5UV2awQVr3uG3zALtwG/sIflNktqrCe9q7EsWpEu/+zfHj3Cyzla5GbBKFnOo5kAo2cN9cYsdqgyoTHMmESylXq00YDTeG7S6cXMDdEOMV5CDzVlENV7FSCRg41tXhaMmSJ2IfvyDz0LfaRw6uIKraeqy9K4L50IwO/qNvwmMZwkQDTmj/9HrhMGV/8ya9LVPPPP5syG3d0vUnotWg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GkYCNWO0koz/zzttBIc3wyyva9vjumx7] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7dbe622-b53b-41ed-a0bb-08d9851fceb3 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVM2asYY12qjM1/Eg4mHSQy5tV0qEqDmspJ9xXHYDJe5XdJL3PDiN2T2oUJgq9ui1ieI4C7Q9rEjEUfnT/R6Qj4lCXwEhTlH4W3swgR/tsCY0VlVzu0YwWEtYJNcBx00djaxn2IVbp7FTgeTVcoIn/hgJt0IjMv/EQF03viUfZ42d8Y/y6503bUlMaOSWnErkVe9j+hl0DiJ2KSTNb67ce3DngHSaT4ccxXWGp2Dw6dpZpUI4sGTNOSmZafSPWlSXrpT34tgQo6wajbVAIR5Ag2jqZrFC3HSzIfwy3DYoNJ8WM4HaVSK8KuXuS03z3CHukkFj2yR6LoLAEY/+JxHWcAQ4TMufBsZ/lHlO62EJZvK0gemlJb/dO+6RfaZ0InuaxAs5sgdI6lj/LFCgsK8Dh0rxZb7mmi68C+VZfJ1wHv4iwwtcIA/1EF7OsfiqT4vbpDepKxHMMidbg3l1ezxFcD7arxXTRxQH7dgnCkKwwidJxy3kZ9Qqeviir54/l0eweMLHABuSFekn4haGcV27+xfLD6frYyfFbQPK0wiPHA4GkRbqQPebv6WEc8BYxO3gi4G3HcBkqQpflLQh/mQthxf1gSrs6YYu9yqT9Aktv/ES1acs/KBIYqUFE94VIT/Zz8YLLShLu9zm3oukYIWxcGoVv57pceyP1HMzXgnRzp1XkF7LMSRJJhzxysaNIepEWkwGk0QqW/C4Uk6taz5d52DBgnkKwlRcI= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JC47XsbwVG8jHJGmLKjX/wBETqqAgMjywnnoRajdNt8jY9LsEUZ5jKrwmG4etfDbh1x90hWXO/27i0ph/fU9ulnfPwO5yrWpPAXbNEf2wlQ3yFKqzREbQ4ecQQJVUbqBRrtm0DbefpKBpufQBCoDHxVO6qaqE37xBL+wA08rNo3VkZUDiYt1bpFvQGyiMkJAEtsb+O/fk2/w9y6De6MsGbrhE64q7/sG/wIqzugDOD90VTnpo8ykKBcNXjFGBThtvITpZtlnOPZuWJ3bnpSJ/VTl22Z+j6vcitcvmX4JUuxTXCxxJDDCpRrz8vyDoI/sxGTxT7rLTFKnp/gpsI943RMQnMU10z2gBzu0RrB34y/R9hTetsTTz2s1J8Nz99H3oJk2z3PQ5cezrNLuUf1+TS3ZaBd0OeYM9TLXfkWlI20Alcz0YQxo06MeRGkR9Fv8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Axztu8lMlBRj4iV9gtQ+gUkpZdMytVvxVOQ2AFtdFoX+PlPuL90q/CIUrwDBuYs7NAX8ZvKW6+ANs4L/x3l3aBaZ3nuWWc5b7JKfA+da8dl7eKXQkI8RWORenqyYTZ7cWTR2ALZ27OqRJFDY6Px5AQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7dbe622-b53b-41ed-a0bb-08d9851fceb3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:50.9916 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 15/20] fate/subtitles: Add remuxing test for lrc 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: r/OcdCneAmwF It uses the test-lrc.lrc sample which was added years ago, but never used until now. Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 3 +++ tests/ref/fate/sub-lrc-remux | 49 ++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 tests/ref/fate/sub-lrc-remux diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index cd162786d4..2f4c94f366 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -26,6 +26,9 @@ 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-$(call DEMMUX, LRC, LRC) += fate-sub-lrc-remux +fate-sub-lrc-remux: CMD = fmtstdout lrc -i $(TARGET_SAMPLES)/sub/test-lrc.lrc + 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-lrc-remux b/tests/ref/fate/sub-lrc-remux new file mode 100644 index 0000000000..92d6c30f64 --- /dev/null +++ b/tests/ref/fate/sub-lrc-remux @@ -0,0 +1,49 @@ +[ti:Swansong] +[al:Breadcrumbs] +[ar:Josh Woodward] +[length:04:21] +[by:StarBrilliant] + +[-00:01.02](This is a negative timestamp which should not make program crash) +[00:35.62]I never thought I'd see the day +[00:38.42]I thought that I had finally moved along +[00:43.80]And I had let you go so long ago, so long +[00:49.26]This is not, this is not where I belong +[00:57.38]So I wait for this shallow itch to pass +[01:05.98]And I wait, yeah I wait +[01:12.14]Hey hey, I'm ok +[01:15.18]I don't need this anyway, I'm fine +[01:19.82]What's yours and mine +[01:23.64]Oh oh, I don't know +[01:26.44]What I was ever hoping I would find +[01:31.66]But it's time for me to leave this all behind +[01:35.74] +[01:46.20]I don't regret a single thing +[01:48.98]I couldn't say it didn't feel alright +[01:54.10]But I don't want to stay and I don't want to fight +[01:59.76]All alone, with my foolish appetite +[02:07.94]So I wait for this shallow itch to pass +[02:16.52]And I wait, yeah I wait +[02:22.72]Hey hey, I'm ok +[02:25.68]I don't need this anyway, I'm fine +[02:30.38]What's yours and mine +[02:34.12]Oh oh, I don't know +[02:36.98]What I was ever hoping I would find +[02:42.28]But it's time for me to leave this all behind +[02:45.36]I don't have the heart to give away to you again +[02:51.08]I don't have the stomach for it, no one ever wins +[02:56.70]We had our fun but I have sung this song to you before +[03:01.68]Here's my last refrain +[03:08.05]Hey hey, I'm ok +[03:10.81]I don't need this anyway, I'm fine +[03:15.50]What's yours and mine +[03:19.31]Oh oh, I don't know +[03:22.11]What I was ever hoping I would find +[03:27.34]But it's time for me to leave this all behind +[03:30.81]Hey hey, I'm ok +[03:32.98]I don't need this anyway, I'm fine +[03:38.02]What's yours and mine +[03:41.91]Oh oh, I don't know +[03:44.54]What I was ever hoping I would find +[03:50.04]But it's time for me to leave this all behind +[03:54.82]