From patchwork Tue May 10 10:06:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35715 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3332029pzb; Tue, 10 May 2022 03:06:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzASQlwcfEgnLe1nxVxbPBtG93KQ8heMe8OiT6idYUIZLbd8Hb9PJPM/v4jygtKgKhGX0aA X-Received: by 2002:a05:6402:3484:b0:428:1a5e:3d48 with SMTP id v4-20020a056402348400b004281a5e3d48mr22567502edc.401.1652177201831; Tue, 10 May 2022 03:06:41 -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 dp17-20020a170906c15100b006f393afb98esi18750566ejc.509.2022.05.10.03.06.37; Tue, 10 May 2022 03:06:41 -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=ELyqYI7m; 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 B299168B391; Tue, 10 May 2022 13:06:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073053.outbound.protection.outlook.com [40.92.73.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46D4968B295 for ; Tue, 10 May 2022 13:06:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gIi3hYtLHDcsgWuy4PJKlQEKa4+Ne/TeHrFrmQ91nig6uT5oEu557PY8ZX5GQn8ZbaoIIt9xXzvfu+kAHe2VQGinsfR6xCUIfsqxduZ66t+1DPbRO5iy2T9tjggOZwGthcmSwbkdFaKFIfUlyi5EhzQ8vspKNtPAQeErSwUso5JcLazLNvqYGoeVuBkxdVF8SaMkYDp/axcjt3kumnDKYhIidM8XHdf+atZ8dTECBtus9jGH5pGxSiWN/+nTq2Ogqx5NVYKT2LFCqPUSpVexrvh4HgbIz7j/Cv07EUWQgcclD1E+QO3GcLMoPQENUIEgk+mLL1b9zf22Qew8Kufoog== 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=O6totO18f3qj2wXC8OC/ya/wrAXJT5IAyp6at28mTwA=; b=gm1zdLkvMJlnh7fNw5CsTdJ6z3eQqPGraLcxTlY0fV6kwp4IuMduLgDL21jgPaby0XKy+YPdbN2terKNKOZfa2+S/kQoS+kb5bOw+5TWZLU3uTj1K0lHGT1RYa/99QfBSmtbOpJoSEcCKUL9+VzTs6HTkfPZ94FOAgnD/oSvkobgDbEIZRzNb+ZrOfaWCDhIvwp5Ctly7wN6pHwKjxm9EXMZWKfPHY/dR1ZCHt2dlAfkKpoW71IkAkjonuR2SVJqClC8Wt22RMQ/JdVqE9VVNK9y5d7BmFbhk2pVya/jjGlCJZ7RWmcbHFhTMlqmRA1ir9YdnhIGLYrB5oOfDUqcZg== 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=O6totO18f3qj2wXC8OC/ya/wrAXJT5IAyp6at28mTwA=; b=ELyqYI7m7DtjQD3LmMC1pqRW96y3XmDnREwEF7RIvPmzeO1FUIvKVwKktXvRX00mMcd4Y3FECRoxANJbQarabvVoQpu6fXLyRR3/ebuC7CzX7kPXc1MxV4yyXPoqi4+qIqQ5PwWgW/zziPDUl56bndbR0qqeetTxeU+CpQxVFKRsywJGv687a5QO85q5YWGmeOCKXXrl9ZhZfYJvO+2So0/BNh/VH0ZumJ5RU5NVpxVeROOv6YJSj+QxJrWeemupuVeQI/MwRUeBJLITZLUjGpdIpvHEO9JfoJ9xN78cSZNLgKgnXPBoKsx+1Oo754evNs+1bsWADimQWfgVRsSZyA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB6PR01MB3703.eurprd01.prod.exchangelabs.com (2603:10a6:6:4e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 10 May 2022 10:06:25 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%9]) with mapi id 15.20.5227.023; Tue, 10 May 2022 10:06:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 May 2022 12:06:16 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [V7sC4qKBgAniFqHAJWr7VyhPjY1+tHrT] X-ClientProxiedBy: ZR0P278CA0142.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220510100616.585398-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6425ad96-f229-4272-1ee9-08da326cbd9b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS5HkHrfABX6xWp8dcQx8IrW4GQqbODRnpL/M6pVuo91Iu8c0NwNiWDsCG95R7iwhnvZFdxMlhRNewqRDpQzpG5RhrOjyzTHIPNppZbRF+kbR+1o+5k+YxBJzaimbKdYzebc1XgCd0xKGNSWgIkNEQ9Dkb3y3J8sX7gKGKExii9SXdtqUaFKb85gy/KAbRbWlKpwLxyPHJ1lXZiJZCNkExsrmk5KHEoRzssmi9gLU4APfY+ZX3ptANPI86Xh0swqIVHtSdnoZoFqHvrEvc2HyJE3XxD9k4coTlBV0smCdHPKMFXZfbCe3N5K5drZWv828LiUoY43K+QH+2r26fRxSakjIK48E6WYvH9RnaPxUzXnWnl8hubMqkhgCQg9vL3sPrB7rVxunD7VE/yKC6/q1MOc7xYp7qo7Z2e4Jo3sUyaLrGBnyaZDMh9unE+ZV2Wq0cnysLPTLSD5X2695epuTRqfySVl5Mh2ljS1loWBHMPYagb2svehtO/PipL7ZfO5qqT0tT+v9zdHrz1WMvGpj3P/ewRx0b8XLiy2QgHfywEKtW1xj3hKZlWmJl+JQ7/qKT+Rp7J4KkgFuGuz/qIDvGL3nFPZVJva5oiBf97gNiAlvOSEW9L2L1vUciOWlYxLny/CRkr+lsthNvCBw0pd3CNnbILgJHe47XXBhLKraDPmgmDMlIiMSue6N5qoqTlLGkSJGGqrgENoiZSMdEM80OLdnxHsykGeyRqLaopqc97A4pahoqvSMGyQCOwdm30ghU= X-MS-TrafficTypeDiagnostic: DB6PR01MB3703:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tice4Nujt/pXzzJ4lPZi6NFy8KgwmYdPN9Nf3mDCwE8u84or1djtCJ0hUPiBChFsHwwRWMRRnrNmw2PgPZbvoy2bQ/NZAXa3zRTRatHxyD6EREnzxxA3GzWcBCMzIVMYcb1mrWfioLZFqDbbc6PgGU0GIDFxMwTclPLmxPaPPzZnI/hr1HRyFFs+rGMPoZFcO05hXnAZ4yg7wlVBr9LilV6AiDSjv9eYHiGSrAkDB+16axT5VaOa/4N9cGY05AJ7i4lOvuhc83SO7pD7ZfSevO9WJCua3cjvDspDMjtFVAdaU5Si85E6dp7GC3sEtDdiQUIpkAQAlF63wAn6bYEChPwDIriAS7mLr1rBEWE/IuVCicA1Icn0khyDaM65A690I5+Vb6FLr5s2d0QpjUCtbEUThP00gf6WHuwhZtclnjJ+gV4ohgpe2F+PT9ujukYNaOcLjOhyVFm+ywgjWLP9jQ0iIvLejcKJWSbZI7Mp3GRBohlAXnGGZzr2Dpg/35UuTaWlrP9f/6tPasm4lB82Fn7L7OiMY6SaCNdFfiFu0v8UbM3sFeskZ14wZKLoaBu/htlhbrMCnobRoYPCdZl4J04/jtqz+JGms55xxy9CuO3ovJ2dG423Fa2CFRsqkzc9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9NN+bUD6qHYCZnR4noJNiNGz1Irg/ttXXp29XLutlwIFjJhRbBmWoj5fCmOTcI9uZmGB8CQZBgTXoeVAiDDKq+gv9DEVHPvFqGerL1+4arZN14jLnpSniNcakDGm8YnKBwIVzx6Aqn2D9A5SlCKaGkHRUiiEWkF+8sEJRnpW9biHMShNU8mMUPRQMQSeZGGXOTSoq8itDe6s+IB4hYAiZJneTXT/ppeVOUhnhy+i1LYQTEuO/mrg6655Nm/4wDOdSWPLWgHMRLWxJ6qdYHLMPVaaULVPK90mctJ2X/jXcMMrVIcXBE6UG41ufWvZasvfa/Nv5S0mabgVzfSelyZm6UGzwi8aMtTzO3AMdCp7zV2TmY+DE/Fk5RwCqfMN3hO2E4lhHvGOf7WfO5KmpO44KF+LgcoXZapQGqZvArtJBQfnvmfhg0yaVS1EDnvJzZ1kMLHK1Rq1k7rfEXE7b5NSL1i2PlrRth8NCWsjr2hh4z7RhD0vSr72AwA7tCP2AM3pfJ3bLIwpteEf6JSPjSV4rbpV9JjlUwYx9lS5vYHq/59+6tNoUdLsJ4AkoDw3a1LRot1ZxFlmn+CT2bFf9tzlHqiBgJ4aOyqWdUhj78QR5zfloxI/SvNzaSf6MC33V5DDUIuBprfiMkngLTfwSO7yGXaVmCGSMdDSg573ZUMlPZboFv3v6pAEfYKOytRtnBnxE3JE1clbuNLi+tafYraOP/L2wqraF173d35ZWKIkjyGZuHSCYv7Naor0mMK9sjRXeD4cfDNqt6PqHGB23Ynku3nRKWog+bDLcqy4ryETNflMXVOoQHN2gxgnws4xg+wGoCiy2AkjVuFkfgUR1V22/SGLqqdW7WOT0DGZt6Nvcnrmb1PMfT6bV4U8f1rHF8/nQtEZOXP09qGwhXHpQrVquvHH0Q/oyhih4CcleDQa1OXfHPOEVeAj6t1DMtygpvPsQiQELRhn4TWc0+eB+7OFX21YgTPHPtyrIprmF24wRnwxYZIhIrcd+26cH0bItyQgt/GcSR+nhD1eMBa2E/jA6i6PTcqoUGV+IasyX3ltYrqfW44uUtYld9xGpIQKJ4Q9RtUl4aZe03q3FHSyZRfQ9Mxdai5wUPW1u+Ncu6Eu/IfBNZ1f15Ro4fWEn/KHTmn/bLATuvLUF113MlKxPiVLQ+C6EQSBqJBP7vggP/5z+777cMzHK54bp3BD9ulYjCy4ilmMfzh8xmW71HImVi0tPVnskQBEVe857UJRsBfrRjdRrJmrlTPYt9AYSjWbQswbsUEJJODipzBraFm0F6Y7zE+iM9w5WfHLS3+m6JVS1l7Y5INZ+IOT2QguUV41319s7fnQVmsH1A7uZINJ4UoRnroyZls1X9+s4ina2XUamG6wnKp80HuAHIKleXiGkCqI23+CjVGplrtXbDmufoFOAm2J6JBcnP3I2A1TL8goLePv4SM5G2p8QoqF7KDlsMCE8fnBYtiJw8Gk6UPkg33ziw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6425ad96-f229-4272-1ee9-08da326cbd9b X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 10:06:25.2918 (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: DB6PR01MB3703 Subject: [FFmpeg-devel] [PATCH] fate/matroska: Add test for remuxing DVB subtitles to 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: 2jmNWtyuB6iA Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 10 ++++++ tests/ref/fate/matroska-dvbsub-remux | 52 ++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 tests/ref/fate/matroska-dvbsub-remux diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index ebd95ced04..b49ec761cf 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -171,6 +171,16 @@ fate-matroska-pgs-remux: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs_sub.sup m 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" +# This test muxes DVB subtitles twice into Matroska: Once normally +# and once with durations derived via the setts filter. Said filter +# sets the duration for every packet except the last it receives. +# The "-t 20" also tests that the BSF is properly flushed even +# when processing ended due to something else than the input's EOF. +# Notice that the last packet of stream 0 before 20s is present, +# but has no duration (like stream 1). +FATE_MATROSKA-$(call REMUX, MATROSKA, MPEGTS_DEMUXER DVBSUB_PARSER SETTS_BSF) += fate-matroska-dvbsub-remux +fate-matroska-dvbsub-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/sub/dvbsubtest_filter.ts matroska "-map 0:s -map 0:s -t 20 -c copy -bsf:0 setts=duration=if(gt(DURATION\,0)\,DURATION\,if(eq(PTS\,NOPTS)\,0\,if(eq(NEXT_PTS\,NOPTS)\,0\,NEXT_PTS-PTS))):pts=PTS" "-map 0 -c 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-dvbsub-remux b/tests/ref/fate/matroska-dvbsub-remux new file mode 100644 index 0000000000..7c543e5a7d --- /dev/null +++ b/tests/ref/fate/matroska-dvbsub-remux @@ -0,0 +1,52 @@ +e675d3a76a4720f3e65bf56ec6041fe1 *tests/data/fate/matroska-dvbsub-remux.matroska +39025 tests/data/fate/matroska-dvbsub-remux.matroska +#extradata 0: 5, 0x00bb0064 +#extradata 1: 5, 0x00bb0064 +#tb 0: 1/1000 +#media_type 0: subtitle +#codec_id 0: dvb_subtitle +#tb 1: 1/1000 +#media_type 1: subtitle +#codec_id 1: dvb_subtitle +0, 0, 0, 280, 14, 0x05f400e1 +1, 0, 0, 0, 14, 0x05f400e1 +0, 280, 280, 5000, 14, 0x066400f1 +1, 280, 280, 0, 14, 0x066400f1 +0, 5280, 5280, 5020, 14, 0x06d40101 +1, 5280, 5280, 0, 14, 0x06d40101 +0, 10300, 10300, 3600, 14, 0x07440111 +1, 10300, 10300, 0, 14, 0x07440111 +0, 13900, 13900, 220, 14, 0x07b40121 +1, 13900, 13900, 0, 14, 0x07b40121 +0, 14120, 14120, 1440, 14, 0x08240131 +1, 14120, 14120, 0, 14, 0x08240131 +0, 15560, 15560, 40, 14, 0x08940141 +1, 15560, 15560, 0, 14, 0x08940141 +0, 15600, 15600, 160, 944, 0x454c0939 +1, 15600, 15600, 0, 944, 0x454c0939 +0, 15760, 15760, 240, 630, 0x49dbb35f +1, 15760, 15760, 0, 630, 0x49dbb35f +0, 16000, 16000, 340, 344, 0xb1eb63ed +1, 16000, 16000, 0, 344, 0xb1eb63ed +0, 16340, 16340, 600, 966, 0xb8a61edf +1, 16340, 16340, 0, 966, 0xb8a61edf +0, 16940, 16940, 460, 470, 0x80597fba +1, 16940, 16940, 0, 470, 0x80597fba +0, 17400, 17400, 360, 1212, 0x554768d6 +1, 17400, 17400, 0, 1212, 0x554768d6 +0, 17760, 17760, 220, 4804, 0xab67ddbe +1, 17760, 17760, 0, 4804, 0xab67ddbe +0, 17980, 17980, 960, 1016, 0x15e42d56 +1, 17980, 17980, 0, 1016, 0x15e42d56 +0, 18940, 18940, 220, 456, 0x57917e6f +1, 18940, 18940, 0, 456, 0x57917e6f +0, 19160, 19160, 260, 830, 0xcff3efde +1, 19160, 19160, 0, 830, 0xcff3efde +0, 19420, 19420, 100, 860, 0xd89903b6 +1, 19420, 19420, 0, 860, 0xd89903b6 +0, 19520, 19520, 220, 4426, 0x01eb43f1 +1, 19520, 19520, 0, 4426, 0x01eb43f1 +0, 19740, 19740, 220, 1132, 0xedda51a8 +1, 19740, 19740, 0, 1132, 0xedda51a8 +0, 19960, 19960, 0, 466, 0x9c957e09 +1, 19960, 19960, 0, 466, 0x9c957e09