From patchwork Sun Apr 24 03:29:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35393 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1218433pzh; Sat, 23 Apr 2022 20:30:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRMIKUPHkwKG4VW9E+FZNnJ4OOj4ZLw2YfgTSt7Qhl3NnXucx+bWCEVXKYw7v84hsP+iUK X-Received: by 2002:a17:907:a0c9:b0:6f3:7c26:f017 with SMTP id hw9-20020a170907a0c900b006f37c26f017mr3439568ejc.711.1650771029505; Sat, 23 Apr 2022 20:30:29 -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 mj23-20020a170906af9700b006efc2a9c4basi10843463ejb.733.2022.04.23.20.30.28; Sat, 23 Apr 2022 20:30:29 -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=egjQnx6r; 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 70FAE68B26B; Sun, 24 Apr 2022 06:30:24 +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-vi1eur05olkn2018.outbound.protection.outlook.com [40.92.90.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAE4068B0EA for ; Sun, 24 Apr 2022 06:30:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EamlLHqY68hixa5b58dXrB4/VDDUD+OvwZGePpU/1UwQn2mLsSq5yM33+K+tbNFxPWPlNMn2VXCREFikaLVM0UOuaCuXrDYQcCTGITI2+RvFkJeq2Z2fHhiqZuBO0FqSHUWxsv/KKKLzNj2U30/BRDa+tW68sa0Ab7nCxkpojgyHhXzkxSdr1tSxEfFG/lg3QGsvAKxprYYtOmanLvgXkXChsaN+UbeGtX9rsNJWRaXZp/WqE7Tl6EI+lChQ9f2+IPAywgLD+2F1bh4N6HaXkKYIR0P3g4l9slibiIq/9EbV44BDu/BbqqYcY7sYKlnGBaZiRDwPGQ6rnTFDP9tkCg== 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=e+QZZnlIZ6kSAJSdD3npxhr7DiOvchl5q6GwJ6fwEJs=; b=X2SJ6n4L4kKJHpyJlwW2+PEck+OuWH7lY+7eiutnffW3/yQkTFuchybgkhuc0V5Vbp8HH1axvx3G4CDwwMkdwVpb1x6gQE5ZA+y9kbJz/KlQsi2E2ZqmetmHjoJiH4zKWMvShKsWtD81Ma3g6MH0ms0ouqTg9D2iR8dBgNIMd4zoyeULHFNrjxEsU2hbxMhf3SBUdlHu+sbFUi7bAOCfyrA2ZbOg8g3YnTENoaSI2qeoUfJE+TAfvtpiLZChr7hEtv5MXEw6FFBUF/CI83qO5bYIrn9TMbPZU9KYtYJp68rcyZrWG0ycKkgyOZt7mCvguuquCfuHHEL8v0YC1qOhcA== 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=e+QZZnlIZ6kSAJSdD3npxhr7DiOvchl5q6GwJ6fwEJs=; b=egjQnx6r39UQQSOeWgytBDITywtJCOLvYDLlnF9Fxf1JQrupczqi99PLFaOSOkLgcHxIgX5BGzirOe3W+q4kthvmBaddAc/mHuhOCHOFgqdrq7vpdxpZbJdFQlzUf/oEs5UigSUcIGO6VAOJXEqYlc+3P7h3t4z2i4Vyg8248VpJd0Kyjxo7I5OeiR+gYaUh56FbHy9BXMKnjPKS4+/T4JegVxB34gXGJEGkhaqgGEaRnBQJuv6gU+Bh8rpSCAR55ZnrGguhUvZkqbMLaaHhVRWqJFPsWewol8wmZkiOcBtceay28OAsJqQRkvoSPs+epS0mntougFT+CcXNijOlrg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3062.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sun, 24 Apr 2022 03:30:15 +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.5186.020; Sun, 24 Apr 2022 03:30:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:29:35 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [YgoahUF5eSgPGq4WdkLe1KSP4+QBm6S4] X-ClientProxiedBy: ZR0P278CA0035.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::22) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033006.797491-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b9aec18-47cd-4cf9-1ac3-08da25a2bee3 X-MS-Exchange-SLBlob-MailProps: GjjEsbJCp86fDEzVeffD4t5EU7xgsxXWUhM+0DaELA/ATZ9HiJ7pihzbFR+0uZfIj1FUWEjyHWdsmw8WiKJUgt6/e4GV0dlJygr626hYxkdhLiSJtXSEUgHydoS2zxjBDS7oI7Z2zY5VNa+yVMuPnJ/HdV4CXC5yXzYOsHOhY/hhj8HfcwTJwkST77/NQAnl9C0MmsJL5DED48rsIdSAaJwerh4fcTDizXYhwjNQ+nMl7oRsAzyAeimHHFbQPCxo/HiogqwDAwYOAEpfWRCgD+Ust5muLTbsZ0XYol0s2dBH97KqP86kMf02eyjzS232hnTtoGFqT/SoeRybjNfGXGDO0fU2OKRFddK7znnlSw3YxpZLyW0dGNKPj9bFIC+tw/s3PpdlkBVJQLBfASNyWeyZWz602smkG/iwKZxMXlNM7FZ98H1B0yNYKDBaLOGMaPWNLZhtxZ4LnLEoU8NN9QgJZxAC2v7c7sS/8vPiq7j6Qv2A/EslrOa9cQz+vji4LZKf8uBEQG7qwPaot4qOx0UxFcy2IHY0t3NwHBLMYRpgD8rZIU0mpfL5HDJBFEXTXUltU5trBlH8ptp96Mh0pID9Vc+ZvEhmrWGljnsv9MfkbTZ9seUb+ZfXdUHZFPixpKmUdOOtcb6HNSdP2rFWfM5fr/X+tmJxYUXOet4FavB86jHeUQm7UoMvU0WkecyE0Yr6lv5Ov3FRxbjqd9Yk84wd+00BPASoDnptE6GWeGcHkl29X6dHAhvv8cPGfEja/E87AqY0kFmkgri1Mhqu86XgYbyBaQf/CrOkCtS2dYebQd1MiN5IYdTK2gcjZ2Hg1ToViYG3DZ3Yvu+8Fnp9I54LE175U3ZsZMzga8oHXcIym5TcXIV7JQ== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L8ZnxdVG+lR2YSLpkFXCZfKPS33q6/d/qoJO68/hSQeIlq6lyjFX0Y4H7c5nXsAmLKYDfDa3YxH9dJLqK/wSZnk2pev5m84ur/Nx+8pRQOlRc2s5qZovG/SuS8iHCULLFmPHFxmlJCyxglGaBir3YLBYowfmIIQemcaSVl8ETMMcG3lakKzbDP/T8/fHom6yQECsxYLvB/MkikVmFR6U8Q6yhi9zdAApyMH3s0sUj5RTOae5gdHBiqFo3udWLLyRpQ8Y0H0n3zA5Wuz4lVx13R4l4e0c/P0TIruGmjuuCJmGeslZOS4Qx7jdykYfEAuvPw4/rq6ZWHqF9sEI8THEo7QvOQEP9DcBUZLFyPxZLu43qEjZdXgCXbYFz4SxfYjXBAyU75CEkXrY448o1r+NEDqivozNFZGhfyX2UcsFqHV5plnupB68zW4GgSoexCniItGRBOE/OKXdBGEw1WZmG8FHNMhmqaPyWSHgSZtlNhrxv1CtVbVrctj7CWHe9tVfllslX/4B6DsHWUwGoe3XfxQMJekvm+0TD8sJ04aTOJf8KKlupsJkPjRp0+948atUXwgCTvGhIH5BGgTSYXlIgw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yrxGQ4PZg76Qrig0GrduabIEcYTYNoxlMwEHcS6d7MRo/bsxUGaRri4HY+vtheu7Ov8HkKgh8eE7GMNsDAU4s0pFtUVdFrLGZQS89UnotzAWnWq8n7F6JRdDIDqn4cAVgE9Q6qmFoV4h2gg1SzUqIDXAkiITp9AOvYvU17tl4lZ4dBL24qZOQw2ZRf6bt5lzN/WWn2aNyd2opFI6HB0je4S3OaDz2TdZ/uhWdbEk5Ju7k00G95UBCM/XqKTT9GCgDjrWV8FmiI04glCMJQvx55RkHKU7JpRKDZBQZTPxszJFOZ/jhIrDX+tPRqlG7DE14ace2KDut6w0f52TkPbISIwPX1DBa2NmEj2UI0bb8qlcol0fvIVSAGLH3bTsjwp9HQDauikw+tPgNXreH4mGsrhaNazgfUJZ7diuEXpVr2LHAlt70IyPEOP3XODWA2xisyRn/jinhGh2BfJ0P1OfKBnPipbycB81q2LEJXlzgUc/SKSkoPNjY5rlWkWm4BAzzwj/fRwpykdojTh8M4TkX+o9fm7AkYae/AUhHKfiu6W25HWf5yjouJcSTS1KEmO2H2QvljXBvCYEHZ+4wzlc2WNnci/EM+MGzl7LLfnLdAbkbSkFtDCthJLc+CLUOaYU3PnQ83bVy/d21UY7GRgtXY3bv7KD4g1iiYqlN9Y5BxsEfwFyBYXnpquwaU96HDf1J5NAzXVvDIg5Ss/xK/gpllalKXNonkHWPDtQ0m1aaGbo1jXMJdLcUZNqZ/ihXPxzdypL6qyTWJxCcvAqzpXsVXeofVtewqZyt2asy9DqoK1AekikYy3aF+jSDOG08Gyop8KUFCfFg140ejnTitFQP7KHN0mStyeewvGPOwljtMCrb+1/CBcKBazy+fXuEoVGFd4DQ/AJaqrqJZHHgSA4di8q8dj1tW4+QZ9aSnAas0uzKTwX4KFCMSHf5RfuHM3zkCogcJ/VgTW4saAtVu8sDRWyTV73BGvx0ziANOUUbWuAGmnhXv5VhQ2fasZ1iy/Tniv2AkvQ6Fcv/CIUPcNKYYJbTY7AFDJasJodJVl7eaDfZdgVkXBYLo77tMaRO4W8M0ZMsT2nvM9u9Wr1yphlAi2rFp2nuFSe4DhV1FkKn1x7X3xCJcB2QgLmNrSwdB42GqecjmddAcGIod78Ct9LdU3R7oh/CQ3PH06cW+SjWGS46FnpdyQvjHZwMO1+fY7Ggb29lXSxSF6e7pAUNG1XUu2we9LW2YE7sOlz4WVLmlkjaU1bCIGeIAt8eu3VS4dgrdsj2TBOzM1q8qmQn8JNKoFpswrjG7e27kbj4d0o1mVsuu9sHKCrAh/7S2JDL8o921MOorPTl6TGzOZ70VW3sYqsOYTGjz1qqqKeLXdEeHYmTMbXcQ50xV0QUtA4qkYL9uRn0Spvd1ICXTp7timbsBsjC/dov45sruavCzZvg+HMSBAZsXpXBJkL113JCFgr X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b9aec18-47cd-4cf9-1ac3-08da25a2bee3 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:30:14.8048 (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: AM6PR0102MB3062 Subject: [FFmpeg-devel] [PATCH 01/32] fate/matroska: Use REMUX and TRANSCODE where appropriate 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: NOt0E9iEvf5t Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 70 ++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 47 deletions(-) diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 3073b0a061..c9d88975ca 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -74,26 +74,19 @@ fate-matroska-zero-length-block: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/ # It also tests writing PCM audio in both endiannesses and putting # Cues with the same timestamp in the same CuePoint as well as # omitting CRC-32 elements when writing Matroska. -FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL WAV_DEMUXER PCM_S24LE_DECODER \ - PCM_S24BE_ENCODER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA-$(call TRANSCODE, PCM_S24BE PCM_S24LE, MATROSKA, WAV_DEMUXER) \ += fate-matroska-move-cues-to-front fate-matroska-move-cues-to-front: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav matroska "-map 0 -map 0 -c:a:0 pcm_s24be -c:a:1 copy -cluster_time_limit 5 -cues_to_front yes -metadata_header_padding 7840 -write_crc32 0" "-map 0 -c copy -t 0.1" # This tests DOVI (reading from MP4 and Matroska and writing to Matroska) # as well as writing the Cues at the front (by shifting data) if # the initially reserved amount of space turns out to be insufficient. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \ - HEVC_DECODER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER HEVC_DECODER) \ += fate-matroska-dovi-write-config7 fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "" "-show_entries stream_side_data_list" -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ - MOV_DEMUXER MATROSKA_DEMUXER \ - HEVC_DECODER AAC_DECODER \ - MATROSKA_MUXER FRAMECRC_MUXER) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER \ + HEVC_DECODER AAC_DECODER) \ += fate-matroska-dovi-write-config8 fate-matroska-dovi-write-config8: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-c copy" "-map 0 -c copy -t 0.4" "" "-show_entries stream_side_data_list -select_streams v" @@ -105,10 +98,9 @@ fate-matroska-dovi-write-config8: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv8 # yet there is an audio packet with the overall lowest pts. output_ts_offset # makes the pts of the audio packet, but not the leading video packet negative # so that we run into the above issue.) -FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER MPEGVIDEO_PARSER \ - MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF \ - MP3FLOAT_DECODER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA-$(call REMUX, MATROSKA, MPEGTS_DEMUXER MPEGVIDEO_PARSER \ + MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF \ + MP3FLOAT_DECODER) \ += fate-matroska-avoid-negative-ts fate-matroska-avoid-negative-ts: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/t.mpg matroska "-c copy -ss 1.09 -output_ts_offset -60ms" "-c copy -t 0.4" @@ -116,22 +108,17 @@ fate-matroska-avoid-negative-ts: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/ # It furthermore tests writing the Cues at the front if the cues_to_front # option is set and more than enough space has been reserved in advance. # (Btw: The keyframe flags of the input video stream seem wrong.) -FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL AVI_DEMUXER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) += fate-matroska-ms-mode +FATE_MATROSKA-$(call REMUX, MATROSKA, AVI_DEMUXER) += fate-matroska-ms-mode fate-matroska-ms-mode: CMD = transcode avi $(TARGET_SAMPLES)/vp5/potter512-400-partial.avi matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 5000" "-map 0 -c copy -t 1" # This tests Matroska's QT-compatibility mode. -FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-matroska-qt-mode +FATE_MATROSKA-$(call REMUX, MATROSKA, MOV_DEMUXER) += fate-matroska-qt-mode fate-matroska-qt-mode: CMD = transcode mov $(TARGET_SAMPLES)/svq1/marymary-shackles.mov matroska "-c copy" "-c copy -t 3" # This test the following features of the Matroska muxer: Writing projection # stream side-data; not setting any track to default if the user requested it; # and modifying and writing colorspace properties. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER MATROSKA_MUXER \ - H264_DECODER H264_PARSER) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, H264_DECODER H264_PARSER) \ += fate-matroska-spherical-mono-remux fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/spherical.mkv matroska "-map 0 -map 0 -c copy -disposition:0 -default+forced -disposition:1 -default -default_mode passthrough -color_primaries:1 bt709 -color_trc:1 smpte170m -colorspace:1 bt2020c -color_range:1 pc" "-map 0 -c copy -t 0" "" "-show_entries stream_side_data_list:stream_disposition=default,forced:stream=color_range,color_space,color_primaries,color_transfer" @@ -141,12 +128,9 @@ fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/m # when reencoding (here to ffv1). # Both input audio tracks are completely zero, so the noise bsf is used # to make this test interesting. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ - PRORES_DECODER PCM_S24LE_DECODER \ - FFV1_ENCODER ARESAMPLE_FILTER \ - PCM_S16BE_ENCODER NOISE_BSF \ - MATROSKA_MUXER MATROSKA_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, FFV1 PRORES, MATROSKA, MXF_DEMUXER \ + PCM_S24LE_DECODER ARESAMPLE_FILTER \ + PCM_S16BE_ENCODER NOISE_BSF) \ += fate-matroska-mastering-display-metadata fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=amount=-1:drop=-4" "-map 0 -c copy" "" "-show_entries stream_side_data_list:stream=index,codec_name" @@ -156,14 +140,13 @@ fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/ # the h264_metadata filter is used to remove it as well as the H.264 AUD. # The video is decoded twice to show that this did not change the decoded # output. Furthermore, this also tests writing PCM with bitdepth 32. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER \ - H264_PARSER MPEGAUDIO_PARSER \ - EXTRACT_EXTRADATA_BSF MP2_DECODER \ - H264_METADATA_BSF ARESAMPLE_FILTER \ - RAWVIDEO_ENCODER PCM_S32LE_ENCODER \ - PCM_S32BE_ENCODER MATROSKA_MUXER \ - MATROSKA_DEMUXER H264_DECODER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, PCM_S32LE MP2, MATROSKA, \ + MPEGTS_DEMUXER H264_PARSER \ + H264_DECODER MPEGAUDIO_PARSER \ + EXTRACT_EXTRADATA_BSF \ + H264_METADATA_BSF \ + ARESAMPLE_FILTER \ + PCM_S32BE_ENCODER) \ += fate-matroska-h264-remux fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts matroska "-map 0:0 -map 0 -c:v copy -sar:0 3:4 -bsf:v:1 h264_metadata=aud=remove:delete_filler=1 -disposition:v +hearing_impaired -af aresample -c:a:0 pcm_s32le -c:a:1 pcm_s32be -disposition:a:0 original -metadata:s:a:0 title=swedish_silence -metadata:s:a:1 title=norwegian_silence -disposition:a:1 dub" "-map 0:v" "" "-show_entries stream=index,codec_name:stream_tags=title,language" @@ -171,17 +154,12 @@ fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_int # it also tests setting a track as suitable for hearing impaired. # It also tests the capability of the VP8 parser to set the keyframe flag # (the input file lacks ReferenceBlock elements making everything a keyframe). -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MATROSKA_DEMUXER \ - VP8_PARSER MATROSKA_MUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP8_PARSER) \ += fate-matroska-vp8-alpha-remux fate-matroska-vp8-alpha-remux: CMD = transcode matroska $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm matroska "-c copy -disposition +hearing_impaired -cluster_size_limit 100000" "-c copy -t 0.2" "" "-show_entries stream_disposition:stream_side_data_list" # The audio stream to be remuxed here has AV_DISPOSITION_VISUAL_IMPAIRED. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER \ - AC3_DECODER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ +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" @@ -192,9 +170,7 @@ fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entrie # It also tests that dispositions not supported by WebM are not written # (and therefore lost). It moreover tests that the muxer writes CuePoints # with multiple CueTrackPositions if the timestamps coincide. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL WEBVTT_DEMUXER \ - WEBM_MUXER MATROSKA_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, WEBVTT_DEMUXER) \ += fate-webm-webvtt-remux fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "" "-show_entries stream_disposition:stream=index,codec_name:packet=stream_index,pts:packet_side_data_list -show_data_hash CRC32"