From patchwork Fri Oct 1 21:08:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30877 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089961iob; Fri, 1 Oct 2021 14:12:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzL1jEwWRlUMHma8xzhRXD+SisKTLZg6oa5ofk+HhP7P2LkRIHVOhFT4fmSGkLE6JvFa+28 X-Received: by 2002:aa7:dd16:: with SMTP id i22mr293412edv.167.1633122723718; Fri, 01 Oct 2021 14:12:03 -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 t7si10685259edd.36.2021.10.01.14.12.03; Fri, 01 Oct 2021 14:12:03 -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=iK7HgbQU; 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 441FC68AA61; Sat, 2 Oct 2021 00:09:59 +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-oln040092068087.outbound.protection.outlook.com [40.92.68.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0A8E68AA61 for ; Sat, 2 Oct 2021 00:09:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B22/F5FdvsHp94892zyClkVqmjJ6XgpZJvYESE6f11ji/whQ3a2sx5XekNt13mX1t/9DNsO4G8DeZU5F4k9DjegMZv7vCbGdE4pEdCGdzpIQuN9hmU2z/prxUC039j3wh+13sc3lDvmg5m9fMXtCmGxE6SVYeZ6iBJu0Pp8j4AMK7XZ19yFhxqmpLvniZOSDhHBVS370cUNYT7s/dkfEK3jYlHnY85beK3hUceavoK0zR/xpQu1tEqpHlfj1R/xGrKbL1Mzskvrrbu7jifapdb0nAYZUmsEVIA4FOuP1Hh2/8HikqsMGmQY0kK5O48rk38Rfeu3imGg6ZKi+/WL4yg== 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=8/lJbTqGvPf7rb5kLsHLj3T5VgNCl21P/S+nifY53HU=; b=io4mAFUxfQea9NkE+hIH/5zRcAt8ijJeBqir0qxZ/qHn65pynhjdfZdNsQApNjYLCLu0U7A29C0hlkNbeQYLlgwK5NV4IUjLoaMMVuEOVWO2SCrq9a37F6Wx5vGVgwurHkBM1yVwDAVaSGTTxXGlYg7OKEaq8sp7Kc73FYRCLwT7aQ0jPUj+j8RMt6KRv60tQl+Ooz+Vsc7nZY2qlyeFAlWNbn9n9haBntslUdttFeIwMcPWgxkUpJkCfxpY1QGRK7vQQxc/Dws1noZNQQp1CqXM38DDBPWC/WayYBO5jJjlIlKnJJOXDW4Bn6/nVlMCj023W/ryPgyPmkAALL8TBw== 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=8/lJbTqGvPf7rb5kLsHLj3T5VgNCl21P/S+nifY53HU=; b=iK7HgbQUYq5PgXjJdTTXHSxnnD/ifmew3SEUOpEDeBmgCRYe0FjGkWd566Mi/8a7+kK3HhcuAOcgrby+hzdlNoSmAPWhE9FO6K8W/4sZfP6tm9ROWAwfLuxbXLFxqtFFiX11pC4Cch8oPdO2/8xJRHgsBQuz52gWYrpK0EHPydVtXlt53dt2jLjXZQpmQMS7Q96FJh/z29D5WbJDKx2vensSczoyIDIvsRUQQ0APhffSnYy9cIISp+J/8yaZxiMEwr5Nn59BvNyzJy4M41SPxPhy3ovP4KmY4SFblJ/aNDgam7Dt+eB+KIvQ7NsOTLzoSN7AksHz+mpn+8UM9Wm6YA== 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:56 +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:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [M0gfGvJ2J0TxXjeqkeuFrLfNMy31ucDl] 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-16-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:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2cadfc7e-017c-4774-5dc0-08d9851fd1e4 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQqmWIbqmPkeCB9W3GZImzgg1J/99FBvJrulRdUfbVPLZj0uTqd13JSoz6LtuIGibhMs0AmaClNY+sw4eKweqzVdNomaT74FrCEL2MIRLTbAZrLEkPHGlr+IEcO0rqWdWwqabc2HkdIWNAva3Bi+yULTv8RUgOf/7j5XC/3GzhaILyAweh1/A/qblFGaVlyz+62nrEA78ZWMbDH9VnuPbxGebbh0iAFS42BbzDsb5EJXpLZGecYGjNn2d/0gdBDLRqiMWWMZVSi7G3qtSKaAcWTHVb5pRn8YbLNe+ykHuLB3KM+bpP2SqMQzwUdPZnO+/bW9Ce1gbdObf/U3foTLypDaLnhu+hzP0RD5BbqfI5iur2devKX9YdMjEOOjNm/EVD8RyHneVFGo/HAGNELF1HvSqGDy+chL3R2zPrIM+pDGi/JFWVCsgxxDmwNtVJbnEV8eQmafky7Uwg0btJs6kyalu8/aLr7DA6S1am0dFKUAxv8qP7lKkbB4JxymTMBuM3D7EfH7J9MunNZji2sa6A/sqOIXhXtxpuqBuU3yKYqrghVQF3BBwm6/iQWDJDOgON/NqiIuwYm3xDNbOqhdqzNr4T3KFzYe4INtkYRxUy+JpSMGiZK2yedbNV70WWdeAZRTVQjD8QEP4KQyQc73B4BWq6OszwGtNT/s0dIg6utsCbEjnld01ykA== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6TJTE4L0uf35zvfxpp/4vXix2eCHoqXNlEW7lQ5vY+AdoFXdKfySmHja8JkYiXD8+3FOgCF70m7Cy49xcQguvane7VmT3Lmf8ib48mFAkgQxtPrSYEcm+pNQgEF2gJGvh7WyM3E6cXhOd+auhmK3ukG/njBxkNz68Q/8qeFeIChHS/bolCGdREO4NFWN4fR2glL3TmwbB+t+hw0DZbB2B8g6pfrfJKu3u6y98XNGzdUFptrFTyjIDXw9pNhc/dPH10IButgybrqgMFYcSluEu3ryelp6IHhaYcE96sT+uM6NZEuyBzzB3jxK8Zo49vltxy+G7fTxbcMA5LOU0CsrtVijQwLs3kcAIyd5wC/h15K4QuGHzgo837V0EfCaggbfNEuxyO5o4xE5EF9E9gIXYnlBS87GatgI6iB832FrNd00rXFDAO1/R/FnxG6a6WPg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ckZj8riHY02fCt43rIz3+HhAt+SzOAiCbx8uxhZk1u2K3Owdrs0ZtWGO1sQ4lnrEQRF83XtLp0BE5kZMx6QDPBbohHwl3/qOcm+jUzHrFkvMOlzHDa2+0aft2sEHkLWzdXkYQwbtl8nwkhIdGG9/jA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cadfc7e-017c-4774-5dc0-08d9851fd1e4 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:56.3561 (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 17/20] fate/subtitles: Add scc 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: joi/j2iziZpj Provides coverage for the muxer. Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 3 ++ tests/ref/fate/sub-scc-remux | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 tests/ref/fate/sub-scc-remux diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 2f4c94f366..0c89adb0d1 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -110,6 +110,9 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s FATE_SUBTITLES-$(call DEMDEC, SCC, CCAPTION) += fate-sub-scc fate-sub-scc: CMD = fmtstdout ass -ss 57 -i $(TARGET_SAMPLES)/sub/witch.scc +FATE_SUBTITLES-$(call DEMMUX, SCC, SCC) += fate-sub-scc-remux +fate-sub-scc-remux: CMD = fmtstdout scc -i $(TARGET_SAMPLES)/sub/witch.scc -ss 4:00 -map 0 -c copy + FATE_SUBTITLES-$(call ALLYES, MPEGTS_DEMUXER DVBSUB_DECODER DVBSUB_ENCODER) += fate-sub-dvb fate-sub-dvb: CMD = framecrc -i $(TARGET_SAMPLES)/sub/dvbsubtest_filter.ts -map s:0 -c dvbsub diff --git a/tests/ref/fate/sub-scc-remux b/tests/ref/fate/sub-scc-remux new file mode 100644 index 0000000000..e0a8247e4d --- /dev/null +++ b/tests/ref/fate/sub-scc-remux @@ -0,0 +1,65 @@ +Scenarist_SCC V1.0 + +00:00:01:04 9420 9420 94da 94da c2d5 52ce 20c8 4552 20a1 947a 947a 20c2 d552 ce20 c845 5220 a180 942c 942c 942f 942f + +00:00:03:18 9420 9420 94f8 94f8 91ae 91ae 5b20 cd61 6e20 c7f2 756e f473 205d 942c 942c 942f 942f + +00:00:05:00 9420 9420 94ce 94ce 5249 c7c8 5420 a180 946e 946e 5245 cd4f d645 2054 c845 20d3 d5d0 d04f 5254 d320 a180 942c 942c 942f 942f + +00:00:11:09 942c 942c + +00:00:14:02 9420 9420 13d0 13d0 c120 5749 5443 c820 a180 947a 947a c120 5749 5443 c820 a180 942c 942c 942f 942f + +00:00:16:05 9420 9420 94f2 94f2 4954 a7d3 20c1 2046 c149 5220 434f d0ae 942c 942c 942f 942f + +00:00:17:01 9420 9420 1370 1370 ad20 c2d5 52ce 20c8 4552 20a1 94d0 94d0 ad20 5b20 43f2 eff7 6420 43ef 6ef4 e96e 75e5 7320 d368 ef75 f4e9 6e67 205d 9470 9470 2020 c2d5 52ce 20c8 4552 20a1 2020 c2d5 52ce 20c8 4552 20a1 942c 942c 942f 942f + +00:00:22:09 942c 942c + +00:00:25:26 9420 9420 1370 1370 57c8 4f20 c152 4520 d94f d52c 94d0 94d0 57c8 4f20 c152 4520 d34f 2057 49d3 4580 9470 9470 49ce 2054 c845 2057 c1d9 d320 4f46 20d3 4349 45ce 4345 20bf 942c 942c 942f 942f + +00:00:29:22 9420 9420 94d6 94d6 4920 c1cd 20c1 5254 c8d5 522c 9476 9476 cb49 cec7 204f 4620 54c8 4520 c252 4954 4fce d3ae 942c 942c 942f 942f + +00:00:32:23 9420 9420 94f2 94f2 cdd9 204c 4945 c745 20a1 942c 942c 942f 942f + +00:00:33:29 9420 9420 13f4 13f4 c74f 4fc4 20d3 4952 20cb ce49 c7c8 542c 9454 9454 5749 4c4c 20d9 4fd5 2043 4fcd 4520 5749 54c8 20cd 4580 94f4 94f4 544f 2043 c1cd 454c 4f54 aeae ae80 942c 942c 942f 942f + +00:00:37:11 9420 9420 94d6 94d6 c1ce c420 4a4f 49ce 20d5 d380 9476 9476 c154 2054 c845 2052 4fd5 cec4 2054 c1c2 4c45 20bf 942c 942c 942f 942f + +00:00:40:12 9420 9420 94d0 94d0 cdd9 204c 4945 c745 2c80 9470 9470 4920 574f d54c c420 c245 20c8 4fce 4f52 45c4 20a1 942c 942c 942f 942f + +00:00:42:16 9420 9420 13d6 13d6 57c8 c154 2049 d320 d94f d552 20ce c1cd 4520 bf80 9470 9470 c245 c445 d645 5245 2c20 cdd9 204c 4945 c745 ae80 942c 942c 942f 942f + +00:00:45:21 9420 9420 94d6 94d6 2054 c845 ce20 4920 c4d5 c220 d94f d580 9476 9476 91ae 91ae d349 5280 9120 9120 c245 c445 d645 5245 2c80 942c 942c 942f 942f + +00:00:49:15 9420 9420 94d6 94d6 cbce 49c7 c854 9476 9476 4f46 2054 c845 2052 4fd5 cec4 2054 c1c2 4c45 ae80 942c 942c 942f 942f + +00:00:51:26 9420 9420 94ce 94ce 5b20 ce61 f2f2 61f4 eff2 205d 946e 946e 54c8 4520 5749 d345 20d3 4952 20c2 45c4 45d6 4552 45ae aeae 942c 942c 942f 942f + +00:00:53:23 9420 9420 94ce 94ce 57c1 d320 54c8 4520 4649 52d3 5420 544f 204a 4f49 ce80 946e 946e cb49 cec7 20c1 5254 c8d5 52a7 d320 cbce 49c7 c854 d3ae 942c 942c 942f 942f + +00:00:56:21 9420 9420 94ce 94ce c2d5 5420 4f54 c845 5220 494c 4cd5 d354 5249 4fd5 d320 cec1 cd45 d380 946e 946e 5745 5245 20d3 4f4f ce20 544f 2046 4f4c 4c4f 57ba 942c 942c 942f 942f + +00:01:00:08 9420 9420 946e 946e d349 5220 4cc1 d5ce 4345 4c4f 5420 54c8 4520 c252 c1d6 453b 942c 942c 942f 942f + +00:01:03:01 9420 9420 946e 946e d349 5220 c7c1 4cc1 c8c1 c420 54c8 4520 d0d5 5245 3b80 942c 942c 942f 942f + +00:01:04:29 9420 9420 136e 136e c1ce c420 d349 5220 524f c249 ce80 94ce 94ce 54c8 4520 ce4f 54ad 51d5 4954 45ad d34f adc2 52c1 d645 ad80 946e 946e c1d3 add3 4952 ad4c c1d5 ce43 454c 4f54 2c80 942c 942c 942f 942f + +00:01:08:08 9420 9420 94ce 94ce 57c8 4f20 c8c1 c420 ce45 c152 4cd9 2046 4fd5 c7c8 5480 946e 946e 54c8 4520 c452 c1c7 4fce 204f 4620 c1ce c7ce 4f52 2c80 942c 942c 942f 942f + +00:01:10:28 9420 9420 136e 136e 57c8 4f20 c8c1 c420 ce45 c152 4cd9 94ce 94ce d354 4f4f c420 d5d0 2054 4f20 54c8 4520 d649 4349 4fd5 d380 946e 946e 43c8 4943 cb45 ce20 4f46 20c2 5249 d354 4f4c aeae ae80 942c 942c 942f 942f + +00:01:13:27 9420 9420 136e 136e c1ce c420 57c8 4f20 c8c1 c480 94ce 94ce d045 52d3 4fce c14c 4cd9 2057 4554 20c8 49cd d345 4c46 946e 946e c154 2054 c845 20c2 c154 544c 4520 4f46 20c2 c1c4 4fce 20c8 494c 4c3b 942c 942c 942f 942f + +00:01:17:22 9420 9420 94ce 94ce c1ce c420 54c8 4520 c1d0 544c d920 cec1 cd45 c480 946e 946e d349 5220 ce4f 54ad c1d0 d045 c152 49ce c7ad 49ce ad54 c849 d3ad 4649 4ccd ae80 942c 942c 942f 942f + +00:01:22:13 942c 942c + +00:01:22:18 9420 9420 94ce 94ce 544f c745 54c8 4552 2054 c845 d920 464f 52cd 45c4 20c1 20c2 c1ce c480 946e 946e 57c8 4fd3 4520 cec1 cd45 d320 c1ce c420 c445 45c4 d3ae aeae 942c 942c 942f 942f + +00:01:26:01 9420 9420 94ce 94ce 5745 5245 2054 4f20 c245 2052 4554 4f4c c480 946e 946e 54c8 524f d5c7 c84f d554 2054 c845 2043 45ce 54d5 5249 45d3 ae80 942c 942c 942f 942f + +00:01:28:22 9420 9420 94ce 94ce 54c8 4520 cbce 49c7 c854 d380 946e 946e 4f46 2054 c845 2052 4fd5 cec4 2054 c1c2 4c45 ae80 942c 942c 942f 942f + +00:01:30:26 942c 942c 942f 942f