From patchwork Thu May 5 10:21:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35599 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp975085pzb; Thu, 5 May 2022 03:22:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6l7TmdIk0NTvPE84wgdnsNfHKnjoiZ3B9P4fAuZVUxdlLBqLvjApP6BPBQRuJiZ/FMKaE X-Received: by 2002:a05:6402:1592:b0:425:edec:992d with SMTP id c18-20020a056402159200b00425edec992dmr28112450edv.283.1651746122934; Thu, 05 May 2022 03:22:02 -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 dz17-20020a0564021d5100b00425dfd4296esi1767384edb.48.2022.05.05.03.22.02; Thu, 05 May 2022 03:22:02 -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=rhhDXLX6; 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 192E768B3BE; Thu, 5 May 2022 13:21:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2057.outbound.protection.outlook.com [40.92.90.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6625868B3BD for ; Thu, 5 May 2022 13:21:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eIetHdAxtHclwBgfknf/adZwyKl4mpDwlHE9yl18yK8UnvObjm1zfI3EMc/kbvhL7limoxj4aJKvwHDGXGrW+nehpk3QOwlTN2Rf3m/P18Fz0lQpGlJbpXcttF0koeiDh5mL+EO6dB//gCcTDBAkg3zeYncCl0oB7kiiF+FXoPjyKWOtRSDq5RNJglC58sHcP1zPtSveAmSH960faDBi13TPvaMWOH1IIKxnMwZczBCSV6dl+qK3wWsSXdAkT2L/2yvoe+aolAB43RfEdCINjeKRP1CkTFKp/H7c5L2uX04WUoWnq3t5KELZ66VDJH4NhVfeD/0zOGQL0WWqS4AvVw== 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=L3Y5+djpkeYycqE0sCUKdX2zln5E7gr6LN5gOOi7CAE=; b=ZhCWvY25CTBgyb/J5z4E2p1ZjFjy4crqx4xGTvrDVvEETp677/ES42xsDITOCkzTmod95w64NtdWkFVIFI3Oa/mVxi3IIT92RfmrLkuiLHooMN7jMAuA+3Rmv40CtHBRcRGK7uit/15nfaeM+5zFPdVDqjKhrxMxSwfJDBe3p/N+NPTlC2PQ05PTAfQ9R2rf7f3uBptLxQV07jhGo8unWKl+n6E0fZn4+WNVuqpsAnEY84fGf58Gb3Zt3j6yLyxpmmaK7MehOMxKG7WUeXi80yshXLB5Go856Dvmujlb6irtbxmYVLgqezxAnsXa1dy8aqX7L0JmoPwlXUlzTIBZXA== 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=L3Y5+djpkeYycqE0sCUKdX2zln5E7gr6LN5gOOi7CAE=; b=rhhDXLX6LhZkonNQoq6Uk32apbjnmBQ/fAgW/J+Xu4Csi/sLX1BFT1LL3bLbLv7KmD5/4dSuLh5xiETbzRv2v9XlxaVGMUYcBc74MGEbdWaCuqEz8N8sGei9nkQK9LAETUWJLlMbsgAx/hxEzwqWmSogrvTfnlN02fIiboXpeLmJHyjrRC/Piktoi2hGVL2lnTL9dXBNbe9Uwc9z3rBnI+qfDQcTZlou4O0jTHcoGBtHSAmPaxFFLgc3lcuLiO7SxlajOHBRhl7ZYxzcWstz2ifD2Zjkwo0QiZBqKoRSl+qH3QB9u8qy9BFolSnM7mtXIc82HCqf9arEVgjS/v2Nug== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM8PR01MB8088.eurprd01.prod.exchangelabs.com (2603:10a6:20b:327::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14; Thu, 5 May 2022 10:21:44 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Thu, 5 May 2022 10:21:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 May 2022 12:21:29 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [JEQrLhgfwS5eI1i9gKMPQyZq3tUqC4Tq] X-ClientProxiedBy: ZR0P278CA0049.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::18) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220505102129.3924826-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a52b0e03-1f64-4448-416f-08da2e810dc0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTwpFlTyQGqvVx4396NoooTq0dPBSAd5/Gg+WUoPvzJHiVC2GF7SHWeQoLwihB6x8uNav3Iuluq0PD9OJB8bsYBVJM+HOf5oWQehpvy45ZkD0d+8xW/JZPMoyBT7jEXkE3wfbAODnziHSAy4AdeX2x++roLYlE8x3/YeBmXTYrBSjtEDnHNvfh7Df3MR3IFft4EQ5k5/Y9VB4sc95oNpLw3+v7kgLkJKbjHkX4XLwvGh1TTiXOYKsChu83/UBVvKhEZzjcsk833Vkz2IfGVk+CzLad4yCat+9DvMIHkfE6N43qdT7c9Jjar2Na5r53HKyRHhJhjTiFi4/Bzu7zk6vYHuHr5qzex5eBXup0weUhcDC1YktlCTfZ3gnoXEzKPtoflO0TIpq+8RD9LzVQbp7Y3nvvMZ17A5jLcSTbkudkB8eBNLFXA1u/lh4V9J4y1UJvy48padrkuTwTvb6tIhweq7nxYTCHamFHtddapFweOsepj8Uvpw06La58qgeh/JoedzaSqgjn0kEr7prufrRS4S4H3MN1gx3jTop7ilxWG8CbGT1xf/0fZCtZaWVSwJB5ybfizAFeHaZjm189QtnQaDwggcBGJRq2+CVfydXxv0IKA/cThmzeY8xYw7jdSD4m+CTBmWT938iSRW+ZaBPbBpmXCilFh0A4+6tYZVrm1ET49FMbwLgomhTvRl2blufa4+IEjnhNVUucRtaEl5XjomgVNePjEeqsPTYaKGS79Ld9CRYyyKFBa/7vbI+1xCoU= X-MS-TrafficTypeDiagnostic: AM8PR01MB8088:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rQ7qbbA2JGEVnaOi0poxpQLLykJR8fIBdh3H5cu+h0QXZuFmAHAT/gFvKmPsOn/0Uy34g6HpZ9XzN5pNuTVFNhrMQgdEFJhKCRDueuluVSs7EBGESYBpq+BRYgd02pwF1tDA8S9XuL0f505rqoZv/MUX6j8TxH2Q6zgx8jJX2Mt6MS3PQ8fjjwtRk/e6wzrz98GA3zTgUxdoz+NT6YH5l7Lkn3DuujR2Ni+bkTMHvC3fjYHUQatI0paNgJy4MtetCkjtekWd8rT32/hqMO89x3BSyCI1H23GMM22jT7oDV/saE8ir6TbuTl87HTJB+d1jGA46ZzfYC2EfIQpXPPDUsXgY2wBCPW/TAdJlINuipnL+LRHp5Duo7Cl5KyIOkskZcc9wk0DZROGLQ2SqHfnpcy4tWqfPGGm+Ay7NAHLkm6gNITi+TeGduCv5wnATISES7/oI5JRBpclJIXR/ZZc7knh0vGZFqm1BU+BOYy9pae8Gjqap54Zp5PB2BBmBNBJqPigSkCGkZW/urhX0p5oFdWsA0atgTGWhfAaPvm8cEneIVxUbdjj0xIvq5vHXUZbDDAd5y0wxvc/MoX/IbYeJoVPeh5zmhRQ3nNKtdXO823ILinIONhx9mpigM4h0UKtQl0ZhFW0eB/fTYx5eI8uOw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3OnPwKdluqzw4Fn/Y+kuYaWQ7lX20iPIRpZ39k4BdmsHhOEdUE1DwRtgO/y/sHIwTErn37Apd2Gqmbw24FcoduET55aLE6mRnDBjU9bTdEmBNbU84v4QFEGje5cKL+z09S+evWdQUEVO5eSY3faCBTkLfiBDePLOk76HMnIKUmRsxwZhU/jf6pRGbJHwilXuIH4y+FNgNiMHFry/77KYnV1MGbqQBfnzaAGgYFxcCsv39ECCNNQfqDSSTZHSkOWuQ4olq7k1vnHaJ8WTzCdywBSHDhnhc/wgy6GHzQ7xSDiJGuZVa6lDnt5+JmNIbxpazrDZfX/0eJrTKyHXliDdgbRch2XKAlv7xK2bkkmgdsbLswVepX7UeDMX6qvCVPdt6mZeRGKsq/Uj0esQ3Ky8/2JtrRRmxzjmQFc8pcC0EOjIu11oSDfORd2ZFEk43OGna2PtcpyHcAClYXS3xPkjFvU2usuq78PCpcCqmTJw8AEdgauS+D1ygfcCm3ivojCX1kYYfsN4iHkgPta8Qi9NLm5V4HeYhVwbiXqZZ54gTmgM/8CHzezZlkZLb7ncZXNy5UgVGGrUTK6oMt8YLBTuPle6QuwFmlMFRqjGoxlf7kUTbDkfFT1LZn/NAFSdzoAEzItt3fvf1W2nRZ3tfB2I/mxf6cOfstIE2AyHRzS5AP1NVTwPob3BwbACC7v1TjcBkVLhsPvPmZNnhuYch9XA1IRVnXHvGJx8iPLwvaCIfumCgIgLQ/Ve1jfwzYsM8vCqoM5FTR1bTsKe7DGbxtRTkAcLEWvvTr8SaxEH7wXahamqmFlaWwA9oNcxaKdNL6P/7y4YwpcXmb6Sf/j6u5rW1rXYP2h6FLQ3CqujQk3s0nN/nqx7B7xQsxNCXO633CeKnwib9UafJKJe5qMwMcm3BB0u6R3I2LH5j4TVJJT7YlL0DiaDJqyLuZKmrhyaVrJU4LWFhBXHqTRhYZ6AOI6N+rYrJeJy5Dj4J43UU2PEg73FauuES/cuXC39L1fZS6zYHel1Fb7HaHCD0YXEQzii8g3/P5O6QkSsInl1c3d2Wh9JlOsxUTNPhUTBVJQo6o7elJUXpv+LEsQo7quDd7Ath81X/ucxrcaR74GYvDV9lkHGvkOSGLcJnCR4BM/qn9kaxSyfGCjzopusterD6kTthPJEWdNtyTVGMiNa4/I4arJdNuBbjNrNd3+tUa2DbVYUP7mXlrP1CoMjuFfNNBvQEIVW66DljrdJO/6ohCLTxNF2fxOkv/b1QeaLMhXNui0VvCAm5GPVvkSMjcllnrKm6rgmvi8QOawTPHkYtbEl9C6zhFUUnFgb0npsWA+pxn5otkvGWLDJom/tbrjbtjpjP8oWl0BlHXq96WUH+4SyCE12x5g2yHtPXNFqIaQu/yq2Lxs/3c5rUuTZTbO2CDsAEOdFALZi8AAZ/kN3dwcrrb0eD5hk7+D69r9K4+ESUnZbeDX8lUeLHsZAmhM07cVblg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a52b0e03-1f64-4448-416f-08da2e810dc0 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 10:21:44.7083 (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: AM8PR01MB8088 Subject: [FFmpeg-devel] [PATCH 3/3] fate/matroska: Add tests for muxing PGS into Matroska 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: +xhx1/noXuLK They test the new pgs_frame_merge BSF. Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 8 ++++++++ tests/ref/fate/matroska-pgs-remux | 7 +++++++ tests/ref/fate/matroska-pgs-remux-durations | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 tests/ref/fate/matroska-pgs-remux create mode 100644 tests/ref/fate/matroska-pgs-remux-durations diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index c9d88975ca..7baf85f29e 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -163,6 +163,14 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MPEGTS_DEMUXER AC3_DECODER) += fate-matroska-mpegts-remux fate-matroska-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts matroska "-map 0:2 -map 0:2 -c copy -disposition:a:1 -visual_impaired+hearing_impaired -default_mode infer" "-map 0 -c copy" "" "-show_entries stream_disposition:stream=index" +FATE_MATROSKA-$(call REMUX, MATROSKA, SUP_DEMUXER) += fate-matroska-pgs-remux +fate-matroska-pgs-remux: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs_sub.sup matroska "-copyts -c:s copy" "-copyts -c:s copy" + +# This test uses the setts bsf to derive the duration of every packet +# except the last from the next packet's pts. +FATE_MATROSKA-$(call REMUX, MATROSKA, SUP_DEMUXER PGS_FRAME_MERGE_BSF SETTS_BSF) += fate-matroska-pgs-remux-durations +fate-matroska-pgs-remux-durations: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs_sub.sup matroska "-copyts -c:s copy -bsf pgs_frame_merge,setts=duration=if(gt(DURATION\,0)\,DURATION\,if(eq(PTS\,NOPTS)\,0\,if(eq(NEXT_PTS\,NOPTS)\,0\,NEXT_PTS-PTS))):pts=PTS" "-copyts -c:s copy" + FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv diff --git a/tests/ref/fate/matroska-pgs-remux b/tests/ref/fate/matroska-pgs-remux new file mode 100644 index 0000000000..4fab0ffdd8 --- /dev/null +++ b/tests/ref/fate/matroska-pgs-remux @@ -0,0 +1,7 @@ +9aa538611b5f3bd0455b2afd3dafe08d *tests/data/fate/matroska-pgs-remux.matroska +49751 tests/data/fate/matroska-pgs-remux.matroska +#tb 0: 1/1000 +#media_type 0: subtitle +#codec_id 0: hdmv_pgs_subtitle +0, 67, 67, 0, 26127, 0x02389441 +0, 401, 401, 0, 23155, 0x1de74712 diff --git a/tests/ref/fate/matroska-pgs-remux-durations b/tests/ref/fate/matroska-pgs-remux-durations new file mode 100644 index 0000000000..ba649d0ddf --- /dev/null +++ b/tests/ref/fate/matroska-pgs-remux-durations @@ -0,0 +1,7 @@ +20fa9d515b08718c42d3e3a8a4a8bf5d *tests/data/fate/matroska-pgs-remux-durations.matroska +49763 tests/data/fate/matroska-pgs-remux-durations.matroska +#tb 0: 1/1000 +#media_type 0: subtitle +#codec_id 0: hdmv_pgs_subtitle +0, 67, 67, 334, 26127, 0x02389441 +0, 401, 401, 0, 23155, 0x1de74712