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" From patchwork Sun Apr 24 03:33:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219404pzh; Sat, 23 Apr 2022 20:34:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHdaCkQzHVNG0w1OJn7QrfCmn2wtFg1TGcoQaoWtPSqmg/kpEbit7vRbSVabckT9yRAJSy X-Received: by 2002:a17:906:c10d:b0:6ef:9503:3372 with SMTP id do13-20020a170906c10d00b006ef95033372mr10680869ejc.408.1650771277710; Sat, 23 Apr 2022 20:34:37 -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 m28-20020a50999c000000b004240849e896si1027506edb.283.2022.04.23.20.34.37; Sat, 23 Apr 2022 20:34:37 -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=RIwauoAR; 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 AEC9568B2BE; Sun, 24 Apr 2022 06:34:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075041.outbound.protection.outlook.com [40.92.75.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54A6C68A34B for ; Sun, 24 Apr 2022 06:34:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NdZaKt5scAHALw4YC4Go39GRMSVw5ICSz5Z+91c8ztD5/S7Aza38+dSaCQj81Gd7eQHo3PuEGcqP4j5swr957uPQ/h2HpnJMA/7LH4dHKBDQJKL22wCyesHxt9Bqyi3ddscwkCzSB0Ua6FIFzXzXvtVVfrhfLHOqDcok9nL6pgMFi7TFks5eZWIlt7JNxZhVHbhPke9Gi0OSb5zOYidinqA3NT1WPXIHdRkeyQXXozXkEBAW3aLVEuAAZcjhOf5OgVSwGdCLGAFhrlhbR1PzzE2E+0i+u4QepJzRWhPhxpHC/02Q2baBGkiRdX8glIZcNyojW7PHtm/as05NxNUG+Q== 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=am7z466FPcXHgEyW5ovcbWEZYD4MaASDd1yb4/Nc/L0=; b=WP9B+5GbjGl/YpA53R/xrrrD4JveX3OceDl8U3H+bS0ZfzL0I1mW6t0Y0/K2qk48AJ8iDO4DQG1y5th2PhpI3POufr5pwrTivX8fmZp6LjzATNhZSJ1gvzuQXUk6FKeWXemmJRIx84Uqb0Z/w0pmapyDRDDzcFjFlGGgiwUiqewdTc3k2n0lPfZMGg9joaKQrkh4vA5tdNRdNgYkL+tcXfqAGfWRRol/bsbSK7YX/oG+TPgQEiShMkkgl4r34uGa2xwDZ2btwkhP3Tk9A0AdEL0UHKleghgM922I22F53a4MR4J3PyBiUSS8ETFnAtICrkxRwhPmCD7r+7q3l/JCtw== 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=am7z466FPcXHgEyW5ovcbWEZYD4MaASDd1yb4/Nc/L0=; b=RIwauoARlJfS8R8XWFT86zXBrcTqQLxbtQ3GUrR9AWH9/uguzB7j8WMlMp0kcMwYzfWFZEIPEblvuATiv3oVp1tqkg8UJgS2Pr6cJeTx9tNUHf37+WsAL22gHIAVb6Jyey2Xy4F4PbT6WlbeZKTMSgOwloZ+McZzjqn0DJxl85ZnvfFXqzYbMrvPvvJ2/fxYdsZQ0WAOejEdqjphqFamvI0irh55JO+CawWhjjhZpnFSdog7XXOcrzvYu/lCff6qlEDqaH9kj/E0BZKAz0n8VBOpAQrHPgUq/kuEKFbYcR7WSpgjDpqTj/j11GvESvb9NxIqUpkexmrvPfsf3MDuMw== 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:34:26 +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:34:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:47 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [TzI/l3f9UXAs+QXI07/PXre0GyK+cpTF] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de023854-2170-4b3a-9153-08da25a354c7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDlrBbF2eBXCGf1wRiPw2WITzqtHtrbHlZU38eKZERJgBlwHgcL0/5zSMlSU8oymsUs6UiLNVE4dCaljPMf20KZ/jLE6jL5FWOX6tXpzVUCQl4N7ZvvrEsKXMvdfyqSwvvhFIy+J8GbA4BK8Dk5wHaLgajcDyVtHYWLs+NjBqA/OufaB8FQWnGyjcQG0NaWibA+AFeFwMy78veTVhT8nxDS6IFM9GrEAHSmosHPYdcdvJtACF1mbATL4t81H9ePc6I23x5J8yGpvbSZ1RZ+mwGpaXbf6D54GdWcQNmAr5kqkCgD5wPOvxh/MOQptxxmSo81b4eTsjUamhMU1npnoFla61DmyC4gtt+NpB1BXzqlHV+LAElyGYbltguO9G+x+HfTug2lVQ/t17NWaOPmCqbDIZ1Fn4MXARrotKOFuBgjdX/r3yBxoRRJa9Z94vLtjiMyn/90t3jekZ3YHKKAounQnyGmCIBwKORixnpF0yH0rFa2Z2fqIvYN8Nck/FxuqD3jgWfo1zRCdB34c1+S+3cPQkz26uldLreHSzj/NuKJ4MsFwSncZoduCckt0ALkU4OhvUuq/Ocpgndos9FpXbLjr6YYPkea30Haro088vnNPQvv/3Ogf0WTWyJRaChpoqp0uPGxEGCmZ3GTsVyNTIXhuICWhqYp8C8Tz742R+c8SL7vRKh31khLztpUWPWK/ZdtRG1sMeqkXshXyOUu3hcbNo6jrZ31AWxY0rDRd2kWW0= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8dq4hc0oRZdIspVu/scPv15myi42h/+JE0//j+QZcTwLLfD5aYw8gYDYgtthX+Mnam5SeB5iKCQ68AT+9bfo0gqs8FyNPsEi2Z0frX+dcPcfkr6pfDsvnl8O/ZPApFIMy3SbGUQ9BbvC0AXZKJ/bTqTNrY8NxWCb0gt2k1jWOOvCDjTXpnetJpEdqaV8nqsPItOln0Bjxf3Vi21gOfK8TzRJRNd2VgrewzMuG2k299wBhMezcqnbMYM0x40cs35wLhOwaJtx6hIa2acvbE0mOs4R3KxuY144UrXFfgnqxu/HeQ12QS6nBgIlN27koI/mDAcQJ4dW923Cgt8kmUqPnFnfxpw2zzQffcVqwZY/YkR3wXLXSEceGxMmvmN+qZJTZpKxvj0DOJf9FadqB7oTfyTHfst4NyBaWXDQtTiefcWOigCsefje1cnXBzBg7su4kPNS7DrIvsgnsqP7zR2LuBf+A2fUwd7IuELyy8oqhWCMNSVCUXf8kEXHWAmZIQ5wsUZlsswPWLt6Mm5lvcmsDw4/VM7rkNGntM6AGb1HZa2vx+gW1g4dQES4ksm+rBNbwzAiGk0NPb8ualpNN19vPA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6eEoUv9l1eHT5GM/jflum/qm/bl+tLWC9r3zE2ddG9t3uZtN1QaX++yDZGnUv6X92m1F+gQS68nTr0ZbWSYSd5foUZ8gKHdH2GmNq+0QFPGfz34xDjsozMnSwot+EJRncWvrEby7/8pFEys4sT9Hv0odiBKCOujWiLy9JYlWz70Tztr9tf1ile9sw2/lb8wpUJnXOT+MSaCn32SDYlsjHhKASdwuPruVINCIE7WF5XZFniIG5T1yNQLHrJgUqM+zibjJ/GTVvcNvaRHiY2f+uBfrXBNg8Wazu1TKcgMRRm3H+21paGcWh+UL1Z2HTz8aIQdiPaE3+KFPRMip90mbwaWR5Asglvmngv4534/8zngHNoajPqq6EMZ1vivcjb1FPHYLxjl9OhdEP3SY/gWSM0C+haFDTh3mToWizc5y2hPDEqZ6nNrJEW+MtkOUIlvhWLg/GFVLv0ekcAoCHhFaoF3MgB0Myr8GefWlKfCpAkCELG2a5VB0qANRHwFLlk9kveeTn5zXqEw8izKGSu5zNpqqBgs0rcB9Q4h9Px7teqrFZ7JCVREf46UzWvzazut9/0SZgwmOCQ8oP3lYXbHhvjKK9RsrrHNP/dmRnFSOKOXRipLi6iCQwE3Fm/tIT2CGbL2QPZ66zDlr5oq8+ET6xJCKe35Yjw6w7CmQOWv4Sf2suwXmW4GUqsWOmbLELRQMz71A/EMFxtzaE3BEl+wuQEo1gNA9kZRWdfDZNMPQ0vZKV3kRYYQwhuv6GHK3KrtW1d2uH9qSvMAJUrnurF8SHITnJGzg2PJcEc5tkQuXY9eCEMnmz50rvvN6MB+cfHt74JYvRjsPLHLzBAMSfvRD6wBKeERy2Xmzel4g3uCU/VBPgYyctlyxTm2vtOE6hrbR5pCil7oEY7TYIKcRg/P1rgBjQ5u23cv3TOz8DTRhT45TqsgVUmY8HaxlfjArgLP0gw+YeZno+mgFf8EZFLSbNPYOahq9D0/JUF98II6wOtUDC0XWt3xJtRuE6ry27IFJXrgUOnAuVQMZGWI09hSY139BSHf+tcj7VVq30twpVj4Cn3Za9bjqTikXxYbNkDU/H+QTbHAesP2fmwmokvH6V1sMW5t8VTESX3gaKyD6SKILP4ETyuGoNNEsZY0QCREnPW/H7HeWm412gLJwW3FTUOD4kSOg4XUZ8VLX3xYanYFstj/B+AehP+Cly4AkCsCYu7aVP3vnlH9+AwmmgUWFNBsmK7ARLLhIy+xfBu0BX7zBg7L5LAKdWzGw7P3up6BqdSfLiHAcSrmaOd8v6NRe71sx8ac6CjPtnnHYpwfuAPpwAx2VAD/XGZoYVKuczvafWuEVeZ5HjlExfUHmPkJxDP+jZbmV41UiIDu9F+nbCO/udYJ9dUR8uOp4S038HkKG67ypyxQzuuZD4oX4jDVNyl8qlG/CY8M4da3qPx5dHjutUbnl117lJVZBDamYaGi38MA6gy1nN5TljMbRF5kKcg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de023854-2170-4b3a-9153-08da25a354c7 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:34:26.0638 (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 02/32] fate/id3v2: Use REMUX 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: 9eSwiuyvOdjv Signed-off-by: Andreas Rheinhardt --- tests/fate/id3v2.mak | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak index fea7545270..fc574e4487 100644 --- a/tests/fate/id3v2.mak +++ b/tests/fate/id3v2.mak @@ -1,14 +1,10 @@ FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 -FATE_ID3V2_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MP3_MUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-id3v2-priv-remux +FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, MP3) += fate-id3v2-priv-remux fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "" "-show_entries format_tags" -FATE_ID3V2_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL WAV_DEMUXER AIFF_MUXER \ - AIFF_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-id3v2-chapters +FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "" "-show_entries format_tags:chapters" FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes) From patchwork Sun Apr 24 03:33:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219438pzh; Sat, 23 Apr 2022 20:34:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXJqaWR/xc5yWULCf+wL0kc5Nd8Q8k5Tl+WeyDXiKLMoCjKAhaPWcWznScX4aVeURK5ilo X-Received: by 2002:a05:6402:34cd:b0:424:793:9f65 with SMTP id w13-20020a05640234cd00b0042407939f65mr12555288edc.88.1650771286503; Sat, 23 Apr 2022 20:34:46 -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 j15-20020a05640211cf00b0041d54d7dc95si11904599edw.451.2022.04.23.20.34.46; Sat, 23 Apr 2022 20:34:46 -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=S6rHQi8M; 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 E2AFA68B2C9; Sun, 24 Apr 2022 06:34:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075104.outbound.protection.outlook.com [40.92.75.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC736680588 for ; Sun, 24 Apr 2022 06:34:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TW3xIE8KEc59nouo8yv1cgPlRZxylEHI/aBi0orPuonR2l4dtDt1qKxgQXXjSiWiRbJXENxYfn6QROK504wI3HZsti+0exPzx76r9v17prEqv/RyjQa52TsYTBMhE5yV7cqY01ils3uzVGn6Pwg3v1gn4svbWTsN/vWCy/UKy1QZHeK8VwmuIx5id3OHLIr7Qj991UbB/SadNSIiru4QJt7p+wOb+pI0L9tKFaV1UaE4cRBshPZstDD+6LDji9/DwUhQaNla86dTCPxAvMiheUL5ZsiiAkmIJX8g1xcQ2kkplCaAF9k1K3lTcQJzsIVnWsL/+xYnjHT1vYz4Ac7Tyw== 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=GaPBcynqCOjv/CeHHtQjoROMlghttbh/ecSVmVD+NFk=; b=CK6yTXjvSpgHOXLwg9njdZPspjCLnPGLLdFyHgjsq5MtWXqFhklOs6OF7RUwVUF/ANFbcHW5p0JhtP63u/eQUMVK8pOBaF3rHqNkTOcwDQAnOF2px+GfE1EL28QP/ASVwdwmRKH9aHwYp0ORwmS86927dUNb9cHKiB2VGd3lj9u+sUNxMeDwKVzrgsNSP4mkqwl20czb7JURgUFKlqVxePqfNxFdOOb27H+puNp3wxDgrWCGsjPWHgFz8wEKJJjJih6XjaPYtGWOAHasgH04Q7/LYaSl4+0DMQMj07DHD2bai1O/C/ad5zRPEsfJW/mb00axpYKPtc8crDNzRKVB1w== 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=GaPBcynqCOjv/CeHHtQjoROMlghttbh/ecSVmVD+NFk=; b=S6rHQi8MFmCFDeLXlpZK3itpgojvAFChgKXCGyLH/op9BjZD40MVc/XqIQWqp2jb6dA/N+iKV+OvibFwTaf6tWVQmPiwsJY7S83asc+wUkSOgmJ5N0Ftb20dxp1l8ekQymlyHvJOpikFCXktm2HPDK/VQmO0NRxdkNAe3y/55N6UAaGdw8w4ArqqtIEi5StF+7Sz4tE32sKOAcbzibqZZwQfO//Y53UhbAZrObm2eJcf+HBq2roiHRGkzkJgZxuG1HtRzJno2/16I4igzU3TUWfVFyKfDjM0fClhaqhqQXHS3/ErtlHYsysd7AHnMqsn4DFXwe1CUXnGH6qg70Q1Hw== 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:34:34 +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:34:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:48 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [iHz+RvJYALyqk/s6pJxLF1nTGQX0MJXx] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b253182d-bb78-4b89-bbbf-08da25a359df X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDW3zUT8r+c/1YcOgcbAiBseUA8lXGCnwR3cLaTH6Q3KQcQEjOMJAbOo+PuDDnhxw/4Nvo+iTdTU5FTyboUJCxmSNlyPmiQ1zDmSUOfR1luXXxRQOGUjDbDCcKBxzp51ywirDVdgDTgRIFoqHIEKA7akYF7QtV81+cFZ6Fs9anYb/0Lpbo4Xq985pU2DLH4lZ810bSbU0ue8lSfo5qUDeDwXY+BICC4iTnRn1cwNHnueu3SUjv58FwnC+FnWBFMyvD/UoUHh1eI+Wg1JXo7vg0dZ5XBtbb5HNjiQUu4RoPsMBFmCH6VtEoS4oTHLHXayFW+rI8jbUJJOmDX0ZCdKj+oMNN/oX8QUfaNx3x4k7HM+IKkF3+oKHSMUlkgLgUZoweguUeNweNhYf3SD/BEE20aLOIAF4TAD9g/dsxLAhGYZccxuDOcHekGDt0Ojg8mOntjSF+r86fzSmIcT/IxFShPVt75otMhnRwIh+Rh4L0RXHjgVHrZYrlA4aiOIWZTeJ2GnZB1q4OGLoghyKdmh3FWib9NrMaRNO0bfG05wmjb1VTrfsVdS1WnVWurfwHSNJgilMvG6xklcGF+rAK1Z4BynZWk8ZHBnytjaZYM1eXtZaFLHXC36KkwSw/XhDefkSiGsbKcak3sxgFYkUmeOvM2BTfWqg0prPQjeJ8QTvpX5q0GHNuBaCHEt5og/d7m9LbVnf8uGYDKJ+9QKxSRPPgbK3APDQaH0sjn9DMhpnmWBk= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yVKphACbAM2E7qOBYVJFH8zJ7le4YiUqbcNuY1mWL1fvvZ7qH3gDagkxEhQ9oJL1n3wlFLIX4W055xRTjc/5tYCr1PLE+K9fJwgntlQGvSXEhOVwC0yQ8bx6CSG6xeWscqUzlMB4gRABrC+7KO2eL3Cj1nigKMBX1EtRqHcpnshHQ0qzbYnfcCsGz9kOUY8HZAENefVPzdQcDtlGJyHGicxoRtsZhqrQ+mb1LTrs2GZ1NDOr3l6d1VFgBmsXhLKx5kUaizZWCJdMgAU/6BlxTk8dZ65JIQbIaOVCZPFpgsnWmfp9GCJHTZJyk9WinfksJVZ+DgujyXU9TX3O7C4oavLJLjt3iip7tulT7tQiPEHMZ2dYzs56k/fxjvlKvWLkZh6bx4XG297Xou+zZlQRTWVlPKdp/WH80FJdWqAR7UH5VEOdTLNp1MF1q63lop6DpF3IDX/lkca3Yis5CoL0lowef643WqKNL2MHwOTeBOrHG0fbzdV1F51Fh5KorAP651IZ/I5Tto/kamJd2XcPrLIAOHkoXqTWeLIxr+TGLjF84j7iGFDRCmmq3oC3VPdoCb6Azuz30ERU7fTfEmTflA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J0Sl40YeFxJc6KJEC4NQTop6w2lflFZvi867618brNhoSljX8mVSc8wlar3IZzRQkzapchRrkLp1SjBx5YqUrpbkxLtys0KgqTMCZGGRUcBxtAxphwhh3gIRkYrCUYC6H7jLuxvelOmQG0OlPwZoWiUjFHk6PAM+G9Gkn8kTNDpJMDQ/BDb8aoPy0z8i2ykns/3KET0igPJDr9XAe4Jre5csWGV1ZhZf0xCg4sPxnd4d7pNnKc2ahAOSQ657wV04tmzfAbSG4+R1S/3bG30VE8c8R1h+4oGMjqZ7UqtYVVonM/FRXTxqyAjv2djxKXvglh3+foLjrIfDfNEz9AX3vqTLTL0fJNCcUuxN6LE8Z+JV5AFxibPrMtCaCwB5TmeTPRD1xuho1f0UW611okmNwNxniigiCSogv9VZD9FcopEmB3VnzuP2JHqRL3g9m3M4TSVNdz5+Dsurll2A9nqRj66jTlIlbj3SlKDtiODDHOO/o3mPj+XzAsfP3J/UM/C+90sSl40moz+yBs6op+4ubn/+Xk029SymNwQNhsWpjTFUbUJRK2DyJayBIiWXpO4HjXuocmSQWhl0aQB/OASrVPcJGzwG4voCWwbiWeJs+l4DvkM+5hZJtqzWwich1J/4elqIan0+GLO3pDeEjiOw4qusRMkFWliUFVNSWu4c7XrjJVqiASGuvr/T6xlC2PcIXjmHl5rAh0sETQmh/ZTpE2+d7aAu3XjDeU34lOw7p20HCgjtje52fhtOFJ0PSeSfh/pUngIxkRDRQjNiDjtJzhY69iWaq8AG/UADuKY+dGZH5IwlTvG8MQhwGPI38YNG8YnlT9+gqjvWGlikp4qLoAW1Bs5XntvwaIwU6Ueh1rq6kqeXl8QOAynYfSWkHCh6RELbwYNzurGL1o8MNcI0rzAqptoFMlb9Zq46h1KdLfDHcrase8WWgf01H0/WpA1KPnc7P+0nAvK+JvmVZrunI+D3+1WQlr22mdqaTotrjsFB5hSdPo1HpjFZ4d+Nl9AjD2pOnlxUFqsvHKBbz8u+ztAMNqCQ1/HIMr9wEti/hwtHrkUaA3NF1ZUHw5XgbnvQMfi9VFQ6FQR1+tAm45/Uj/HURsF8sBCbBiadm1tX6oIIYREMgwXFS67b0RmlkzDQPCrZX07omuLeNj1b8pSF52NgNpRyKa/PSXa7962VGd/T0bZWa0qnn01pxw9m7sUHG5MWzcNmv+MYqqMBNk4+tPaf2nD7giUyDkNgmcsEgZr8CI1Y5LwarUowkpMqG0Vsypx6U7e1jRFTKTym7VrTvmikR1P2KDwb8iAJWSwbGJyNkJfEoWH9mVjTMhMXhNH52kq4QbtiP87WPeGoMVhv0l4el4mXP133BZ5zvKQ8upmh5VJRbVf9vhGndNxXWf7KRBIuITz09y/h520LCM+KtmpHANw2GktNGXntDl8tq/vGxpQsmM8I2rrMOVBQZe+u4JQmHZUHI/K7IqkOziy7Vw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b253182d-bb78-4b89-bbbf-08da25a359df 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:34:34.6109 (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 03/32] fate/amr[nw]b: Use REMUX 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: hgZHdO6oW0Pf Signed-off-by: Andreas Rheinhardt --- tests/fate/amrnb.mak | 4 +--- tests/fate/amrwb.mak | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak index f4f74f14d9..6f5ed413e3 100644 --- a/tests/fate/amrnb.mak +++ b/tests/fate/amrnb.mak @@ -30,9 +30,7 @@ FATE_AMRNB += fate-amrnb-12k2 fate-amrnb-12k2: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/12.2k.amr fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm -FATE_AMRNB_REMUX-$(call ALLYES, FILE_PROTOCOL AMR_DEMUXER AMR_PARSER \ - AMR_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-amrnb-remux +FATE_AMRNB_REMUX-$(call REMUX, AMR, AMR_PARSER) += fate-amrnb-remux fate-amrnb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/10.2k.amr amr "-c copy" "-c copy -t 1" $(FATE_AMRNB): CMP = stddev diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak index 8450c28bba..7cd17d266e 100644 --- a/tests/fate/amrwb.mak +++ b/tests/fate/amrwb.mak @@ -41,9 +41,7 @@ FATE_AMRWB += fate-amrwb-23k85-2 fate-amrwb-23k85-2: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/deus-23k85.awb fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm -FATE_AMRWB_REMUX-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER AMR_PARSER AMR_MUXER \ - AMR_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-amrwb-remux +FATE_AMRWB_REMUX-$(call REMUX, AMR, MOV_DEMUXER AMR_PARSER) += fate-amrwb-remux fate-amrwb-remux: CMD = transcode mov $(TARGET_SAMPLES)/amrwb/seed-23k85.awb amr "-c copy" "-c copy -t 1" $(FATE_AMRWB): CMP = stddev From patchwork Sun Apr 24 03:33:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219480pzh; Sat, 23 Apr 2022 20:34:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0s5L+hOkX5kPHx0l6txLU/U+cBl5eYVPElAmbbhSC86yc6qvFza8TesCsEBvfxN9vbWU8 X-Received: by 2002:a17:907:970e:b0:6ef:ef30:bfa3 with SMTP id jg14-20020a170907970e00b006efef30bfa3mr10824654ejc.54.1650771295647; Sat, 23 Apr 2022 20:34:55 -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 j26-20020a50d01a000000b00420fff231a3si9782422edf.160.2022.04.23.20.34.55; Sat, 23 Apr 2022 20:34:55 -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=ca1okubJ; 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 E9DBF68B2E3; Sun, 24 Apr 2022 06:34:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075104.outbound.protection.outlook.com [40.92.75.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09BBF68B29A for ; Sun, 24 Apr 2022 06:34:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ca9OKwQZuX1WvsLr/IaHA+fObr4eEty7XPJLeUb2gbz0ZA9miizkP9kw06a87wm6d96gds/zMExS8jAjQvPJ8Mw1fZ4F2xIo5ezutqL8YBhaC1T7JlrF6WnUuQFxXRFNh/o6XqNBnodCRjILBUbMBZqCDSK5UfEF/Uq9RrfP7teA4IlRK1QAO5/4/ao4c3r8ARYxtjDEfx2CCklRyJHj/Cmg7gr4VwDjO5qjLMiQitLDdyT9ene22lC8AnTqL5BVCCu8JUVtB5h6zPaXK+F14ZioaESzq6t/BnbKjRGF48oghRsnAn1QfxAxtEkJsOIKE/RTTkDLpSLBJbLv7+lu7A== 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=CMWBEF8VFRIsIXKvpIXam+kU1iiW9EoHLVfyIbIwT/Y=; b=E+i0+M0KSJ8f8SsKDtiNC4QSqsvZBnrFwOa+KwBCtuRBJViNPlmOnKwjXwSL+bCz+VRbulsdrUSrD2t4s/BofqdL3+f0JEnzhE82Ol7TYTfSMxJ3kW6DYRWfLI1CB/a5Yd+P95dteFpF7yUH7AFNSycvYl4KRJN9GOTLtJPNE/1jAGoiOIcstX16F1kju4kRQDzcPtnpG1NjiRGSuRB2HbQ18ahfKGYj4cmAP2awIkOg4VO+qwhC/wDigzR6o8uuuLXW3ILGuFawVksNbYKm0daJeRZBmG2axit/LR0YEgTUqxFARKonvqiq0I8eFuQjVC76aFJvXHSndtFXjQdksA== 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=CMWBEF8VFRIsIXKvpIXam+kU1iiW9EoHLVfyIbIwT/Y=; b=ca1okubJTRcVLYXJkXjRPz1tu/amvDaIQeU0TZqo90xSjbEuD5z+DPXdrN5WxKpGWuTk+gWZN3JGopm/NB+0c2iHudlU8mDU+O/8h8mSc3kEhPbQg4fuJUgymSu/Jvyym3X28N4NEd5cZGJ+WsZEaqVETurKeEa6TIzCLjuno+9RyjUite0OBRfPyHxh03StBZ2m2Kys/dkbaHqwwiHYIPdrD6EbNFG0zJQjNijy12NZ/uChDdIeChS8kvClGErh8WBV9bplECTBArWh/kmo53waJA50m5pwuwNmVWwC9e8K8WUXehEpI/Pzg6cJpZC2Ds/XnfUs+idXbRyG4DxgCw== 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:34:39 +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:34:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:49 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [bB2HB+LC4qer42+zl6FLm/pSKJ1DokHm] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e168123-60be-4be5-e994-08da25a35cf9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbTWNwFwaPCdfTBQbPfNYG+opu7kEVXkhoi/yB+6lcVKcGwc7j+U691u4GnG34qLZqLP1YDEfS6yZZG0nb8wM0SJ46Wu/mn/dPILMxgWRf0TYaZuFLfgphL9zJa3oOELL5qK9dh6SRK6AsrDo1dbMdkDTu6lJokPy+Yzvs5rlvR5MI1yauKllFH65IZmu7ArbPiZGNSU9fHo50JTBYvHW7zvUGBopD51aAGpOx4KXMYRv6pCBIOFynl56NFXylO9zQPxQH2AcebPgdC+3hry9gp7KqST3Wo9O20l+qb7LdZacd4heF7D+q2rVq/7uwMh7qnnhRRvJsKqVPoF3XRDWbzgj9v9tz3qRMEC6i+BaPlMWYpNBy9gO5Rw6KXGBCrmy/5mtK/kS7yxHJfm18/qPjKsuHDY95xu+ZD/MJuZ+6DYUKOHlM6JjlFKa7+lJ3VXL2GPbKVAoFlRrgTaMNJ6J7quhDh/t9UYODisJNXYLNsCLQb6yfC5LY5fHLB4oV9y6gjvMw8Wly8wXA7AsIxgG5p7ceIqaFcTA9Tc+WJZPKhTnsCeeNXRo/I3GA8Y03bTDqQz05Zxmj0CyYCZg7v1LUtR9J6dHayitPu9XALMUlY2W9oiSBtKvqNpDy0dEW/cPDcGZEcAfSvulijcUGJ6GsDYbPH4cqKesT8HN8toJ0JcmoGRHp5QcJMDarqylEYfHCm4BR4yj+cPDYN/1jWRqfHA= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZGnTHJWkCfFs2Dp3uziisKAyQJuKJlUw0+zVpwm98CpOh8e3mHjaulzWu9yzgZXH5VaRVI1cXMW1QsY3/ky/avCyjywBmdrvzO4RA/KzZULCT6D8GcIBTQX5vdE8lOjvF3KAXBYWa4CRgnxX6qWQe+TyQxLqBWgFhL9QQuXfcvVoPBRQKY2eVijukieErTZ8LwjJmeAiEL1Av0ZM9r25ldh0PgZ8HQCUpesCjRUbUBsAxu4UzKgMWF8c6fw+lT+nuj5uS0+CvBTmkvVlLJeIgNJ0uOVRBLoNVmvNmxoNFyDrx1saIV05BVMOsyHe1v3ajIMfd+iKcqIGjF9VnLxdPnkecnGYV9lwkwnIQB/1G4u+jlvW5131EuhobcfBxd0emwjPY2jbFVYkt9+hkP0vryD3k1HIMpEWYUgREHIM1gM2RgaJ2NL/+uAETrlA7hQbvsMnaga+TpV+csRDe1zL/MBzJtnDbMYbQoqIY+Kwh60Xv7zjDvbZxDJZe9RmrMxOqSjXemYFYNTQb+09ogxhkOXIPKSUBE2AzhytmXywGwwSU52ZW3tuEvOkEcs5QNOCt13Nu2RenwS/3tbfhw3vvw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sboDz5yyOHtYGBpVLmYWgtGFC7slqYUUYe5c/CHDs2cbX7R0wH3RJZekPVO5g8vksRFOw5JHG/D2pMVBx/CSwTxWAmDxlPUb2x4xMJltjvCZjet/5SzE6KTg/nxt3CaM6Wre7arpbLm7GFQxJGZX+OsDB/4Pa3NmmY2nWTlu1o8ci6fithkHczel+2VNrfVFOLcUGafdVRg2mBR54AKvKU92ejKpBqNIX6GXd+/CG4UcgOeu3cePJJXi2+FuAlFlkNiGmyPBFTAkFHDsjgjde+icxteVBbQMHi2hi4PmRtKwMNRbOk+fewdggqgto7AxCV9no/R3XTsE/s0OlBHXSs1nZ0ZwSL+KduAHYOwfqj6HLkkjjqstzkETxnJLD0IPNJEqk95ASxeOWRIBh7F/fmZgwT57We99Vbmr/09DhXFyC+eWpDDELF1xZKMu50f8FeQdg0KhZx6uTIk0IUDxKs3LKk33WKLR3LOp2fMhn3+km6avtKGUr0qgESDiyRCqLM4f4W7C4uSQ5ry2/iIPc/mztP3yGJIfutuGHusfFVhqzo8VHwgHEOj5w4mUOT597SMeU5Ar8HT+KmM/GsGn8Kwb26jLJs1pZNGV9eQc3uJlkq+psQlZLM1IlsAe+Z87zlqdp/oBWQxJSYVs0jT4+7GyRL0kzyKbWXWNjIhmqLGnsz+tue9LB8p4+ash4/6V63eG9Zy5fHZDXdLjAyTgCvUsHMruM0oAyptCBWIEAhvZ4FtGEH8RDyGSPOA/VU2HM4vOVLB6M2MeKIL0Ooyfe8JNJ2QC+lxgwnczCoc/ZEJXgU+2KTOg+vD8Po9WzdxfXwXWY9qaBS+6LWBjO6/tz4VVzbujELUubQ/vfsKRx61D2qcU155dIlCcqKyi3Y539+OYRnqo+U+ykPdzVHl24FBSDhdJpJZTa+yDgZzE+CNOAxXyu9UPIIGudyUgs1SY1CoF05jbE8HY30moFgU98iVny7jQmA0ss4Xg7jdAVxrwbdzMMjUeT0Eex7ETnIBf2wF0nOaG3L4ZXB9EhkGFUvCUYaynAnafANU5C0BwwNzxvsyRG7UGayiQo3qp4uxDYIZir+pQ81osTdpu7U6AwGtXi95pAKXahpS/qTdvG/iRYM59MoUz4FgDlCR+ZiarPNj0LQVLZvjF/wm7pPo2uvRUfvdcXjvZsJ5/+4d32n2NxUJruLcHwyAUiCz6fPL388eUb5Y3OZVs1qzM2NnnyuzYfkv4SwBxoMKItYrMDddn95nJ3tGlw3na3ou5wogpag7wyBkl9N7oZgD52O6mGtLfLmPKleHEXjXbUJFB/YU0IkqfMusvQMxDRVy/WYUMpF7lE6KrFCio5tmIoplpUnaIul/JS/DFDi/K0pZhQIgYkxSvRS9yTmBmFNym0PqMJF9I2se8nXylfvo9N2CcR/v/I/TkpIdI/roMhjkymcerQPD4pR1TxcdUmmzsEgZ6PzfsgOglkpnHJ3xAv7xSZw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e168123-60be-4be5-e994-08da25a35cf9 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:34:39.7843 (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 04/32] fate/caf: Use REMUX 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: 9PiMeO3z7tgg And drop the FATE_CAF_REMUX variables which only existed to avoid having to repeat the common FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER stuff. Signed-off-by: Andreas Rheinhardt --- tests/fate/caf.mak | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tests/fate/caf.mak b/tests/fate/caf.mak index ae2c543358..f153bfeb79 100644 --- a/tests/fate/caf.mak +++ b/tests/fate/caf.mak @@ -1,33 +1,26 @@ FATE_CAF_FFMPEG-$(call ALLYES, CAF_DEMUXER CRC_MUXER) += fate-caf-demux fate-caf-demux: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy -FATE_CAF_REMUX_FFPROBE-$(CONFIG_MOV_DEMUXER) += fate-caf-alac-remux +FATE_CAF_FFMPEG_FFPROBE-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-alac-remux fate-caf-alac-remux: CMD = transcode m4a $(TARGET_SAMPLES)/lossless-audio/inside.m4a caf "-map 0:a -c copy -metadata major_brand= " "-c copy -t 0.2" "" "-show_entries format_tags" -FATE_CAF_REMUX-$(CONFIG_AMR_DEMUXER) += fate-caf-amr_nb-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, AMR_DEMUXER) += fate-caf-amr_nb-remux fate-caf-amr_nb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/4.75k.amr caf "-c copy" "-c copy -t 0.2" -FATE_CAF_REMUX-$(CONFIG_MOV_DEMUXER) += fate-caf-qdm2-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-qdm2-remux fate-caf-qdm2-remux: CMD = transcode mov $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov caf "-c copy" "-c copy -t 0.2" -FATE_CAF_REMUX-$(CONFIG_WAV_DEMUXER) += fate-caf-pcm_s24le-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, WAV_DEMUXER) += fate-caf-pcm_s24le-remux fate-caf-pcm_s24le-remux: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav caf "-c copy" "-c copy -t 0.05" -FATE_CAF_REMUX-$(call ALLYES, WAV_DEMUXER PCM_S24LE_DECODER \ - PCM_S24BE_ENCODER) \ +FATE_CAF_FFMPEG-$(call REMUX, CAF, WAV_DEMUXER PCM_S24LE_DECODER \ + PCM_S24BE_ENCODER) \ += fate-caf-pcm_s24-remux fate-caf-pcm_s24-remux: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav caf "-c pcm_s24be" "-c copy -t 0.05" -FATE_CAF_REMUX-$(CONFIG_MOV_DEMUXER) += fate-caf-mace6-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-mace6-remux fate-caf-mace6-remux: CMD = transcode mov $(TARGET_SAMPLES)/qtrle/Animation-16Greys.mov caf "-map 0:a -c copy" "-c copy -t 0.003" -FATE_CAF_FFMPEG-$(call ALLYES, FILE_PROTOCOL CAF_MUXER CAF_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ - += $(FATE_CAF_REMUX-yes) -FATE_CAF_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL CAF_MUXER \ - CAF_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ - += $(FATE_CAF_REMUX_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_CAF_FFMPEG-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_CAF_FFMPEG_FFPROBE-yes) fate-caf: $(FATE_CAF_FFMPEG-yes) $(FATE_CAF_FFMPEG_FFPROBE-yes) From patchwork Sun Apr 24 03:33:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219518pzh; Sat, 23 Apr 2022 20:35:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCFIERpEJUHRnJ29kED1UUw6qU2jLXZP5I+quTl8OBBkfESlj+0ZMGVp1H7/sNu/eHvaAU X-Received: by 2002:a17:907:7fac:b0:6ef:e068:f5aa with SMTP id qk44-20020a1709077fac00b006efe068f5aamr4022295ejc.238.1650771306622; Sat, 23 Apr 2022 20:35:06 -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 y2-20020aa7ca02000000b00425c429aa93si3883900eds.334.2022.04.23.20.35.06; Sat, 23 Apr 2022 20:35:06 -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=UgE3X8Ik; 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 D193B68B2F8; Sun, 24 Apr 2022 06:34:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075104.outbound.protection.outlook.com [40.92.75.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EAF368B2C7 for ; Sun, 24 Apr 2022 06:34:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oX2dQdZfvrk1WRsV6eyo6q6CLX+oe8EsI7gak1zFKGPxQxtawEgxxg3Sx94FO5LiTOBIg1dPgAI2gZhzOUm6AXI7rzV5xnIY7Pbjg9rEZanw0UyryA7wkQph2zNbd0v7dPFSMbNUKr8hpS70VOLHmqaVa0V2I5sTQSLgHh//SuVaXnAZAGGltY5chUmtZAgJwBpnEo7L7t6ZONt0qFSPA1tLauTQccZybQafMVWfDg+j+uMPjQpuc67NzL29aAW0nKBR2+nBZWQkk2UAa3Y7au0/QYewSoCWqaS6DlDBDC5mTXgO0HdBdu4lNItXJeBQ3QrggrIaULPdsl32CktBkg== 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=ZUWCr3rPz+h3Z1V4gOzlwiC5Jjn7vFInGeXuOpwmR0E=; b=N3/Dsz6LoeSOgrwpWi8KxnjO0oYHaR/nFY7YVvfralA0jpAASJczjfbjWUESFR19IadzdhqBhmEuwBPWFSw604OJEpGRJlCwlclGYVb9CQYqxfUwtC0HtnRo15Xm9QxNOX5WLgf37sXVtDFtiwF+iRfJJ+H/QxGk8oyX+v8NugU6OLN0970xUQWLAxerlg65aCJFD3uQy8tHUTXSnRZcyhMmfCeRnOJiFy8HqpCAC8hOdGrHXZVoUddilBsJFGUtASGMYYiv8/iWeczDeNsByHMBoVqjhQ04kRT/Z3MOKtLq7R/SvTo0FFCIuvCohnJkUlY1oDCQDzZBpRSqDR1tbw== 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=ZUWCr3rPz+h3Z1V4gOzlwiC5Jjn7vFInGeXuOpwmR0E=; b=UgE3X8IkySPF02kur8OqyRP1T3ybC0zaNJ3ZFtwLsXmh3N7v7l+qXWJGgNa05dJZjcRczFp2381Bn1nzQ4panguSemArw+qfl5xidVkpu5AVJJAIHJtOjDhjlvO6NGJj1g/+LRVJB8RRBxpjlrw4mJ1NKW+wXqeuBnGxg1PaeDW8w5Vkm4D0KphnuVy9jqxiO97rlcfCX4rl0wGEtM17AyFZkmvCsbfuFw8euuvYnTKvzDD8Odpx+xF+gfrYm6YYRXdIyW8UTgWku10vr3cVreH6x90N6e4OeW84Ju7VtPLnQ6mzc/izAxi3i1MNBgqmbcEtKuUaiWKQ4PdBhRSquQ== 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:34:40 +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:34:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:50 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [nvYReY+0EVJXxWfZTH+CWNvW0yQZrlHp] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2bd94745-f07a-4229-ee44-08da25a35d88 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDIKVxbk2rCGz91fykY+emSEagARiGTAvzZn95Dd9Ckdwse4NYGJj2iXTPIm9S9M6EtBrB4p0GJNPEfVEHXTWnUOOaA6/XPKQOuUazR5ycdOCEvS5l45FxrY3xnAcRn75PWZ+gOrrSNfkKq9VX2tjhQM2EXFNPUOiHMAYn+M+cdA9ziZ81Wgj3nOYuE4YrNC/wMWSdSyK+U7DODX0lvR6lTbGByo9LylJsPVFAKKRdPK+WK+P8uE66oS1KqOaT+C/DgOJyHY9A93ElUSXkpQSCNcBxj12IsOfjplHgk0+U2JqiY62rYG7yXChX1/PgqFE5DevBv+qA5OMNe5qVx6rjIZecIWYzTnExIGrpp27B0t93E9OBHL/w1x9avkpWEdATHOsEoiB9ZLx+WYxM9qRfdN1Wu8X79RJDkhdmMYx8Nv99xZ7sTWENVa8ByvoOsqr7z83uVzAtWpzSvgrD1cTFptJHaXa+OVxyFBbXdh8rE6YScv6/wCJorwfwYaq0ZMP0ORSoOruUKmOPJeSiRGgkdjR9mLG2UISH+CH46VgTwSzjjHsbu9DQ6pLG40Ft5GO83nOZqOU3k0JZv+sKzHrNiOAy+B7SkIWWL91AYV83UkZjotvFlbeXDOeqhbGk9AxymMA8QM6hTv0wR/zojEAo7grdMyNiKqlCZSoreIVISj4eeKbR6RBnEn0u3fIq3D6ANVgw2kbHkjNd0iDMEl/FWPmBmgcuOVRnIuPhTAyJqCs= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ru+mcEwZXkwGvL8s5PDBQiZKtLHXlmBOSRZWxN6Y7oAams0S6SMCnF3GpvgR3ycupJKbuWXe9mdGWBbwf3sOPO/tbhDCg2UvYYv+NW/VU/DZRbo/VgOSn08CsFSLlMupcba9yxiI7gisxA5C6fEnIXabBvbyTKmKOm+21XwzldBqNJIjCoWaT8sgtX4F1n49HpuSFiRK9RtfDEUsiJWPCNMGqbl31bM0hH4VERLePq3CbvfOuOD5rc/n+dpOfKUROlZavD0S+0r+55FTXJMb6OnLkmu9Sx80hFHemzRLIER/HoJGZLROzH1Ryo9PP8wfMounGzB9Y7qNdvI1p2tnd0pfLIRhdgoY2XHC+2SAwysEMOfdeiaktApWkPqnEoOhBvHTQdJLB29tntM0HsPaNqn8+SOPTz+b1XOQ0adE5oM2x/jrpYS2YeZy/ypbOSJH7hI6b86LdkwCWNJS5Sbt/WmteD89FJZ2SnE610Muihxqo7ZCfeD9fca1KMjv56OLNVPhN4gQMcSPp6Gz0tiqWvR4nHyUAn5nt8KH0hSZcRo0X8ENTwbklCOj9Fnq+nW0cwqxkVB+vZ6AYsMag+Zomw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 31vr1XCjG+BppEs6ksw2EUjPBmY1ASAvHg97Xw/iiOHe1MtiGyVuWtPtjS7YnZ+NyhXNW4Ly1OhqJEUtWZZ/wgHI4EF9acuJCpO0pxFA9p5Eww+576INOnzj2+wCxSXUG+9Z0mx4StEZd/yGsphttX3Fh/tLShOnFWQ69QTugl2/Mz/yTlF18BfzEcfs1L4NqWfZq1mlTqk1FEmxS5wYlYhH3PxFYF4HQzZZoss7Cd7Bk4zWyHssTPWW4nnH2yWxr6dN0Gwv6lPnXYTffZxdv55B/cWyd5vW3uYpryAb686oRq2rJp32+FhLNZFNb1O9xXABakkZ4cRUDzkjqAku4Yxrbp4bHJR9YKtAOzWoqBjtBhFYGhH9VLfB/pJYxcK/vuevx8XAUin4f3aexFyzruFuSy/ESHc3Dx2azq6EuBMsgfhfp6Of2Dlg9y28YuCjQkVxgQc/oteDkF+coCpUzdmzzxNECQcVseFuE4u/efWzk6R/uEARvSiLGfziGPoQEaxJhn9PmDVtqpsK8odPekTB7FmMpa2JbQ4DnT6byDZB+kaNO4F7uuKB9dOYL22TbUomgXoDKpdvm6oIVgECXO33uSukWA3wGd37Wpt/XCFhX5yUeECpHsQBGbCP1mm8ki6Hx8eFUCJ7pWhWIZ5w2bUyOZp2Dmx17hGF2yFElGcqNl2T5vGI/jEQJ52KHNFW+cDawcVnLRfeNXuSCiaTplj8vlDbrjivtIH1tt/ou7uJYO+IujixPLCFcv0dLFp0wpx10UPnttL1pkjE182HKq0/Rs6BxtffcQk33CXmoKfIegn//6TE4cEKVzGbwkenv3VFk0hT2kB/d+9yyuqL33VKSK3jiu2fIZzPHtMjZQAoo6E9cNG6sLKKbeQvw3YtTwyvAVhzD75sMdwkoWf3vdlLTxQb1SbW38iCXBv8dP8nnkzz8ORtcgzGPQAAyRon0BK+zFIjaacIQRm7GYzGJqJFTtJ1pYs0hzVG1Ywvxk/2gtKhdQbMQMnxpo1MhhGhopsMPf4yHvMgDKl0rkcEpN1FHUVighnsBVVMDtyJxBgvVMxgHKk6SA5QKteGzw8ZMOWqIpwP4v8d35dQk6g8B6szgoaxmI5v75BGHCwfRQ4sZ4aTVGxyRINKL8k8odbgq7O4a6hpEjMKEcYNHet3+QbMNHTqt53eo+mATV6rEQCWXQGQT7K93mmfGm7VhMqm0fse1RfGicAs9aks7SuQkhoUAh9f7agaFyMq+iGKKmXJcfX6X9o76DpCb3/oS4Xus93pKOTDZuXDXx5hHlMZAFw8+YocdQHCRSRfejJedB9Jt/Olkn9GmsbJs8uumzjIVwuRljTV7btC43JjG8YdADjILz5g7JGLNKnZmSiaoJPEhKU/UJEW5UXfAeoiOPn3DahU0JFAGOhnQXzVBug8UEoAbDXJaC1yc+/y9p353xFMr6+/uhgZze/Vtx8Twvwv1DpAI287JE5tTC7eA5pKeg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bd94745-f07a-4229-ee44-08da25a35d88 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:34:40.7529 (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 05/32] fate/mov: 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: gQS6MqpGz62/ Also fix the requirements of fate-mov-channel-description: It needs the pcm_s16le decoder and the mov demuxer. Signed-off-by: Andreas Rheinhardt --- tests/fate/mov.mak | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 675c34a07d..a33f3694af 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -126,36 +126,28 @@ fate-mov-mp4-with-mov-in24-ver: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entr fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/extended_atom_size_probe -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OGG_DEMUXER \ - VORBIS_DECODER MP4_MUXER MOV_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, OGG_DEMUXER VORBIS_DECODER) \ += fate-mov-mp4-chapters fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg mp4 "-c copy" "-c copy -t 0.1" "" "-show_chapters" -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \ - SCALE_FILTER PNG_ENCODER PNG_DECODER \ - MP4_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, PNG, MP4 MOV, MJPEG_DECODER SCALE_FILTER) \ += fate-mov-cover-image fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL SRT_DEMUXER MOV_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER MOV_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED # 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED | DESCRIPTIONS -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ - MPEGTS_DEMUXER MOV_DEMUXER AC3_DECODER \ - MP4_MUXER FRAMECRC_MUXER ) \ +FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, MPEGTS_DEMUXER AC3_DECODER) \ += fate-mov-mp4-disposition-mpegts-remux fate-mov-mp4-disposition-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts mp4 "-map 0:1 -map 0:2 -c copy -disposition:a:0 +hearing_impaired" "-map 0 -c copy" "" "-of json -show_entries stream_disposition:stream=index" FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) -FATE_MOV_FFMPEG-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ - WAV_DEMUXER PAN_FILTER PCM_S16LE_ENCODER \ - MOV_MUXER FRAMECRC_MUXER ) \ +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ += fate-mov-channel-description fate-mov-channel-description: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-channel-description fate-mov-channel-description: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mov "-filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/mov-channel-description -map [outFL] -map [outFR] -map [outFC] -map [outLFE] -map [outBL] -map [outBR] -map [outDL] -map [outDR] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0" From patchwork Sun Apr 24 03:33:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35398 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219561pzh; Sat, 23 Apr 2022 20:35:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLP54i9E6IZg5vgj+rrgy0PK6y0PlHSZ2POX4V8TSbLmf4BHO2QeTENsBWUuGiTzGHpT3N X-Received: by 2002:a05:6402:1e8c:b0:424:1d6:1b71 with SMTP id f12-20020a0564021e8c00b0042401d61b71mr12576218edf.211.1650771317681; Sat, 23 Apr 2022 20:35:17 -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 o15-20020a1709064f8f00b006effb96023asi10374269eju.48.2022.04.23.20.35.17; Sat, 23 Apr 2022 20:35:17 -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=pXR3e0ag; 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 CB6DA68B2F6; Sun, 24 Apr 2022 06:34:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0239A68B2D8 for ; Sun, 24 Apr 2022 06:34:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fyOqzkIMrlMilh6cZRe+qX1tYHbS6JzMCCPGwLjCBNY0ub+D8VtJU7Nqslk1TokApW9uJh3dC9eYnsgG9feza5igOYwNuyraeJ4ff1yzNttqeyXtt/JBMAdNZ+4UZv9g3AX5Ya04z+Sj/9azHxJlqMU86sosVUK7vgz6F2qkayQEblYWJT6FdG0lan2TTrweFUkylSJIMfMpvL38d83MZK1PAWBewjJaDVCf1nxLphFhwuR9NQkkULml+xYXghAukBH1LImU4mHbiw+X4OLOBiLGbKKQdbdkFSLXVGoWwmzj9hZ5JtUrLfSKaSba159o/7w3q/kp92y4DxqN1nch3w== 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=JypPS/vpLOVd7IKDmISdwDnFTxC+3MAnj6Ot6gSMPkQ=; b=KpPdX+tHytJNUPSM/lPBKbGh/nW+rD4oIIsbFu3sUeXo1attC9r+rnNZWF9f39fi+8WAd+jmDKb0VbbiDx7l131NoBLlpVrUskp1aNCuHK/zn1YkFflsABlXEfUSI4xCC+i3ESNN8/6j44Yy95Tq4trodj7NOxkdYpm2O2i964MRTMsu4W39FXmzC5jFtssCF3ja2QTvrwkV7gsxrL5YjvxpeVQPKC3MKpmHtgompTsva6ln/VgDbZ/69Qf72M5KSD23vNEYYZ7SKA8QNWgap4jYMg+tzWSTchJV/Szv8DVt20uXP5rYCg+bB7BZ0OtMhGIEDTyL8CxguNoTmLG4Yg== 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=JypPS/vpLOVd7IKDmISdwDnFTxC+3MAnj6Ot6gSMPkQ=; b=pXR3e0agOEIAHAGOsjvybHOJHpu+Hst3hpXjXl3aqw+OSJhiVY9y5bCJCeLTgYiSGlTFQWzW/0xDqcqR2J9XZZQLKi4QSZnAoRsgtZXBVhWx3c1WDoQg8T68/jvJdSh65CVKKzTIa4yaKUrkMWnc5T7dICBrRT8MOjp571O5gRDWASiQlbtEe1m9jaz+3XCXTvkwtWTUXCdbADwljBzOZJV8II2Zr+Vy1SV88dJP/rMm3YYwra1adZS3iQckPUoq8OdmMIBnx2f14ioVHiAwpemoDE2q0gZzMVsuVpUuwJbcG+M7XcxbVWt7c727HH5Vu+/NOfWdS6z7I8yjJBP1lw== 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:34:41 +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:34:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:51 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [sEV/jwhCW83u15TJ1K6gbsCLeQ5LE48d] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6553be8-6147-47ca-b356-08da25a35e21 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXf9jpBoaSzC1PMaQXL9lNTZNX+0WsaJ6iazFYRxfWkiG5Swe+bkmRyK7HlfLD/nYeS3zgmMm3iBYIqbedfL6PrlXVdXtmkiQHr5dM/RCOjiVhJSv5g1L+5OZBVSmn6AIhvJZ8MPnRlcy+0ti769ND/utlZ5zrIJpig7yWA3KdoLQhPVOSgslJdf4HIJfKT+Ji6VLuf9w95Slq2nRWuqHAI8fd17nv9hOf/idyfNmn/VZxT6m8lgWC41af8ud0VG0ZQBKSXevoffHzTw8Jcj5PLc/8BcbjXQwn1oMBIfvRB/sL2eCRh0sAoxLa0Oueo5x8u2G0w/cjTDcDgTOB4EHlNJl6QENxCkJRjpcBsItSjS2Dc8IYtmKNLdGzhBwcIxCnN4TQt4dCFq8RCr5l8M/lbL7P851axdswpu40euH6+f/MkMmqnI5OOSrFwSNbKKu2zew0cphRvcNeEeUqiR/svdfPScJz7x2NwJvhCziO+o7WP/0VSVi/K8JHBTMVoxyvXN2Z1Ww5lCJB+L31bN1RH85zurhmimA832k/SnFQFYiFmuMRHjtQ3toM6sZVBISP8wQlvxHMF8oIOtlTbCobQwPJjPyQINVwbCfqQR/A3brKCkSYhsLs0j2/fcj8GDg17P8x3xWZ0zQAcf4vvAQJwDP+XtUojBDNPpYoPLtep7lLMtdKhqgISHw== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D7gJlwMBYuYjYeFhr5OvBHJF9ecYTtYkaSeY/I6BpZrbnC8k/6LItCZYqEsuhRU2V+0E8sIWS8HYxWherHSIzEiAS0V+f+iPNorL09QtXbOVYVTaPC1asEEDDOLqtjXf/Y1nO2p8j0HCo8naXPC5uth+kka5iq66s9Z/NIwz2IVBIQgNe1gYA6hnZowjFqWDUuhM3jBJSDx9Z17sz8ga5rLLfNZXYunnBbMqUV1TeGzx6E3/PelQBM0j61f6ULGlVxvDFCSV6v40tomesI6ywTKwZvXGaQp2dniu2ju8LVVgCJmxHI1C3DWcG+9fvkLD95ilc+and7kWzl7cjioG4QJPBA+ld9Pp781l1B2evPtDEEPE5XVDoCDa0MalqVpEsTmAz1xMIXkLw+/WNjx26/Sih/29UR8Z8N3zzZ8EwHJpgbZCd+PhozOPFSg/ADQJ5L693lCAMCMd8OLOC8SmtTU/XqxBxKYpj5jaC+VSf5yxs0mAY6ePiX+t4dhzMwlMTUkORGzduCj6eaXpQXLah73SWIEFjxqTWMkrmPHqj9bjjUjXx3DWO39qaIOiy3L+QAsezNlEPmlsUo2djYjWjg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QRz/nHdV1y+iy1bFXuqGLP2sWgWTn3QZtRNH1TB1wjZdwO8zkQgvAl21ZraRfpVUSqlVyhbiKksTudsA0dzoJ2TESA2dYwSPU36/bcSg49SQdnF1dvmCwIXu5VGCjvttVgb7k2yoF+Jwnx1S0AJPdwjmrTY+d5dKED/HH5k0Gd7R1l3wR8JPr1xZy2ru7kCdzuHqrFKl8m7i0Dg9VFFW0kqvSVIK9y5BMeuUktZB04JTsO8NxM4lsIZpNreVjCWYf2PbnjYjHeUbVbQ/b9+tEP8bMmaVWR+GIvLlJeymQWeHNs9PJDzGchG2qRsLCeP6cHnU3vU7ormCaE4fWsurxbBRliIca+Ac3rkBYEOoSGGzeDZhsWRsl1zxW15I7QRu/iCtT3d1kPKKfAGn4H/1FioxoOhPdrgox2JO2hT9F1P306DKmh8OcMm2nTqHC/pG8Av+IR+6qffMtA/wg19MmnqaGjI+lpraLbQEO1YNZ9Rbozqi6TM0iMP8qplaxKALEqmiC1J71GuLmi1fShqHDUkcbSArRWdDMzavMqpcIxGPnpT4Uv1ZggzkHnh54au7W8j6Ns/S6ch1V9JBq168g4N+0wxcBCG9MZzZW8byc7AuEjvUvOEOGUDnkqX5ytUpTfCof/qmpPtll3e35JEh9aXtXbKqMWLScVIwBway97z0Hvd2IiL5pujB+G9GqJzlsQ7odD2X7HlrZnDL0yT9eQHtToBKIhojEm7uid2isZ4OAG/u/yPVTuL0P9TSpMbgDgYaxZf4yEG6M/ll0pGW/5qsjVlNXFTj009MbXFMOhXG9rODfH4+Wvv63ATXLiGM3uBwSfvBz9PxEzPHKBMf8hBVBi/AHd9Nsx7MwhWbhUXcK7JP9KyLw1CyJtw24Nu1f/9NWVSALnknbhFDKhXRRDFc09jXeJr8sF5oSDRPOt33n6HRql7J8cJmj7UUoElXIYj//npWYIN/hvJD/RDIjtvnJnch/9+ZXk8VhdgimZKa2OOpnpnYu5Tb0+4BOC7ecZllqRxgyrJMCCZOY1nt9WyUxeTBEnTSqL6ErwKAzyUyQC7qL01SMlLEIC4QgMDqE5+eauM3fDHAuwJtN9Ncgi+YhNB0Gl7gmfq7fNXHQdE2jzpfRtlyBa0v022n8H8iVvYlh71DsWi6D0lDcMWTZm5wTgN1TIeT+brJsM5qosNRxv84/2KZ5dXG/9rOfsaDMD5tabxJ4XY2Dp+sj8xo4dsg2EjOnFKsrTC7lAaAV5lteuEHP8r1n78QN2nPVwLwlZ91VD4j8tJBwPrGXBBJp8dM1npsiBMFr/QiZsRQsqDXZm53fA0zj3rpWP5u+ykhdCTWVj6KCspfEQ51bNQH333+FRgznj+22lRfiXCfCeQByKaPjVm0hloJYUVQefoCcg/YdU4Z3pOMpzx+87teMQL2ZkrttLwKSy2RiVpfKC06SIWx/q6JJeGVXRDDNhXkmvS8JLtSzj4yjJPhbTD5Kg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6553be8-6147-47ca-b356-08da25a35e21 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:34:41.7228 (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 06/32] fate/lavf-image: Fix requirements of tests 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: DxDLkpGMDiZz In particular, add the missing dependency on the scale filter (and therefore on libswscale). Signed-off-by: Andreas Rheinhardt --- tests/fate/lavf-image.mak | 70 +++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak index dbbd374301..df5079e118 100644 --- a/tests/fate/lavf-image.mak +++ b/tests/fate/lavf-image.mak @@ -1,36 +1,40 @@ -FATE_LAVF_IMAGES-$(call ENCDEC, BMP, IMAGE2) += bmp -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += gbrp10le.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += gbrp12le.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgb48le.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgb48le_10.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgba64le.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, MJPEG, IMAGE2) += jpg -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += rgba.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += gray.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += gray16be.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += rgb48be.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += monob.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PCX, IMAGE2) += pcx -FATE_LAVF_IMAGES-$(call ENCDEC, PGM, IMAGE2) += pgm -FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += png -FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += gray16be.png -FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += rgb48be.png -FATE_LAVF_IMAGES-$(call ENCDEC, PPM, IMAGE2) += ppm -FATE_LAVF_IMAGES-$(call ENCDEC, SGI, IMAGE2) += sgi -FATE_LAVF_IMAGES-$(call ENCDEC, SUNRAST, IMAGE2) += sun -FATE_LAVF_IMAGES-$(call ENCDEC, TARGA, IMAGE2) += tga -FATE_LAVF_IMAGES-$(call ENCDEC, TIFF, IMAGE2) += tiff -FATE_LAVF_IMAGES-$(call ENCDEC, XBM, IMAGE2) += xbm -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgba.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb565be.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb555be.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb8.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb4_byte.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += gray.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += monow.xwd +LAVF_IMAGES = $(call ALLYES, FILE_PROTOCOL IMAGE2_DEMUXER PGMYUV_DECODER \ + SCALE_FILTER $(1)_ENCODER IMAGE2_MUXER \ + $(1)_DECODER RAWVIDEO_ENCODER CRC_MUXER) + +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, BMP) += bmp +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += gbrp10le.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += gbrp12le.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgb48le.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgb48le_10.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgba64le.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, MJPEG) += jpg +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += rgba.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += gray.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += gray16be.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += rgb48be.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += monob.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PCX) += pcx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PGM) += pgm +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PNG) += png +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PNG) += gray16be.png +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PNG) += rgb48be.png +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PPM) += ppm +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, SGI) += sgi +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, SUNRAST) += sun +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, TARGA) += tga +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, TIFF) += tiff +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XBM) += xbm +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgba.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgb565be.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgb555be.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgb8.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgb4_byte.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += gray.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += monow.xwd FATE_LAVF_IMAGES = $(FATE_LAVF_IMAGES-yes:%=fate-lavf-%) From patchwork Sun Apr 24 03:33:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219991pzh; Sat, 23 Apr 2022 20:36:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3iCtyMkEAvsC+ocTyDtwUoGChdACzq5OStH1S9QON15B4P5CV3+NVR5ozKNFbI3cB4IOy X-Received: by 2002:a17:907:72d5:b0:6ef:a49f:133a with SMTP id du21-20020a17090772d500b006efa49f133amr10854634ejc.420.1650771416252; Sat, 23 Apr 2022 20:36:56 -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 z21-20020a1709060ad500b006e883d7759dsi9885830ejf.182.2022.04.23.20.36.55; Sat, 23 Apr 2022 20:36:56 -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=oqKZ7FVz; 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 8CAE868B42A; Sun, 24 Apr 2022 06:35:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075104.outbound.protection.outlook.com [40.92.75.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5396B68B3B0 for ; Sun, 24 Apr 2022 06:34:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PKUN2YrnVehEnW/BmMDYZxzu1DyB725x9QyqebX1Qu2vHatnIh34IqEN7dei7JvNXuFVc51xUUX5w/FLpG1T91FxlBaMEHeTWKdgvc2H9+3IBmA/HGCecSvp55Mynd/qJ/s0lyOBQs/CVhqzYCU30Hj89Q+gplKOLHoeLo8aE5lgnT7Jkuv++HGOQ8twjeut4cGuCAwEElL6zo6pHgw33oKm2PRjgPJAXFe4C/sB0cyqZY26qsBCO929zqB6agMotbi175LV9sD8zQOyBlB+xe+ZzKq1eWIwXCsvqOopiLh/qbBLdfYBs9GpeEVpk1JCsq/GyYIDRm7OOstR8SzJIQ== 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=WIXiqfF2X6HXLOeruShiJjFnq2Vsnu55PTx7wmHaJ00=; b=kXhrWfVChWh2bNrzBoG+/61mCaokLJWqo2jbyGAIUy2neFIklQpPL/O6aDYofEw2t2k6sxsu2dmFoL/IiZMkOWlU9EUQ7pKALr0K0hE8R6eVtvWbYhAx6pjXcq/JAOeE6oHn02Iynd86Dnr8dR4k7hqhz5a27NpsKzHfo+aTdekzZjK12AocB3jjLIC0rwAATGkdBaHsw1yCBMIT5ehhkFJsxvCvFSwp2dq7+nVxvwg5EiOPSX7TmU37+YoCpOQiOYx0sbYDZ74MiGlP+IT6UaBmxxM/Qe+13OuWt8ftVdQdgqvQEzPQfv64hY5nBt2tc41zSIlvnW1MFS/5NnkUtQ== 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=WIXiqfF2X6HXLOeruShiJjFnq2Vsnu55PTx7wmHaJ00=; b=oqKZ7FVzYOBO6+7K10Qh3VKvJCq+Sqm/0yIMWoPX8UrgQzs3oDRjvkB0prfchJLV+Xb/vgpGluJVeGfxyE2h3kYFK2WDrj7JeuqgslflBokGn6tJVbPflUn77JKGo3zODCSHe9sdqV35cF4OChnRSjmexHAHXY5IBz6MaDuusV+2Q84/GLfoElmukuswtRe+NId98Cpbss4+hDnbkybLq2zQaktOAEqrjJK2spQXbZ53pmrL3SfFRglkUmNod1h9XqVaxS1K39m4xSKBadR8hZAzD0qedc+yrudBoaJCNLCiK1QpQDP+784y7SPbecwaiPG+RIIbnv5bGY66tGF7vg== 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:34:43 +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:34:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:52 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [TzU2e0LATtF3GCKmUhCAgcODUQ4c5lyM] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bdc6cd9f-b3ce-4596-53cf-08da25a35f39 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsD4rNWXL7bI8FSMaAYlfs4AslwylNe5ul2rSQ7bXJaKYHLBZHrPwwdCcvSctBhOjtHWHyW8ib7TS/6jI3fRtt+hHUWI8WHsQ5J5gFIxTkogI9LcUsWFbMc3PyGDM9tloImcdapMcd00A5/Ke2wK+97JLTJEGiLrTlwFiD3A2fT6rMbWWXshjj78dWVoUaLs8xevFeXU2VVT9/o78gMRpb2gflkVvwOPuVrYLnAsznC7SwyEsqRW5jZ3M08uJqymUZNDewr/z2M+bx1shqGliOPaSi3B+ufwp/nGPKKn51jn03uCO1IvnrWH0PBROvtr8lLAoPi4DbVUPrj+wICLM59MHhqb2lelAMJsl/2tPk7CgsfH2Wz/j48jwYsSOlAPGC1iG9LQVZ09r1fir8NKCiKZEL5HnUaKRvf/IbdnNmO6J6AP6ol+G8BKostylEZrRMBVXWCYllk8ksKfOcETzK38mDmRwn0mMuLWZ7xwBkZTxkUJNKgdKNHZUpXkxo3+nUpABU2btY1XFM4IEHoK/GilqdhR+cEYXu2wwvgFu5pkXcCpg3I2l6kyhQz/wBGTQ8r7ad9m7lE8RsDfJMufnStR+rNOSinYVU/1Z0yv7/d5syuogIaQEM/xqNZFy9dlupzQbKD7whsSGdi2FKwTXnkFJHCPwBbxXnkrIgbT1+vpcJ5+Q5FpQKlTW4mmDjEDaCFoZY8WLRXCd30rjx7Zi5Bqc8xGIQsXCaBEbTogxZWjEGy1GaCGKziKA1wKW9av10lV6wyHRbAfoZhoZnJM6ad X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2pkmCsPrTazbAaHz5U+cPDvzt224oOe5fzUlYGFCpNLb7Jw13vDQsnbfcs/9NHMa47X02ccW31Yaht604eE/j3IWjvDEq8OV6jiENzncptiIKvW7mid7LTz1eL5u9w9O5Hb6sKIO/qrzLwW+LCNhjnKYyjTf7XP5gH80iYrvli098XmTRkf7B0TgO/h4129GUT1zCCmRreZK54aLE0sy/oFXK7iO8qmoMEzXDLlA37Bhng+vgscDPFDpnVkcP8A9X/GtpZhZO9m5L57LSA305jchfpvRlAFSvBSeDF1tLZLnExGwvdRtr01BtYpf3h/qvVivSWMmusLY2WM19Uu1OruhymY7VuvzX28oNMF0Wh65XEuG46ruZ4LA9xrrGbAngKDTWgvLgHlBVy6uiRobmR/U4SW6RXk49IT+X6bDu6XQt+rLFdeQh6+/zqacWYsJ4y2bH8dS0/T8sDZqC9OZP43qjsrILSlSgvUCU2Qv7QbZXLyi0rOP6GX8C6AdXAbsObVi9NU3fW4i0iYKl3ytzp9wTM6CMWRlU+IFlgAIlAcS21ejRQf3/fRGw5iH6ox5HlRQ0TkfcCz6qAs3bnfOcg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n8494FeET+IGkUDD3jD4WoktwJfyRbB1/Wt5JrGg/8dRmzKKPVa0rRbyjdsGilj1JPivmBxUh/kDx+C573vziBgt2I4/JNDDyW5YYLAMRzNtXuccKXoGAc+IsevRNoEey3kRZroXnhr/dp+HViW5KBYf8QRdOhPox+VTPbNc0l/oZ0OpYoFQ4p5IXTVsYkM43J+SiAmfxZfy0SkID8OvUiCRXGxdoBYlnkaP+RR1AMm7kF5xdHa6JBkMEr/UqIktS+FvtxhJtunnEIwZdJELoyC5a7uUhrWjFLRjlPUGKIqftgWLpwf1ScRbGpKOEKFyEcjgEtAx5hAOk2L5MX6iiNcJkGl8arpM/LogIq5927vSGVFTagKm4AY7vuQfHYIAO/KqH1wcUupjujkMoqGNBSD4+0Lj3N67TUz4zdqaawMsn4q7r218sW7ryxwOtK4sNblOGvbCfD8MHWq/94cv7ros4KU4NyDx4+kdyLavaP/z8vbMpJbxYqrNh7zlwaGJsCufk4U9vvvSeKBTIDjNNaWXvS3NunHOShTeV9QEEpCuINuViAZ3T1rIg/QcMU1n1cKk3mZFGJfhdLIJl1CUmQLZxLJqNZMX9SYsdRbGq9nQgZIqJIgkskOoUqnkN0USCA2E4bKQv08zuj0K4ubAA6sOMKXVoXAsX/FHZyt4BOiE6CunTpaghC7iruWLWbL+cH7uUOXBfVjAKiEjra65nqQf5wLppPbFsPxxCY2FNWzSifwjeUU03Zafn9Ai8/cHHRSNj1bbXMgv7u1sJkDNY8QKAV1BYz5WF7UJZPiiBhDrzHoCJ/nmIQelEHqX2z8BffXDLm/ii+Tjk+yDiEFzMVoXPu5955U39mzxEBEdz25FLmAx4vThfl02NgKaCYPummCtg91+4nM5jq+PbKe8nXCiCOTEDzaQsiEXxr5b287QSUxbchy9XVhqYLpctAd5z2fTMozLPvEk22Mhu0xv+zhNWO/xazG0KOdq7OjBE6cfbw0P1SjsYRurGKrkODJM22tQXVpR9gTanTrJdhB5sJLoLz2lcqQ9cOmxTBl5UN7JlQ9T6mKpEKMgYsXZPhIdNB1qX/0QB7aLuhyM2SR32gzKDvczpR3hTnbD3mjwF1BO0TkU9w9iT1xjJukjswaLFewEptIy4BmTVuYL3uSR4/+vU/Z/1vjfjNl5qroXMnP7IGXP+8iaDwKWg/KoCCSBfEMDLvZIAYNXWdvzTfsWXHFqYChjGfL9Pmy3lh69yusjdNfnB/yc4/C1EglpOQeCtoXsa/+Aco0xV6py5irlcAJ/87v1Oe9qeFj0BdtcU97LzyChipLDxaeRHPfK+sHaOg//Imc3Xbv/eUXsUutK4Ox7S0FI+BhTn0QBxvhi/SBRhe/RiyuFCMZIqX4iwspRylC9ZfO6s8H6hw2/rqDkYkz8y7s3Wc12nxOdYc2sucSCgOHkjWpdQZVnBczf/qfwfa+6+Gvf26Ymq+uoLT6hMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdc6cd9f-b3ce-4596-53cf-08da25a35f39 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:34:43.5710 (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 07/32] tests/Makefile: Make DEMDEC etc. auxiliary functions more flexible 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: cneIuLBUYnfD Add a parameter that allows to add additional requirements. Also add FILE_PROTOCOL to all the auxiliary functions that use a demuxer. Also fix the requirements for the fate-mpegts-probe-(latm|program) tests. They have misused DEMDEC. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 20 +++++++++++--------- tests/fate/mpegts.mak | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 5e4da2c42f..e175631258 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -68,11 +68,13 @@ XYES = $(if $(strip $(1)), \ yes) ENCDEC = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ - $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER) + $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER \ + $(3) FILE_PROTOCOL) ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ $(firstword $(2))_ENCODER $(lastword $(2))_DECODER \ - $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) + $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER \ + $(4) FILE_PROTOCOL) # RAWVIDEO_ENCODER and PCM_S16LE_ENCODER corresponds to the default codecs # for framecrc. These requirements are not always necessary. @@ -84,16 +86,16 @@ TRANSCODE = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \ $(2) FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER) -DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) -ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) +DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) FILE_PROTOCOL) +ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER $(3)) -DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER) +DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL) -FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER) -FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) -FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) +FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) +FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER $(5) FILE_PROTOCOL) +FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER $(6) FILE_PROTOCOL) -PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER) +PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) # Allow overriding CONFIG_LARGE_TESTS via LARGE_TESTS, if set on the # make command line. diff --git a/tests/fate/mpegts.mak b/tests/fate/mpegts.mak index bbcbfc47b2..eaca8ec289 100644 --- a/tests/fate/mpegts.mak +++ b/tests/fate/mpegts.mak @@ -5,12 +5,12 @@ PROBE_CODEC_NAME_COMMAND = \ ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name \ -print_format default -bitexact -v 0 -FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-latm +FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, LOAS_DEMUXER) += fate-mpegts-probe-latm fate-mpegts-probe-latm: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts fate-mpegts-probe-latm: CMD = run $(PROBE_CODEC_NAME_COMMAND) -i "$(SRC)" -FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-program +FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, LOAS_DEMUXER) += fate-mpegts-probe-program fate-mpegts-probe-program: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts fate-mpegts-probe-program: CMD = run $(PROBE_CODEC_NAME_COMMAND) -select_streams p:769:v:0 -i "$(SRC)" From patchwork Sun Apr 24 03:33:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35399 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219601pzh; Sat, 23 Apr 2022 20:35:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo/NJ5TVdmkZXSzpPV+DUA5ycrA/bKF27Il2gilvPvhfv3adWW1Gn0enXPVP7Mj733vWov X-Received: by 2002:a17:906:3144:b0:6ce:de5d:5e3b with SMTP id e4-20020a170906314400b006cede5d5e3bmr10559224eje.689.1650771328353; Sat, 23 Apr 2022 20:35:28 -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 ey18-20020a1709070b9200b006e8b121d517si9310444ejc.793.2022.04.23.20.35.28; Sat, 23 Apr 2022 20:35:28 -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=DDlE2dhu; 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 E15F268B37F; Sun, 24 Apr 2022 06:34:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3658E68B2D8 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mfymJiJTb5SJfnBdkKDQfYrZIORRqoOM6YyCctfXmT93rhs3IQ1MdOY/O+jQmQCck5LwKul8BQbTIvQ0P8q2GA8kERQXsYG5LfR4lbA8BnMnxRAFVBzcsMmG+8IdVlrQ2LRTPCrXFXZc52nPt8E1jF2SW3HbVLF1uK/12152TGeooivklYuJnfjhC+rZ8bOBk6OSBy5eodiH9QY4AZWrFvUYbbHJ8/EpyrWQOhwLoruTxFTEI6JBDOnyyKEbzdnYyLiABBexO939MP84zxljwmwL8x/sWvKKeZ01/CIuKYc1MvUGXVnbR9Jg84uf9RyzZsWAnsseG/v87LvphFDt+w== 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=ws9oTJhXDGC3Attd3E8hTOSv4Ls39otGt7xNqIbBepM=; b=k+dn6Vz5MezOISyYD7c5c+gvzaJ1SYnIJv7FcZCbqL1v0Z+0gt5U4jt/K9G0USOeG183XVF2JmP4k2/u4D2Rd64KB8z00ZWvgvWzxOllN+UZS6cSyULNa6DFOOdnYkWii6b7XhL/EFxwrXKG2EXx4TpYZG05ZJnZZDlb9nUGKUkpFcyLgsAEgP8nUd67Hs3Qs6bKXu9v/EwW5EglA8792PWzx+f4yqUvDkVjhNyVcp8rOyVumBkl5Y7ecLXdw8SFOpnhtvYyIM51eqxSTcKpndZixugRmX+1iPqSXxqqCmUQ4ThHXfnobY6ILDpJuHOSy0hCEVhEsT+eCN3SmHqI9Q== 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=ws9oTJhXDGC3Attd3E8hTOSv4Ls39otGt7xNqIbBepM=; b=DDlE2dhu+xmVS3yoM8FpS/wSNr7YZXFjkW7CdDlRwvrkL19mzHNvP6Dju5rUX7M8k4r/JiBDmEzkP+svQI0c7VeAAoySnXmBCMARrtLeg40IUmlGxHtYkYBBLJPBkamUH3KbI0sF77VHQtEcVW5+f58OTO3gbtLn5BR4Ao9DjggfT2N0wpaKTRJvwY+idEwiWg+ospMsncIdZPCiEUxt9TwTCxVPM56Tuj90u1f0TlfjCjn6OgWpIK99cYAoAghGcRwqNJafmw/FzJWZvZlSXiahVyv16M5+Ca2t86tl7XX27SohNgxHgtzqtXoY5eGYO1lVX7cksHMCQ+JPEX3EfA== 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:34: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.5186.020; Sun, 24 Apr 2022 03:34:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:53 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [MjdyYN4TlzBhqNAIdco9WzYA+7Gx2LB3] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c000c443-3748-4e40-5a0a-08da25a35fc8 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXfeWFBiRjEkCSMOMXxj1MnL4g7xBYUmTLIT+tIn5x1pCmXCUswyEHByzVWVbM9FxHLoHuW6XIhgZMTKe4jJPhrVzVMACoaWJ7AEXEIXSf6mq0MiM6LJTZv1o/z/m5C62Cd3uYWeRmxq+bMMelBueAiFmiVOvLTQyWI2MgJtXn3CUMuQma0gjTaa3zn/r3ligLEDPT2MKHL3zn1iLo3Td3VkBhW7lax00qnZtSs2vz8cFU8usTN2eqYju79VsLQGlrPFBt7KDuNjl3Fek8Rte/go7CWJsAihGZA1dvX09ULdOQ//MS+NhU59VTYLxhCFRftlGwPTh29uAE1Nprxx9MFeK70h3V2lrO5OMl+E4a531f0c/5vRriRy33f2Sg2f4a3MdqGQOVqpn+i4Zrxf/esxvE3iaxhMXmLx3MFtLhr9ZJLP8isOOMSebh6/ifyuxOi2bwh+ti7Zgaf8OsoDeQlkMulPw+hENuvvAx8i4bMlQgqddX8TYxMtfSiyC9oQr8OS+AAdMy+cBL9hdeSIuLl+lUc+TmkYOndO4uG87JFkGGe1HMZt5P3htH0imJBd7VI9FweLy9HrezF+1glCUbd0jThkfFLrh4uVX7IzpDXdkeBvptVFI4thBnczx0R6TLvm4p0Qmp53vAgrzV+OaJtoHRlUxCTtE1ctJymb2gzbubdLcycjTjdWg== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wnl2iTRG0Zh+otEnBzQRWMtbwKdvrhiGokw84Z4b4AV6hz0PrMFJVHBedTkBNC480ZpUwhilQPjHDBs3k++Ufk1grl637fgueVgpTqlqoD5+ugetyyJvjCCzHWGkSm7MxxQSda75Oi28RDXtJEYxUnl8bDJEITsm4EZMVHeUTJ6EgNjSr1onwhl14dga5oNaVo9hju/MptbNC2Bqhtsk5SYfRHCdoqlq5kQjq8ibt0/P+TcquRb/HmkTPNH1AIWdKTiEetNeXkOD8zm5NHQzirTB1YQ0OGr90Hd+iZB8/tQoTpU5f0qx6p3jziYgVlvOs+c0+Y1L+dYB70n0oa5feJKGJw7EYY2bUAWgwua623OuAUO765ncka9lTRrVIloxeT3dAABXkwtoWRJ6fzh7ydNwYkHQF344zd3tFtq0Pxb3QWp7zGDfizmUkwyPwseynmsm6ek/kghanxDNE9ZFqx6voo/5nQvUcUB8pt6xlA7vpCRI0ve8g6pB91DfQAMQRp8AMYej4rpMmqsozJXMrUR6PcC0230j5hw6O4puinraPaOXlmUnBGfCxi92eKy6Uuo16A8Stt+pEjEEt5sI+A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sPkpQFuedQJwMhAd9YWCzSlBkvJ3D3pg9sjhmpWh5mrD0Mk5xTOAjbbcZvngns6gtOQzFRw1MEcV0HZB7iIcAgI1dgd5dL0bPmwWdnrg2xijiPgj/Bch3WaRKK6SV5dZGiS5wuYRuTMLXll5dpgyX0P9dJqbvPnnNFYHVP/9hk/LAvl9u6mS1dp6V+HE6KyseN2xllcnbJHD+GR16OGSQUkGAtFT0Dfd+OwSblmeTLu1oQARjC6DukafiiR3jI2rS+TqaPi7/g6wr18cHNevjMBfnJGMLCtXVpXCC0RLha12nmBxmk16HNtUT9nlttZ/HwmFdVa5ziWAVq/P+7wznBzjsBHIIin/G/d6SsZ+mefI3UT7ZYnd97SAowRHiJVY7RqakySouRx/N1QjqoJbuzz2F04TP0l8jOGMfNbIsxmo7Y/3LqLn5Xxqz+ZGt1IfNIUbZ4S+xW0CKsuVB4GMue7ncR/YPKZoeA6N9iLMlrdyEXOe+AEbV8Q/iU1ctB8N8gnnRh4KOEOHPgCsc2p41eSYxI4UKV+8j7aOtuOmZglkrRmevseJQ8XJj9XjzuyeoM0WXukjKTA5pETdIXZXB8t/rchUVx3nrnopMcSZt42oM+s1+Q/cukkUuGxKvxXuPdMdW/h0uOHZFrKjdYAxkjaasq+cLgVer7fkffS/W4tERjOQQcT1cRX47DSBCBp5Z61TtHBQzJKGHDGkZCu/HNg49kvx0qogJNMWPY1vBWFFWCe/3NKk9OnYJ8KveKuvPjxh2n2m2JDkbw8OG2xXHyshA1B2gOpLakQPBYxGYPhnIerCly09iXLj1Gpx4lVieQKE7NQxME0KhmvbQjb411XPIgrITzjUjU4zKIfJNXH1icbyePiKXrDRWbHekRoZ79rJdVsCB6my0lrHYUybmgfIewnVf2jKls12bMcWBop65yQIC+hllxvjXZbxj/2TcaoGOW2FM6fyE/hme1IVk+qt0g+n2v/O/VG7CcO/wPPPBavDmSCDLh9Vce9LIXz79QdEfowa0hkgMnuSIHT7Lrq+ARQkA1IULPfH2dJXfrxheVsMw78hdfBIuRW0EBHJBEL27AG4oihGVfIYGCb90iykJuGiXhZQdUAZYFL5+MctWYSVvPX285RIrrsowUfc+tq2hsy9WJcr9IdCQGe0hLa0W17peBtQPqSIV18PwUWVx/TWqmh//P+CoweoX3cxgwIkBhVJCEbSfK2cFyb5bTW/xo2EOrrLCzBxKryR52F72ah0I5IbeoNhal42IRjukAmjkZTd1tvUExI9rjwReymj2+wVJ3J2wdkXcpD4D1bkQYsmDPPkDJPZ6prRKQd+42muEYQoC/0Gwtfzak5BufP+aNWILUQVgQd8aXhU1KLj0aD6UAfAL/IA20G38B9asee3L1ML+0fPayXM0j+rzyDwvVfK+tofB+AWx8QBDU5QJvL2GIh13WxafxETdQsQ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c000c443-3748-4e40-5a0a-08da25a35fc8 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:34:44.4927 (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 08/32] fate/image: Fix requirements of tests 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: 13XWtvZXDDWy Also reduce the amount of repetitions a bit. Signed-off-by: Andreas Rheinhardt --- tests/fate/image.mak | 129 +++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 72 deletions(-) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 63076f8ded..c8e0d321ef 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,13 +1,12 @@ +ADD_SCALE_IF = $(if $(findstring -vf scale,$(1)), SCALE_FILTER) + FATE_ALIASPIX += fate-aliaspix-bgr fate-aliaspix-bgr: CMD = transcode alias_pix $(TARGET_SAMPLES)/aliaspix/first.pix image2 "-c alias_pix" "-map 0 -map 0 -pix_fmt:0 bgr24 -c:v:1 copy" FATE_ALIASPIX += fate-aliaspix-gray fate-aliaspix-gray: CMD = transcode alias_pix $(TARGET_SAMPLES)/aliaspix/firstgray.pix image2 "-c alias_pix" "-map 0 -map 0 -pix_fmt:0 gray -c:v:1 copy" -FATE_ALIASPIX-$(call ALLYES, FILE_PROTOCOL IMAGE2_ALIAS_PIX_DEMUXER \ - ALIAS_PIX_DECODER ALIAS_PIX_ENCODER \ - IMAGE2_MUXER RAWVIDEO_ENCODER \ - FRAMECRC_MUXER PIPE_PROTOCOL) += $(FATE_ALIASPIX) +FATE_ALIASPIX-$(call TRANSCODE, ALIAS_PIX, IMAGE2 IMAGE2_ALIAS_PIX) += $(FATE_ALIASPIX) FATE_IMAGE += $(FATE_ALIASPIX-yes) fate-aliaspix: $(FATE_ALIASPIX-yes) @@ -17,29 +16,29 @@ fate-brenderpix-24: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brender FATE_BRENDERPIX += fate-brenderpix-565 fate-brenderpix-565: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/maximafront.pix -FATE_BRENDERPIX += fate-brenderpix-defpal +FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX, SCALE_FILTER) += fate-brenderpix-defpal fate-brenderpix-defpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/rivrock1.pix -pix_fmt rgb24 -vf scale -FATE_BRENDERPIX += fate-brenderpix-intpal +FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX, SCALE_FILTER) += fate-brenderpix-intpal fate-brenderpix-intpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/testtex.pix -pix_fmt rgb24 -vf scale FATE_BRENDERPIX += fate-brenderpix-y400a fate-brenderpix-y400a: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/gears.pix FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX) -FATE_IMAGE += $(FATE_BRENDERPIX-yes) +FATE_IMAGE_FRAMECRC += $(FATE_BRENDERPIX-yes) fate-brenderpix: $(FATE_BRENDERPIX-yes) -FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP, SCALE_FILTER) += fate-bmpparser fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24 -vf scale define FATE_IMGSUITE_DDS -FATE_DDS += fate-dds-$(1) -fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds $(DDS_OPTS_$(1)) -vf scale +FATE_DDS-$(call DEMDEC, IMAGE2, DDS, $(call ADD_SCALE_IF, $(DDS_OPTS_$(1)))) += fate-dds-$(1) +fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds $(DDS_OPTS_$(1)) endef -DDS_OPTS_pal = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -DDS_OPTS_pal-ati = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba +DDS_OPTS_pal := -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -vf scale +DDS_OPTS_pal-ati:= -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -vf scale DDS_FMT = alpha8 \ argb \ argb-aexp \ @@ -90,14 +89,15 @@ DDS_FMT = alpha8 \ yuyv $(foreach FMT,$(DDS_FMT),$(eval $(call FATE_IMGSUITE_DDS,$(FMT)))) -FATE_DDS-$(call DEMDEC, IMAGE2, DDS) += $(FATE_DDS) -FATE_IMAGE += $(FATE_DDS-yes) +FATE_IMAGE_FRAMECRC += $(FATE_DDS-yes) fate-dds: $(FATE_DDS-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, DPX) += fate-dpx fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx -FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX) += fate-dpxparser +# The following sample has frames whose dimensions differ on a per-frame basis +# and therefore needs the scale filter. +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX, SCALE_FILTER) += fate-dpxparser fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/lena_4x_concat.dpx -sws_flags +accurate_rnd+bitexact FATE_IMAGE_PROBE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx-probe @@ -226,7 +226,7 @@ fate-exr-rgb-scanline-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/e FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l2 fate-exr-rgb-scanline-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt gbrapf32le -FATE_EXR += fate-exr-rgb-scanline-pxr24-half-uint32-13x9 +FATE_EXR-$(call DEMDEC, IMAGE2, EXR, SCALE_FILTER) += fate-exr-rgb-scanline-pxr24-half-uint32-13x9 fate-exr-rgb-scanline-pxr24-half-uint32-13x9: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_uint32_13x9.exr -pix_fmt rgb48le -vf scale FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l1 @@ -328,10 +328,10 @@ fate-exr-rgb-scanline-zip-half-0x0-0xFFFF: CMD = framecrc -i $(TARGET_SAMPLES)/e FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR) -FATE_IMAGE += $(FATE_EXR-yes) +FATE_IMAGE_FRAMECRC += $(FATE_EXR-yes) fate-exr: $(FATE_EXR-yes) -FATE_JPG += fate-jpg-12bpp +FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG, SCALE_FILTER) += fate-jpg-12bpp fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg -f rawvideo -pix_fmt gray16le -vf setsar=sar=sar,scale FATE_JPG += fate-jpg-jfif @@ -341,7 +341,7 @@ FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIP fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "" "-show_frames" FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG) -FATE_IMAGE += $(FATE_JPG-yes) +FATE_IMAGE_FRAMECRC += $(FATE_JPG-yes) FATE_IMAGE_TRANSCODE += $(FATE_JPG_TRANSCODE-yes) fate-jpg: $(FATE_JPG-yes) $(FATE_JPG_TRANSCODE-yes) @@ -358,20 +358,20 @@ FATE_JPEGLS += fate-jpegls-7bpc fate-jpegls-7bpc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpegls/128.jls FATE_JPEGLS-$(call DEMDEC, IMAGE2, JPEGLS) += $(FATE_JPEGLS) -FATE_IMAGE += $(FATE_JPEGLS-yes) +FATE_IMAGE_FRAMECRC += $(FATE_JPEGLS-yes) fate-jpegls: $(FATE_JPEGLS-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict fate-pict: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/TRU256.PCT -pix_fmt rgb24 -FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, PICTOR, SCALE_FILTER) += fate-pictor fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -vf scale -FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba define FATE_IMGSUITE_PNG -FATE_PNG += fate-png-$(1) +FATE_PNG-$(call DEMDEC, IMAGE2, PNG, SCALE_FILTER) += fate-png-$(1) fate-png-$(1): CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/png1/lena-$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24 endef @@ -394,16 +394,16 @@ fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE) -FATE_IMAGE += $(FATE_PNG-yes) +FATE_IMAGE_FRAMECRC += $(FATE_PNG-yes) FATE_IMAGE_PROBE += $(FATE_PNG_PROBE-yes) FATE_IMAGE_TRANSCODE += $(FATE_PNG_TRANSCODE-yes) fate-png: $(FATE_PNG-yes) $(FATE_PNG_PROBE-yes) $(FATE_PNG_TRANSCODE-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, PTX, SCALE_FILTER) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 -vf scale define FATE_IMGSUITE_PSD -FATE_PSD += fate-psd-$(1) +FATE_PSD-$(call DEMDEC, IMAGE2, PSD, SCALE_FILTER) += fate-psd-$(1) fate-psd-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-$(1).psd -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24 -vf scale endef @@ -433,7 +433,7 @@ fate-psd-duo-tone-color: CMD = framecrc -i $(TARGET_SAMPLES)/psd/duotone-color.p FATE_PSD-$(call DEMDEC, IMAGE2, PSD) += $(FATE_PSD) -FATE_IMAGE += $(FATE_PSD-yes) +FATE_IMAGE_FRAMECRC += $(FATE_PSD-yes) fate-psd: $(FATE_PSD-yes) define FATE_IMGSUITE_SGI @@ -446,36 +446,31 @@ SGI_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 $(foreach CLSP,$(SGI_COLORSPACES),$(eval $(call FATE_IMGSUITE_SGI,$(CLSP)))) FATE_SGI-$(call DEMDEC, IMAGE2, SGI) += $(FATE_SGI) -FATE_IMAGE += $(FATE_SGI-yes) +FATE_IMAGE_FRAMECRC += $(FATE_SGI-yes) fate-sgi: $(FATE_SGI-yes) -FATE_SUNRASTER += fate-sunraster-1bit-raw -fate-sunraster-1bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-raw.sun - -FATE_SUNRASTER += fate-sunraster-1bit-rle -fate-sunraster-1bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-rle.sun - -FATE_SUNRASTER += fate-sunraster-8bit-raw -fate-sunraster-8bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24 -vf scale +define FATE_IMGSUITE_SUNRASTER +FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST, $(call ADD_SCALE_IF, $(SUNRASTER_OPTS_$(1)))) += fate-sunraster-$(1) +fate-sunraster-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-$(1).sun $(SUNRASTER_OPTS_$(1)) +endef +SUNRASTER_OPTS_8bit-raw := -pix_fmt rgb24 -vf scale +SUNRASTER_OPTS_8bit-rle := -pix_fmt rgb24 -vf scale +SUNRASTER_TESTS := 1bit-raw 1bit-rle 8bit-raw 8bit-rle 24bit-raw 24bit-rle +$(foreach TEST,$(SUNRASTER_TESTS),$(eval $(call FATE_IMGSUITE_SUNRASTER,$(TEST)))) FATE_SUNRASTER += fate-sunraster-8bit_gray-raw fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/gray.ras -FATE_SUNRASTER += fate-sunraster-8bit-rle -fate-sunraster-8bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24 -vf scale - -FATE_SUNRASTER += fate-sunraster-24bit-raw -fate-sunraster-24bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-raw.sun - -FATE_SUNRASTER += fate-sunraster-24bit-rle -fate-sunraster-24bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-rle.sun - FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER) -FATE_IMAGE += $(FATE_SUNRASTER-yes) +FATE_IMAGE_FRAMECRC += $(FATE_SUNRASTER-yes) fate-sunraster: $(FATE_SUNRASTER-yes) -FATE_TARGA = CBW8 \ +define FATE_IMGSUITE_TARGA +FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA, $(call ADD_SCALE_IF, $(TARGA_OPTS_$(1)))) += fate-targa-conformance-$(1) +fate-targa-conformance-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/$(1).TGA $(TARGA_OPTS_$(1)) +endef +TARGA_FMT := CBW8 \ CCM8 \ CTC16 \ CTC24 \ @@ -485,28 +480,17 @@ FATE_TARGA = CBW8 \ UTC16 \ UTC24 \ UTC32 +TARGA_OPTS_CCM8 := -pix_fmt rgba -vf scale +TARGA_OPTS_UCM8 := -pix_fmt rgba -vf scale +TARGA_OPTS_UTC16 := -pix_fmt rgb555le +$(foreach FMT,$(TARGA_FMT),$(eval $(call FATE_IMGSUITE_TARGA,$(FMT)))) -FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \ - fate-targa-top-to-bottom - -FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += $(FATE_TARGA) +FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += fate-targa-top-to-bottom +fate-targa-top-to-bottom: CMD = framecrc -i $(TARGET_SAMPLES)/targa/lena-top-to-bottom.tga -FATE_IMAGE += $(FATE_TARGA-yes) +FATE_IMAGE_FRAMECRC += $(FATE_TARGA-yes) fate-targa: $(FATE_TARGA-yes) -fate-targa-conformance-CBW8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CBW8.TGA -fate-targa-conformance-CCM8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba -vf scale -fate-targa-conformance-CTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le -fate-targa-conformance-CTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC24.TGA -fate-targa-conformance-CTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra -fate-targa-conformance-UBW8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UBW8.TGA -fate-targa-conformance-UCM8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UCM8.TGA -pix_fmt rgba -vf scale -fate-targa-conformance-UTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le -fate-targa-conformance-UTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC24.TGA -fate-targa-conformance-UTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra - -fate-targa-top-to-bottom: CMD = framecrc -i $(TARGET_SAMPLES)/targa/lena-top-to-bottom.tga - FATE_TIFF += fate-tiff-fax-g3 fate-tiff-fax-g3: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31D.TIF @@ -515,7 +499,7 @@ fate-tiff-fax-g3s: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31DS.TIF FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF) -FATE_IMAGE += $(FATE_TIFF-yes) +FATE_IMAGE_FRAMECRC += $(FATE_TIFF-yes) fate-tiff: $(FATE_TIFF-yes) FATE_WEBP += fate-webp-rgb-lossless @@ -524,7 +508,7 @@ fate-webp-rgb-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lossless.we FATE_WEBP += fate-webp-rgb-lena-lossless fate-webp-rgb-lena-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lena_lossless.webp -FATE_WEBP += fate-webp-rgb-lena-lossless-rgb24 +FATE_WEBP-$(call DEMDEC, IMAGE2, WEBP, SCALE_FILTER) += fate-webp-rgb-lena-lossless-rgb24 fate-webp-rgb-lena-lossless-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lena_lossless.webp -pix_fmt rgb24 -vf scale FATE_WEBP += fate-webp-rgba-lossless @@ -541,10 +525,10 @@ FATE_WEBP += fate-webp-rgba-lossy-q80 fate-webp-rgba-lossy-q80: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgba_q80.webp FATE_WEBP-$(call DEMDEC, IMAGE2, WEBP) += $(FATE_WEBP) -FATE_IMAGE += $(FATE_WEBP-yes) +FATE_IMAGE_FRAMECRC += $(FATE_WEBP-yes) fate-webp: $(FATE_WEBP-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, XFACE) += fate-xface +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, XFACE) += fate-xface fate-xface: CMD = framecrc -i $(TARGET_SAMPLES)/xface/lena.xface FATE_XBM += fate-xbm10 @@ -554,9 +538,10 @@ FATE_XBM += fate-xbm11 fate-xbm11: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/lbw.xbm FATE_XBM-$(call DEMDEC, IMAGE2, XBM) += $(FATE_XBM) -FATE_IMAGE += $(FATE_XBM-yes) +FATE_IMAGE_FRAMECRC += $(FATE_XBM-yes) fate-xbm: $(FATE_XBM-yes) +FATE_IMAGE-$(call ALLYES, FILE_PROTOCOL FRAMECRC_MUXER PIPE_PROTOCOL) += $(FATE_IMAGE_FRAMECRC) $(FATE_IMAGE_FRAMECRC-yes) FATE_IMAGE += $(FATE_IMAGE-yes) FATE_IMAGE_PROBE += $(FATE_IMAGE_PROBE-yes) FATE_IMAGE_TRANSCODE += $(FATE_IMAGE_TRANSCODE-yes) From patchwork Sun Apr 24 03:33:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219649pzh; Sat, 23 Apr 2022 20:35:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzKEgiwEiZ7F3xUE1RBfhPmBUCYaDNZG5dWRdr6KX/+2bHuR13r03Jqh+xDzb9o4NKpsIH X-Received: by 2002:a05:6402:34c7:b0:423:d44a:4c6c with SMTP id w7-20020a05640234c700b00423d44a4c6cmr12571971edc.356.1650771338697; Sat, 23 Apr 2022 20:35:38 -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 f1-20020a056402160100b00425b4f69f0asi5427598edv.101.2022.04.23.20.35.38; Sat, 23 Apr 2022 20:35:38 -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=BNDN3FSN; 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 EF1FD68B35A; Sun, 24 Apr 2022 06:34:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 588E168B2F2 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PDuw75CH/r8n+VC5VpSrwaKm/zBfKu92KBHMvwOSmh+q9vXcni2dddYdGuLoIH1VnojbqWN+XfsLpvKI3fKCCEKxIawDE1hJr3YFQY67V4q8FE22DYWKSQlSXhdrGQ+LooG9hLgVDHOVaYTKwy7Ync/31CJE+r8H12gZ7J7t7tXXH+bVlqh+q05mzWP/gTUTVK+i4kshrhW8zfNqC8YDaOjr0NEK7lHE1PoKl79FB2vMHakoR1BkwT8bKS2faXoUaxFoY4ISnMMaj0t8LKX6/dzv2FoZo+5vvoK5kjwI2QGXGAsU4bZ28H6F9iUGa8zrMNPAfdaC4vD9c1VdQY+63w== 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=ceQEooV85Jj9bc9XeeG7kbzIlytlCHT9Hn9s5sFINx4=; b=DWgD6J+YoZyWYwonunlm0PatYPcpP/sIY+fOott/gXwP75VwAwqDb6BIuGePkoBYp+kBrLjX7KWsHWMtGnhOxM/3gYyM0V5fxuunwkesx82+1zFlwpsOlNkYJgigToe+QRmMgipBC7aiw7oB79xGy7xXXGn8hYwQ253xsMhk7OMvMZyb1loaZkXeaMDtVY+WIWX3cTDOuk/jhV1b6cruN1e46UPFG0aZHaCnBJOBWz1dCi/M8GES84nLE8KiKvw0spysBYK0j+5m5EIi5kUDnZPu18BZBL8W/21vMyKg1doM3rYKi/jmn5Ox1ekpS5iXFpUZJcT2H6klGxcWHexsKg== 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=ceQEooV85Jj9bc9XeeG7kbzIlytlCHT9Hn9s5sFINx4=; b=BNDN3FSNBB0C2E749wh6HXLR4sZFhbtPC9p1HWL4oVrB/tfZeRXwKNl96bN5CPKg8TLowKIgTnBj3Cdyq62KGRzospD9NaqiEpccU2SPuXx0yeoiwgDbSEgi5ZlemQ6+xm9B4jm+HNjbVtCfAmc738y/Zk6KyCRIM5gdDzXvzMSHIqaxrtG5PxOQXRPtW6V1sF3FnJm1PwleGIch+3Rb/2HDWOcnTiiSeRJdY2CtmlTuMGJerr0oup4v6PPdCzl9+KYTe41MNgWqJKxGOrOoMoXhdsOEGcv/r/b9TmVvdLJ/l4r282WVDXXFm9z2jKFazZX42F1CKrQ0WMTXaU1w0A== 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:34:45 +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:34:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:54 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [lnz80y6rFLJTsWyLhXumWuW9vsszKbC0] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38334d58-4b91-4adf-9309-08da25a36057 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsD4rNWXL7bI8FSMaAYlfs4biuQtkzd3io/ll6qxN4YeMY3SREp3UUIu3Hw1Y3jBXp/Gkt17z+7T5Sf46Q538p1+sA+41oUuf1DqJRGWv7i46GmyWLOGgm059Cc4EgfA9mFCjR2fiV1OasjkPx447tjQEMYSNa5Nn+7JhVrJaFkeOs+SNMcz2B38sGHHnLuCVK/xL7bt1tLb+iWWkc0zdybRPsY5VQ7ss2uyChZyJctkMTEUdTjAz2zYel54am3xlySYQhypS8QO569Cp2ndHKmvuN01OiZcEaDO71x0zJ7xMfIvy0npbLmoL8lo4v/1ruUkWmq63YXsJIAsMK+pl5ORFwKiHo/oinrwiI6xNlNL1J69o9OC+RvKwQE9yeyC4ohbc/4SZuNPlqT8Vplm/3mzbJfAZQPxoFu712u+rK+DziXYj3GYlNpeUbpA82AdHahlQVwkXFuUn5OM23SEDknSn15KcwVwLzZSlEb4sGL26kk5aBM9nx7DTgK7VEpFcWgFfXMTLGwLWUXiLTAassA0XcikjQ8sYUMfzlNcI/+r4qoQLF0kMzLjshAxoUXmfg3bpdzRl3ySRUPiGe/XtzPYubCYQByUZWz+HGFB9Ufy7IO+S/QBXER/3ynq1pjISM/XJ9uIA2VsuofQP5rblH9Cozjw5MbwoeDQzc/GR32r46c3N11D74E+C16VNorB1/hJFPj06KhwdBfm4Ce1q8N3eUompn3N46I3IYN5DjTvl/VrbrUxpzlNLshOlKSVfqIRxPsEhtKuqIkH9vwuyVU X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NDJDy0cR9QwbZTe8W03To07BG/chBmOswZy478W5AVqSpqbllupvsacl6UTmmBZP0uejXNnHPLtyfNfJHDEY3a4fF4jncp0YZ1tkAxOuoAZ+z0rp2A3HZKHBezPPRugB2IjOnXn7q3alXF3sYbK/WCbH3nWbQuXc6oPdyIqYgd4Vt9CzdyyKM5fLK5ex1wQmpUXlDI6bj0OchPWUU0i8M1C1i2a4eclt/w6IO8yXh7TXZkNJmUyoaI8yKj25Xb3JmyUkEgQziIJ3jhEea8OsIyoIr+ecJe9HyvmveR6Y9EIeRrhvMmeGCBRiPdqrFCC28mRBkQe3ZO6dhGd1ADcWMcuX9kMbQbdDp4tPfgLS9sCCApeiQ1Cg/yYdaBbknvex3lEozBtCw1PDX61dEqJtGdaYxanGQ8yOw123lKMKT1AUTPd68ysCg4kLqMsSDcf4JE9GvvGd58lhYPXsw8N4lF3z7HjlIR6mV3XI5sLZztkNHoeu+9Z/wRthMlw6LhBRoLK5DHXI2YhpS8x5ZSYcp3nfmivuWNhkDSZKtnWP0jfqTuDvMFljgYCZRS7pAfZsIMkCB87GJKg4p64Tf71Gog== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hpxeqbT9jS83J30yTBBzmsdkUs3sWd1DEr+SwFwfoKbEerf3bvHn7MN9ovCKSvdNYNotGFtTsflzcFiWHz/VqakuICCXa3JbJbwvWmeJejDF4WwlcfbYhXO7Wx12iGuexwgMxe3hexYsSIB2iB3g9bDENAJqCpjR4mXANoeoLflN/BQrec5QUpgnmx3XXyGtRM22733MMio04P0r3vmSFhBGp6I2uzAc9K3Fgrq3rFcFEOIFx8Ohc+s+wlHFh+HVt0zFm+Y6TLSx/qDN2Bh8lwcUisTr85gEoVgTipSSV9fbExtjyC0LVSd21vE8CLaWGY6zISQALRnw0MPSm5gxk4XybFJWSl4/8iAdfWms8Qr73J4wgEC2V0zDS8qsdEtO+q0b6EjiFZt9xQrT7GvFn/TAJTCFUxHKFqVT0X48I+mD4hkw5lBZ11pF3+V78Ht3G7Tm5B7QtObCS6a+Sjg5JaCsaYXSEoSKeXYjj3LdiZYWiH0sjgcR4Y2v1RX815caHPC8Zak6Xv2Sm+2hvjaJA8UVEnwOyMdMrI5fO6A04S1fBvwck4nBVhp4uwvm38kXPip97o+CoehVFcTNg0QufobaWmfebPnBoJAFyTDDENqVQ3hEPS86VM3U0pimLowKa9npnH3k7UwXW6s0snjkOxxvo6zPI5SOqjCmh2xva+yZLITj6o0y4Zp7HltvSb0AQkxn/8JM9cOZJvoQZl4U2tITJBUTO0VEvZQLRxn1hvMcqQj2jS5/1dIDxHdwf9kfSoFT7lBYDztorAeH8/4a+J0QmhJsJ1y6osH9/hDz51jqxIBmfLYLF2leqkC5fFfLt3HOmSEuJhiDLB5CCV8yrhqws/GPbD0xDhcr0/nfuNQllfvgIeKq1SSTSsnvSCOY8DYymqo3hAWWJk8dD1cTaMTsV3uZAdE9L57E9ppQHTXx4QEv3Gvrw1Vbi5/f05Gjf7a2ft42S4hcnhXCDREPx9oY90hu/fGWRrIEUMlPA1Sq3ga8eoFcRjMB8OieL/KR+1JysQuWRVp2cO4ZX28teGFcMWbphPtx30NRv5htrSKto89ZqdruIhln9Vyv4ELqJNokSHA3B8vlv+IQ9ZzjCFyHA5vcs3n3ORmnK4dI0BVBfvSoW2106o1Xv1/uX3DH/eUo+rejzWtIp3beq2u3LLv3l/Zvw+77TmULvCLy9FJ/LxqaSbxqlOeLwwHbLCUdvy1GSBvp1fYlQapaSMwcMjkqO9r+7gTVRYIXFc6CQ4YcquCC7/jMQS2LBr6dP4UBw37jCupuehvhNaKHwL/KDWuPMGfcPVyo5fWnSrIvrlu/xXksA1dSAemDaVTxQTlrGa6OkWffWt0ry1JtQFf5Yyl5leolCzYpGtAVacJk4iSLgkjhb1GwDZubY7t6XQIZZN0BrX+SqyaZRf9Rov9i37qQUG4LwCnjWThPngMfOwaLpRqoPU/GAVmQBKYw3Ygz X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38334d58-4b91-4adf-9309-08da25a36057 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:34:45.4782 (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 09/32] tests/Makefile: Add FRAMECRC function 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: hAIm7UQmg268 Intended for scenarios that currently use DEMDEC, but are missing the requirements that are implicitly needed by framecrc. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index e175631258..1c9e3594c0 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -88,6 +88,9 @@ REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \ DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) FILE_PROTOCOL) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER $(3)) +FRAMECRC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ + PCM_S16LE_ENCODER RAWVIDEO_ENCODER FRAMECRC_MUXER \ + PIPE_PROTOCOL FILE_PROTOCOL) DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL) From patchwork Sun Apr 24 03:33:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35401 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219692pzh; Sat, 23 Apr 2022 20:35:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOAbTtRrlsLQ88ci5LK4s7ZrP46rMd9UmHOJ0++/+BLlV8+SVj6bbEEwU8q+ncKap/mSyz X-Received: by 2002:a50:ed11:0:b0:425:c3d1:4547 with SMTP id j17-20020a50ed11000000b00425c3d14547mr9127003eds.410.1650771349736; Sat, 23 Apr 2022 20:35:49 -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 v12-20020a170906564c00b006e7f5b1fb91si921836ejr.370.2022.04.23.20.35.49; Sat, 23 Apr 2022 20:35:49 -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=J5Auaaut; 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 16FFA68B380; Sun, 24 Apr 2022 06:35:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A7A468B2D8 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XwUa+Jpgk4/Y8crN5P0/dSZZw93dD1HC9HJ4WLm+bPA9SY3N52SVyruTDsCrdYlasZBNYJTU4nyfgkLm7K/gNFdKBMxmyrNiifUZsGXBzgUsWXo3eGI01aEmxivIiKVV42el33xr/F+JPPEd9Jwfh5mswhP3eRgqakCtYMRyHPgPVv1NbTdRh4S5wLwnuL/80LQ+9dmlwn3+kBq7ekDKkeIKee1FQ3Gn8Z9y1CeCZM2uZomlS5Lc92tGtlBadn0MDWPJZ9MJBnS1vDzFMkOHlgxp3KcUPHSDbBDEEBkI+w/D09SeuI2t2auWkCfpVqcLdkETbO2AtaL0+G8vPDXsfA== 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=SMBuAmwzfdXZUjnMA1n/MDWvoIC/SR7GyXlnZY5noSw=; b=VLPs9SN3Lpvo8zzlQJwdZUrCo9F+TpnKs4i0kdF4SEyqye8vwT6jzn4jlUsCuPxT8pNGQcchluwRFg4N50iQ9evCm9s7iRcqSFMRxVXex1Pt3XFT2C/ANuoACf7Mx3rLlENJRYEI79CA15EqyDFLywQjb+TWK9/ou4j903RPUOb44ZC6pnH1fF9zii3qQ5VVian+TNwN9+Z026qWiNNqRxSMpmt/DLudePDz2RpOCwnD87FwvyAjVJGCWIUDAW5KqMO54BF/oN+CQLGxRuWPvlXMhxcwIeqGR5iEJaYA16igBd7dp3elkOuuMhaQpuQOFtmS2fF6WaS1bAuYrOsIxA== 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=SMBuAmwzfdXZUjnMA1n/MDWvoIC/SR7GyXlnZY5noSw=; b=J5AuaautcGpSZr2wOAgUl0gCZ/oM0Unj3gAsM/i9fBes1U4580Jdf5MdjYBx41WfBz68q1Pn6zOUI/r9yRZFeHYJFDi+6Cxiz1YHomThFIR2uyWfvclqDlRwebpfM+M2AtKYl4x/OI5khqOanyIwg/gG+ex+l1L5o146Fg+CnD57rRMaU+7fxQQERY64pMn/NjWKeoOJ1B4Fn2D4Tgyw+wkmyXVKnznwyDc8S+TY2OvCO8D607acHwvbVFwFqZy/WNiHWl8gym7s0IwtcDfZIgpARglJ/Z0zJLOys5A1sHRr07/jB/L3zfx5a17KSs0FwXcwtfRYYmXz3shI408BYg== 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:34:46 +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:34:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:55 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [orPHKElg4s+1uEGsIl0/ejJtC0V2chks] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba7c4888-0797-4947-2876-08da25a360e9 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXft0pun+RMeRuXkcKT0wIERuQgALDG5eOazHRuTRi4wj/GHrms0n3EBAWEJ9jFEKN77L7cujJVDz8xoQ4ngsZiT89XGn0d07js/JsHGlyjtOOHhhQBrAZQ7ZtGNZf6ZtTys6bIvNqsncs4rg1VYXH/3EOlkigN/+vrZKayGSCd5G4l4DVbIaiKGtm8ivAZ9rX+YTp1EbUUYaKrXSYsBMNmQhXyWhGS8qaUJELfemR/W3seitU9TfremINd/gGNrNP7VLy4/kUiT8GVgE6tEzsbR1o7RYrysKSC8VLhJfgUggzSOQ06vx78oe3hsySDC6dK0FaoUIEH2Lznl3u8OoECl5V3sKTif9xjvy0zuhp7nENhFD2UAodyiwZ9Ho9DlZ6CMg9xNznoOZKViZ47jk/uahE35V8UMQQbTd5CEENoVW5cl6OAhH3/o3Hw561iavkZSyL4n/IuWixVxTfMny/ySOfzXllkUtxOLtiianoXrnN79XgG0DT4XF1BJtBHVdHo0SaiK1z3eNKEdQsu6i8leWQSn4g37KLuZlaAw7FR0NpEw+VA0cOTNPQ7sHYeiYvPdhdKwIDJZN4k87nhbAp+JZZ4EJ1vtLCg4nH/EKSyotjQFxnh0S8oDYD+ARXUyQwABo/NwgLW5beDUQfhhui1zIBTmqtYtLKR05Kp7crSmmMe+IKyT7Ibgw== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KXDODsFoap+jORHFSKr1UX1UNvTvnXlOluaJrrW2tlkdklzIpD3y7AFWtvUwK9CTFSo0KYgU8vZa5WafeakoJPjirmmxFX0+LCjRwiHFftnoJEkNZ8r68zT9qYE4iirf2jA0TkedobnNj0nKvupFjcEE2FReKniEjgbjbYrzwz6C8fjk3FvCsr/l9uDJ4wb0yfj6x9TAzEb/Or/MI8bCAlvaRW/zFHPqa7IAXeQNh0uXEEuA8X2fDK+xyicVMYZFuM2xJcvjowllb/6/t0gSgmevmjmqun+xUlwsHdLLi+6ctBj6jTw1jZ9YcAH9cFaon3LBjAbTMQWVJODMWABftWUWd72jyqUrYnJSD7kqHkl1+AyGRZ+d8CTwEkz3pqCLzMwViWsWxp54Zp8qYOqAXkA169QqggzBOFpTyPOpiBLzVpuMm8sJrzDWnD51o6JJnNaHuZfvr3/sLDotzRvLs4IlRILAeW5UyrZzkaa08VLTe1xA1FCfQK0X4hsq683i72uJ2Wg8LrOes6x4E5o2/bPxPp/TqHdpSlKAeZTa0LN0yL9+x3ti5aRvaqYdjmAVlCRqSMzuHYxTeQ++ciScWg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Up4+mCnamtFSDUKBDIxl3Fc4qA73ZvLGvmYICtiDNs5lBUTbvhxIp7U5iJh9iCeVTKmP3ClHK30wlAPzyNYKCJlca7rtifapgC3ydBU0ZgVwx4q4i6Ojm3LGn0KLiirtM14Qp/sm3wo/zvCyGorfz9N335xLwBPwQ9Ygs8ARfiRmcwZTw+y8ex2II+RPsg1NRkv+KOkX6oJ/ZET3ptMg1GFaKojPY8536lMYoh8howkDT5Q5OBxbYxuOepgEOmQV+Qxy5w2P2HzFmIzG7sEvcVfvxaV0ZfbYXhOT5nj8gOuQIIXhV9Q6PGAmr/8co0Sacw4TvGJZfhYDOA3Qvjvx00Jw5asoDLkjmtaOCpFrIb8rxR0XkSOOayEjBPTt/lFAgP48xXFkMKihFB7Gc1aaPeKBD1+zCG/mHJBE2SHQXaqeQravkbPwSh/8HyypHLcIM8Sj3u0pRUM7CODxl3jC8brR1uIbgAM+iDwNKWtzrcr3FG83f/dmkdT3PaTwvPyWsvHiApQaL2KT3ft+yg3dDRAxCQL01+i5BsWaM6zf+N2a/GiE7oyjcgCaMI4NV1y6kY3z21Vil/VKFTZqI4jzOb11O+C0vJltKfiD3NFRFUKwagHGejd4h+GhsePxWG2W0YmkTLf7ULFN9bNETdZ/anXAjrqGnptT33/u//R32AdnegVwt2Pxezka6fNwf9K/jZvVwPidmj3K1uYgNnmTNfROOFoZatb7sL05Oca4X46OkZJpFNfCLO8G/+JkHy/x5qz77SqmtT+3ZGBUoCZ1BtA7s9gLO5rnbRSpqNnginwXL40/7SYi8jgy26HbSnpZ1h2utI5ioKg4SkOCYXPSgzcnnS41RGggxqnQ7SgpmD1kBypjynPX3vA1jW1VD/7BcVl5c158vGrEpxeUoJAmCegevDg+53D9nD8QAG50/qMID0QPIAiEFnvjZv+cuq2Cfc+pi7u6LhrS3RgzoUFKsdfKsBu0FgP2M6PtNah9eK3uCmdavmtAwNOPzxrWSKj9YS2oHC0vxO+Jmd8f/HWD61fRNYVmAfn4KvBiA02w6Xq27PqTig+2DrIL9N+cLqC8HFXnQaPOQNhtqgPGIY/6/JZiCaNA8HC5T5zkijW2Y0irZZz9Ex9Uym3T4qn+8brCxLlKy/6jBbg9zmzncPGmxVoD4HZQUl+ZZaiJmdCs/OWjGwhFKqbgYiXrjFja64n8ed4Nih4xbW1oizgHCDnrtiPIj2SCZiiSgqlMzsjFqcgCGqE8AVGN1TFP9EnzOR2lHo/xxld7F9j7PDbELrFcfrmEALfDr/U2FTui6M4kmfq5sX0PTpT3DpFJxnmv2KuPJO11Ai6DNBTTsHrclSOgMakDAGh09O5UODb56hS5mXzn+rJ+A+E6dkv2owDTl3sGntYaWS9i1wsihfxh3JZNgnTIkAmlNe86EcvFj65RlEGx+6j4ZQyxhCTT9L8WbPsW X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba7c4888-0797-4947-2876-08da25a360e9 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:34:46.4323 (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 10/32] fate/screen: Fix test requirements 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: iOzgrupn4F0c In particular, add the missing dependency on the scale filter (and therefore on libswscale). Signed-off-by: Andreas Rheinhardt --- tests/fate/screen.mak | 55 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index aa9832688d..bd6d228544 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -1,11 +1,11 @@ # FIXME dropped frames in this test because of coarse timebase -FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd +FATE_SCREEN-$(call FRAMECRC, AVI, CSCD, SCALE_FILTER) += fate-cscd fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 -vf scale -FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory +FATE_SCREEN-$(call FRAMECRC, AVI, DXTORY) += fate-dxtory fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FIC) += fate-fic-avi +FATE_SCREEN-$(call FRAMECRC, AVI, FIC) += fate-fic-avi fate-fic-avi: CMD = framecrc -i $(TARGET_SAMPLES)/fic/fic-partial-2MB.avi -an FATE_FMVC += fate-fmvc-type1 @@ -14,8 +14,9 @@ fate-fmvc-type1: CMD = framecrc -i $(TARGET_SAMPLES)/fmvc/6-methyl-5-hepten-2-on FATE_FMVC += fate-fmvc-type2 fate-fmvc-type2: CMD = framecrc -i $(TARGET_SAMPLES)/fmvc/fmvcVirtualDub_small.avi -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FMVC) += $(FATE_FMVC) -fate-fmvc: $(FATE_FMVC) +FATE_FMVC-$(call FRAMECRC, AVI, FMVC) += $(FATE_FMVC) +FATE_SCREEN += $(FATE_FMVC-yes) +fate-fmvc: $(FATE_FMVC-yes) FATE_FRAPS += fate-fraps-v0 fate-fraps-v0: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi @@ -26,7 +27,7 @@ fate-fraps-v1: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/sample-v1.avi -an FATE_FRAPS += fate-fraps-v2 fate-fraps-v2: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/test3-nosound-partial.avi -FATE_FRAPS += fate-fraps-v3 +FATE_FRAPS-$(call FRAMECRC, AVI, FRAPS, SCALE_FILTER) += fate-fraps-v3 fate-fraps-v3: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24 -vf scale FATE_FRAPS += fate-fraps-v4 @@ -35,8 +36,9 @@ fate-fraps-v4: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/WoW_2006-11-03_14-58-17 FATE_FRAPS += fate-fraps-v5 fate-fraps-v5: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS) -fate-fraps: $(FATE_FRAPS) +FATE_FRAPS-$(call FRAMECRC, AVI, FRAPS) += $(FATE_FRAPS) +FATE_SCREEN += $(FATE_FRAPS-yes) +fate-fraps: $(FATE_FRAPS-yes) FATE_G2M += fate-g2m2 fate-g2m2: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m2.asf -an @@ -47,13 +49,13 @@ fate-g2m3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames FATE_G2M += fate-g2m4 fate-g2m4: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m4.asf -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, G2M) += $(FATE_G2M) +FATE_SCREEN-$(call FRAMECRC, ASF, G2M) += $(FATE_G2M) fate-g2m: $(FATE_G2M) FATE_RSCC += fate-iscc fate-iscc: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/pip.avi -an -FATE_RSCC += fate-rscc-8bit +FATE_RSCC-$(call FRAMECRC, AVI, RSCC, SCALE_FILTER) += fate-rscc-8bit fate-rscc-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/8bpp.avi -an -pix_fmt rgb24 -vf scale FATE_RSCC += fate-rscc-16bit @@ -65,8 +67,9 @@ fate-rscc-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/24bpp.avi -an FATE_RSCC += fate-rscc-32bit fate-rscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/32bpp.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, RSCC) += $(FATE_RSCC) -fate-rscc: $(FATE_RSCC) +FATE_RSCC-$(call FRAMECRC, AVI, RSCC) += $(FATE_RSCC) +FATE_SCREEN += $(FATE_RSCC-yes) +fate-rscc: $(FATE_RSCC-yes) FATE_SCREENPRESSO += fate-screenpresso-16bit fate-screenpresso-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/16bpp_555.avi -an @@ -77,10 +80,11 @@ fate-screenpresso-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/bunny.avi -an FATE_SCREENPRESSO += fate-screenpresso-32bit fate-screenpresso-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/32bpp.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, SCREENPRESSO) += $(FATE_SCREENPRESSO) -fate-screenpresso: $(FATE_SCREENPRESSO) +FATE_SCREENPRESSO-$(call FRAMECRC, AVI, SCREENPRESSO) += $(FATE_SCREENPRESSO) +FATE_SCREEN += $(FATE_SCREENPRESSO-yes) +fate-screenpresso: $(FATE_SCREENPRESSO-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, TDSC) += fate-tdsc +FATE_SCREEN-$(call FRAMECRC, ASF, TDSC) += fate-tdsc fate-tdsc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/tdsc/tdsc.asf -an -pix_fmt bgr24 FATE_TSCC += fate-tscc-15bit @@ -89,16 +93,17 @@ fate-tscc-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/oneminute.avi -t 15 -p FATE_TSCC += fate-tscc-32bit fate-tscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an -vf scale -FATE_SCREEN-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC) -fate-tscc: $(FATE_TSCC) +FATE_TSCC-$(call FRAMECRC, AVI, TSCC, SCALE_FILTER) += $(FATE_TSCC) +FATE_SCREEN += $(FATE_TSCC-yes) +fate-tscc: $(FATE_TSCC-yes) -FATE_TSCC2-$(CONFIG_AVI_DEMUXER) += fate-tscc2-avi +FATE_TSCC2-$(call FRAMECRC, AVI, TSCC2) += fate-tscc2-avi fate-tscc2-avi: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/tsc2_16bpp.avi -FATE_TSCC2-$(CONFIG_MOV_DEMUXER) += fate-tscc2-mov +FATE_TSCC2-$(call FRAMECRC, MOV, TSCC2) += fate-tscc2-mov fate-tscc2-mov: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/rec.trec -FATE_SAMPLES_AVCONV-$(CONFIG_TSCC2_DECODER) += $(FATE_TSCC2-yes) +FATE_SCREEN += $(FATE_TSCC2-yes) fate-tscc2: $(FATE_TSCC2-yes) FATE_VMNC += fate-vmnc-16bit @@ -107,8 +112,9 @@ fate-vmnc-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/test.avi -pix_fmt rgb2 FATE_VMNC += fate-vmnc-32bit fate-vmnc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24 -vf scale -FATE_SCREEN-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC) -fate-vmnc: $(FATE_VMNC) +FATE_VMNC-$(call FRAMECRC, AVI, VMNC, SCALE_FILTER) += $(FATE_VMNC) +FATE_SCREEN += $(FATE_VMNC-yes) +fate-vmnc: $(FATE_VMNC-yes) FATE_ZMBV += fate-zmbv-8bit fate-zmbv-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24 -vf scale @@ -122,8 +128,9 @@ fate-zmbv-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_16bit.avi -pix_fm FATE_ZMBV += fate-zmbv-32bit fate-zmbv-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 -vf scale -FATE_SCREEN-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV) -fate-zmbv: $(FATE_ZMBV) +FATE_ZMBV-$(call FRAMECRC, AVI, ZMBV, SCALE_FILTER) += $(FATE_ZMBV) +FATE_SCREEN += $(FATE_ZMBV-yes) +fate-zmbv: $(FATE_ZMBV-yes) FATE_SCREEN += $(FATE_SCREEN-yes) From patchwork Sun Apr 24 03:33:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219765pzh; Sat, 23 Apr 2022 20:36:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsFJqYzHUmJi5rnZ+eAIZslUUaC/RaXpuZqOkLLmbHuvfda+u7NibR6IbQ2e7Si6hIo6xq X-Received: by 2002:a05:6402:5241:b0:423:d979:30ca with SMTP id t1-20020a056402524100b00423d97930camr12492840edd.291.1650771368701; Sat, 23 Apr 2022 20:36:08 -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 c24-20020a170906529800b006efa8a6d115si11125161ejm.121.2022.04.23.20.36.08; Sat, 23 Apr 2022 20:36:08 -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=FfxZyPAp; 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 DC70D68B302; Sun, 24 Apr 2022 06:35:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BECF368B2D8 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aDuDlAVgNkCOeG580ufdE2VL+tq2iRErEGgVUTZiEfqlTt2mo5eRy9mIzWjzU7xHN/+ExDwQZly0QY50Dlum+sy7/lPS9H8R9cvPzexrPSSd5yC0eI5P8ZuTJO9/UwBi1krYRW2/NK7iAGnrksCl8GzoRF/gcU/Gkj4A8CSPFW8MQVLOCZKCSnk8r1sWRhGRO3oYZq5m6Dvzurbeh2HEHQrXdoCqVcgkrhKG4hHdLU+mJZohRxPo8KtAd3bYRa/JClSOGOb/XHckv4unxNzdpIAmDf4eeQTWWdsyf9rPDtL05Jdd17fle20FW6JrsbYw1EMLfeT5EysFtaK/4sYr9g== 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=/CA3jFoyxh8UW9io7qwyBXk1pSKjaNM67j0qwuUH8iw=; b=ZctyPFnZcVSjkctsb0f2M5AwvfIWbJj8B5U0y77S4I0uj0aFu655TvSjdN3OGllzPlxE7TPyWSf7Qv+uLk9r6btbGgZJ1iy/6WpC9E/iwUIieO20tvSmrPGgWFgUzLMOH6eop+qe5RM39coOR6ZuJUc0bbepeRRqt/i7J7V12pkrgYrTPRy3V+tIw80fCzR4ZysK0B04VPsubSMBd+LqRMZQq0XjR5WYqpMIOV8TvHzsJ9c+MzlMMkYHUhm6hVB9yMT46/DTihTZ7ux01IptdF6rIg2ZAFo3uBKwLNQHz1rXvDFpnhwrtEuWg5WZNYbrpFuyp+ltuTHXntjdoG7VBw== 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=/CA3jFoyxh8UW9io7qwyBXk1pSKjaNM67j0qwuUH8iw=; b=FfxZyPApB1E58LaA1Aeod/FLhUWGwJV4BWgtdBxvCnUGgTnoD0j76ZCgoSyRTt2AtBubtM/HuP9JQWV+EgUwdTJ9kJpz/dgILqo4TEGlCiYumtrNBhVKZ8M3qS5U3NCnfdkV0iSjV8aPZsyIYRmH8vrXuHuzpKY8UeK8NTLLLVzcWWGAG24CvXLXfBDqPVnVNwYk3CiOg7tRQONNPWkQQJA5lo+QHJsAMwn4xsr7NTxCfL3QvttZbfWXDUshgqAtBk4/Dra/uGHZ2YUaQSXIkLAkcUC0Ra4eCgvTfVk7kFw6jy8WgnknG7NegMWSSo0FN6J+Rbc754xFPwaILwy9VQ== 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:34:47 +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:34:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:56 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [F2wWuZbXNaiuXDzR6YhEvrbFC8z+OhpE] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94b2728e-0e1c-4991-bfaf-08da25a36181 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXfH4bWiO1gE0snAkgFSfEFKME3kfbG8aTlr0WpxycHD6pD6H4RR8dxTxYitmRom/rhgJhJPSzlIjgkKgFoxPVcup5cf1+KwGWc05ARHU78d9RPnJPuiv1+ByYdkutMEwwGvXo3rAVv9rDZjms56U+SkQBnpqqwJBKGF/w/tNF5DdogRch5u93rQ8++GaXa6Cgc2fLwDWHRQOiLsm2vX0qydjC9jCdxRTC7FUzcBNpu4NA28jbd0wvcrsT7PQaV1xHz5tGvx0KEuxpiftQHxdUrWYtr1VjdAgJZ4Xltkluh+eAAGyHA7bzwlYzmXx6vn03Vo35bn0N21GBv9SxKoLHRGrkqH9bdd/iU3uOpLQ2hdFiw0yRb9PXbsLGn029E6ZZSjF/4Bn84KsTilH6vypQKWCZHGcbZCr1CKr2VPRFVvQT2SzXRqOumUz4kAfS2fuJDJq6i3gKbvODTGSsmr9vfpfekrK+6dajFKrvZunzQh9m/YFRGp8WJOZAQNhg3qCT7ypdBqiwaRXkL1Bj2Zntv38NOIzzUIZi73rLNU7IomO5lfv8lEhkno8O1UWZYryWI9dBkpN5LVXreO+S1UICQLrgghclooS/YAFSidCZweoohEHq/CDAC0tI5RBs+Ic996AcegiFipk//9LwUtg04XzTyP14eDe8iR4Y13Cg7uTFCrRpPfOAzNQ== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mlE2o6pKvOqb1sWLmYiW6PU5Z7j3SXFIfQr9iRo6MooEV4ECd79YixRMiShmHerkCwuGChzhScVNH60nN9cU/MFOsybj8SSPvROs1OpjQJCyXdB5Jx2bXy/uEJPw+FqNIecsOZU0KjIPwATq5pLM5AqtGmlb0L0E/kQma8oCV+Ryxxj0as0XyvxKbJIRotxRkIPqczuNnRoSTzRNmQ2oi4PxkCMVGF3vZpzsh7NTQnife8kSRSk3fiSjqCYJcceOGyB3lEOKD6Qb5cyYVoA1f99hTik5BiwZUgia1bx7kXarHXllTlsyQ8ExaWai7FathKuQtcGzWeXPl5rVbL9IMXH/YZPEDjUbtP3qYuO5esH6fOY5q1wBNgGZ6+kbDtanXCHunOMbXm8WPCjYEBIv7a9kvP9zxweZa/06OPDTbF43Vh/hx+17uVG7agsGZjd9FzyLIGcdMoXc9L/D/oLgMeOMYYheYj7+tY/NuVbeGc9NsSC+se0Q+AuaoowELtHYeA8ShzVhYOa0n5mQFSQKOQ4NR+DREN5ehKqXBZ5BdKX1IPUV2eT8k1pm8p4Qgv63F37oBKjKxeHHIsSNOBgpWw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fJPsij4XQ2uhw15r8YFaLhUzsQnjBjY7ktOxLX7IjKZyPELuNYHZ7SEssiGTWQvAMVQMzxYc61YJF9BwzVBWn3dUgoiwh8ZxQPobtsptC+RWIMukgshWFjAwcM/Ai/aeoKepYq7N7QVrbzayMQDul654PK7SLMgmrlvOzSQ+aLCTXgnLnYW+y7qy0pe5kczcLPC3AFTn18sdJAL0PzqQt1+qRPD/eQ3mVeQvrIF4AKRtOZJwerh2ERm5T+/NFGfhEkm0O1W848ed+vkSo7V4+wwESEOYcr7xNR/NdFScBmJi7Uo5P+zbGFBBNsLQNjMH+lbSxuVnZUNAjo85bVg5QYrMMS3qlT3Shjtg8gTsEdG6nGDzBFsk0/LimiL7yzFNq5locuxC0DOuQdms++jgmVvN5hufLO85C44wmWFCZZzOTNnq1OytU8nNvXuLawIODMyM+4Qt5VFHGfsHx+cx23DDoBIhGFXA2YG8ndXdCVq/xqDptCLv1I6cv7zpW7rObxbU8iMV6tJLFVp+AFOmPgcYJXh/+/VVGM2zbo7Js/dWyGbGiEciXe04F59RJKr4RbJ/G/S9YOT6RCGq8nczQzRGrdAIucS0KogcyxG3vTedZcxHtkbZdsKMszrB/32yXnE9lMA7GlaKZF2zidTz1ehv/6atjwAtyLDD3gYTTWAoEM24QnaLDucjtz4xigy+AJcOcSPWfdTE3Wn7WnYWmPpxaS34oh+wXqtbaWPltfTsTRnHEcv829Tl1qxKWJbCLBzMVoi7HkWuKI0vUwHPk2ozLEkmcE67E22PDkVhQ/R28DGvV0waSH5rohwZWWSJG87tu1DdRRGjCLE/oiLRT40wlE1BC+duecy8ljRwlXGrFtqpALf0juo33coRy9JPgGPUSO96+H9JSIvdE87ip/dzXtGdAyCJQiQKJonUUwar/dOZGdrd0YsnEIJ4ceYklOEIUB8VMT4wcO9jlcw/dzQTHzpA2KyIQaV9SCxc7d52psWCSmXUvY3fGSTIoxn6A5rPFGDaAfo9tqLh9SExpGowUTJeonK5ldQMMsziLGpUCOOSHzjTFk34D73OcrQyqOiFwS+vF4dkYLfIurFNKVvR+OewPmUnS/s0TKiZ1xyMfM2GvyG0FKk4CVoeJMHxkBgDnQZXxzlLOkMyru+AmkKB2/FD345b5q23KPZF2VPXjILfUKBW3IQucFRFsxEYMYd9Mf2SOXpi41EKBOT5B71KW71F7IFkBeJuZpP/uV2sGw77I8uUATBWljAGVdR7K5ds3CbEhv5/gtS2F9LBs1RGBvLXg03JQ1bpjxdFAHIRv5wNs+Z2z7eRvncJl+L7nLh+vTj5jqQcmfsEIXt7z+ncGKhEnyu+6fbZhu+HNqzMFhgTEJFi4eF0ve0b580rig4BS5wGYYnfaSI8XqhvT8uU00rVbi2y6Z4T8n0gMJnrJjzAagCe2G406Ym5iXAl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94b2728e-0e1c-4991-bfaf-08da25a36181 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:34:47.6041 (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 11/32] fate/video: Fix test requirements 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: PTCo08kk7zYC In particular, add the missing dependency on the scale and aresample filters (and therefore on libswscale resp. libswresample). Signed-off-by: Andreas Rheinhardt --- tests/fate/video.mak | 216 ++++++++++++++++++++++--------------------- 1 file changed, 110 insertions(+), 106 deletions(-) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index dff1f13e88..40cdd9e3b6 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -4,55 +4,56 @@ fate-4xm-1: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 FATE_4XM += fate-4xm-2 fate-4xm-2: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM) -fate-4xm: $(FATE_4XM) +FATE_4XM-$(call FRAMECRC, FOURXM, FOURXM, SCALE_FILTER) += $(FATE_4XM) +FATE_VIDEO += $(FATE_4XM-yes) +fate-4xm: $(FATE_4XM-yes) -FATE_VIDEO-$(call DEMDEC, AVI, ZERO12V) += fate-012v +FATE_VIDEO-$(call FRAMECRC, AVI, ZERO12V, SCALE_FILTER) += fate-012v fate-012v: CMD = framecrc -i $(TARGET_SAMPLES)/012v/sample.avi -pix_fmt yuv422p16le -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, AASC) += fate-aasc +FATE_VIDEO-$(call FRAMECRC, AVI, AASC, SCALE_FILTER) += fate-aasc fate-aasc: CMD = framecrc -i $(TARGET_SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic +FATE_VIDEO-$(call FRAMECRC, MOV, AIC) += fate-aic fate-aic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/small_apple_intermediate_codec.mov -an -frames:v 15 -FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic-oddsize +FATE_VIDEO-$(call FRAMECRC, MOV, AIC) += fate-aic-oddsize fate-aic-oddsize: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/aic_odd_dimensions.mov -FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm +FATE_VIDEO-$(call FRAMECRC, MM, MMVIDEO, SCALE_FILTER) += fate-alg-mm fate-alg-mm: CMD = framecrc -i $(TARGET_SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, AMV) += fate-amv +FATE_VIDEO-$(call FRAMECRC, AVI, AMV) += fate-amv fate-amv: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an -FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi +FATE_VIDEO-$(call FRAMECRC, TTY, ANSI, SCALE_FILTER) += fate-ansi fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi256 +FATE_VIDEO-$(call FRAMECRC, TTY, ANSI, SCALE_FILTER) += fate-ansi256 fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/ansi256.ans -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124 +FATE_VIDEO-$(call FRAMECRC, RPL, ESCAPE124, ARESAMPLE_FILTER SCALE_FILTER) += fate-armovie-escape124 fate-armovie-escape124: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130 +FATE_VIDEO-$(call FRAMECRC, RPL, ESCAPE130) += fate-armovie-escape130 fate-armovie-escape130: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/landing.rpl -an -FATE_VIDEO-$(call DEMDEC, AVI, AURA) += fate-auravision-v1 +FATE_VIDEO-$(call FRAMECRC, AVI, AURA) += fate-auravision-v1 fate-auravision-v1: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/SOUVIDEO.AVI -an -FATE_VIDEO-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2 +FATE_VIDEO-$(call FRAMECRC, AVI, AURA2) += fate-auravision-v2 fate-auravision-v2: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an -FATE_VIDEO-$(call DEMDEC, AVI, AVRN) += fate-avid-interlaced +FATE_VIDEO-$(call FRAMECRC, AVI, AVRN) += fate-avid-interlaced fate-avid-interlaced: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avid_ntsc_interlaced.avi -FATE_VIDEO-$(call DEMDEC, MOV, MJPEG) += fate-avid-meridian +FATE_VIDEO-$(call FRAMECRC, MOV, MJPEG) += fate-avid-meridian fate-avid-meridian: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avidmeridianntsc.mov -FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid +FATE_VIDEO-$(call FRAMECRC, BETHSOFTVID, BETHSOFTVID, ARESAMPLE_FILTER SCALE_FILTER) += fate-bethsoft-vid fate-bethsoft-vid: CMD = framecrc -i $(TARGET_SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi +FATE_VIDEO-$(call FRAMECRC, BFI, BFI, ARESAMPLE_FILTER SCALE_FILTER) += fate-bfi fate-bfi: CMD = framecrc -i $(TARGET_SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 -vf scale -af aresample FATE_BINK_VIDEO += fate-bink-video-b @@ -64,69 +65,69 @@ fate-bink-video-f: CMD = framecrc -i $(TARGET_SAMPLES)/bink/hol2br.bik FATE_BINK_VIDEO += fate-bink-video-i fate-bink-video-i: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RazOnBull.bik -an -FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) +FATE_VIDEO-$(call FRAMECRC, BINK, BINK) += $(FATE_BINK_VIDEO) -FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video -fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an -vf scale -vf scale +FATE_VIDEO-$(call FRAMECRC, BMV, BMV_VIDEO, SCALE_FILTER) += fate-bmv-video +fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs +FATE_VIDEO-$(call FRAMECRC, MPEGPS, CAVS) += fate-cavs fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an -FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics +FATE_VIDEO-$(call FRAMECRC, CDG, CDGRAPHICS, SCALE_FILTER) += fate-cdgraphics fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgba -t 1 -vf scale -FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-1 +FATE_CFHD-$(call FRAMECRC, AVI, CFHD, SCALE_FILTER) += fate-cfhd-1 fate-cfhd-1: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_422.avi -pix_fmt yuv422p10le -vf scale -FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-2 +FATE_CFHD-$(call FRAMECRC, AVI, CFHD, SCALE_FILTER) += fate-cfhd-2 fate-cfhd-2: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_444.avi -pix_fmt gbrp12le -vf scale -FATE_CFHD-$(CONFIG_MOV_DEMUXER) += fate-cfhd-3 +FATE_CFHD-$(call FRAMECRC, MOV, CFHD, SCALE_FILTER) += fate-cfhd-3 fate-cfhd-3: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_odd.mov -pix_fmt yuv422p10le -vf scale -FATE_VIDEO-$(CONFIG_CFHD_DECODER) += $(FATE_CFHD-yes) +FATE_VIDEO += $(FATE_CFHD-yes) fate-cfhd: $(FATE_CFHD-yes) -FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr +FATE_VIDEO-$(call FRAMECRC, AVI, CLJR) += fate-cljr fate-cljr: CMD = framecrc -i $(TARGET_SAMPLES)/cljr/testcljr-partial.avi -FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-corepng -fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi -vf scale -af aresample +FATE_VIDEO-$(call FRAMECRC, AVI, PNG, ARESAMPLE_FILTER) += fate-corepng +fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi -af aresample -FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-rgbapng-4816 +FATE_VIDEO-$(call FRAMECRC, AVI, PNG) += fate-rgbapng-4816 fate-rgbapng-4816: CMD = framecrc -i $(TARGET_SAMPLES)/png1/55c99e750a5fd6_50314226.png -FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs +FATE_VIDEO-$(call FRAMECRC, AVS, AVS, ARESAMPLE_FILTER SCALE_FILTER) += fate-creatureshock-avs fate-creatureshock-avs: CMD = framecrc -i $(TARGET_SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 -vf scale -af aresample -FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette +FATE_CVID-$(call FRAMECRC, MOV, CINEPAK, SCALE_FILTER) += fate-cvid-palette fate-cvid-palette: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an -vf scale -FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial +FATE_CVID-$(call FRAMECRC, AVI, CINEPAK) += fate-cvid-partial fate-cvid-partial: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/laracroft-cinepak-partial.avi -an -FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale +FATE_CVID-$(call FRAMECRC, AVI, CINEPAK) += fate-cvid-grayscale fate-cvid-grayscale: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/pcitva15.avi -an -FATE_VIDEO-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes) +FATE_VIDEO += $(FATE_CVID-yes) fate-cvid: $(FATE_CVID-yes) -FATE_VIDEO-$(call DEMDEC, C93, C93) += fate-cyberia-c93 +FATE_VIDEO-$(call FRAMECRC, C93, C93, SCALE_FILTER ARESAMPLE_FILTER) += fate-cyberia-c93 fate-cyberia-c93: CMD = framecrc -i $(TARGET_SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, AVI, CYUV) += fate-cyuv +FATE_VIDEO-$(call FRAMECRC, AVI, CYUV) += fate-cyuv fate-cyuv: CMD = framecrc -i $(TARGET_SAMPLES)/cyuv/cyuv.avi -FATE_VIDEO-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video +FATE_VIDEO-$(call FRAMECRC, DSICIN, DSICINVIDEO, SCALE_FILTER) += fate-delphine-cin-video fate-delphine-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm +FATE_VIDEO-$(call FRAMECRC, ANM, ANM, SCALE_FILTER) += fate-deluxepaint-anm fate-deluxepaint-anm: CMD = framecrc -i $(TARGET_SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac +FATE_VIDEO-$(call FRAMECRC, DIRAC, DIRAC) += fate-dirac fate-dirac: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-main.drc -FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac-low-delay +FATE_VIDEO-$(call FRAMECRC, DIRAC, DIRAC) += fate-dirac-low-delay fate-dirac-low-delay: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-vc2-low-delay.drc FATE_DXA += fate-dxa-feeble @@ -135,8 +136,9 @@ fate-dxa-feeble: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -pix FATE_DXA += fate-dxa-scummvm fate-dxa-scummvm: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, DXA, DXA) += $(FATE_DXA) -fate-dxa: $(FATE_DXA) +FATE_DXA-$(call FRAMECRC, DXA, DXA, SCALE_FILTER) += $(FATE_DXA) +FATE_VIDEO += $(FATE_DXA-yes) +fate-dxa: $(FATE_DXA-yes) FATE_DXV += fate-dxv-dxt1 fate-dxv-dxt1: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv-na.mov @@ -150,10 +152,10 @@ fate-dxv3-dxt1: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqna.mov FATE_DXV += fate-dxv3-dxt5 fate-dxv3-dxt5: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqwa.mov -FATE_VIDEO-$(call DEMDEC, MOV, DXV) += $(FATE_DXV) +FATE_VIDEO-$(call FRAMECRC, MOV, DXV) += $(FATE_DXV) fate-dxv: $(FATE_DXV) -FATE_VIDEO-$(call DEMDEC, SEGAFILM, CINEPAK) += fate-film-cvid +FATE_VIDEO-$(call FRAMECRC, SEGAFILM, CINEPAK) += fate-film-cvid fate-film-cvid: CMD = framecrc -i $(TARGET_SAMPLES)/film/logo-capcom.cpk -an FATE_FLIC += fate-flic-af11-palette-change @@ -165,49 +167,50 @@ fate-flic-af12: CMD = framecrc -i $(TARGET_SAMPLES)/fli/jj00c2.fli -pix_fmt rgb2 FATE_FLIC += fate-flic-magiccarpet fate-flic-magiccarpet: CMD = framecrc -i $(TARGET_SAMPLES)/fli/intel.dat -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, FLIC, FLIC) += $(FATE_FLIC) -fate-flic: $(FATE_FLIC) +FATE_FLIC-$(call FRAMECRC, FLIC, FLIC, SCALE_FILTER) += $(FATE_FLIC) +FATE_VIDEO += $(FATE_FLIC-yes) +fate-flic: $(FATE_FLIC-yes) -FATE_VIDEO-$(call DEMDEC, AVI, FRWU) += fate-frwu +FATE_VIDEO-$(call FRAMECRC, AVI, FRWU) += fate-frwu fate-frwu: CMD = framecrc -i $(TARGET_SAMPLES)/frwu/frwu.avi -FATE_VIDEO-$(call DEMDEC, IDCIN, IDCIN) += fate-id-cin-video +FATE_VIDEO-$(call FRAMECRC, IDCIN, IDCIN, SCALE_FILTER) += fate-id-cin-video fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode +FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2, SCALE_FILTER) += fate-idroq-video-encode fate-idroq-video-encode: CMD = md5 -auto_conversion_filters -f image2 -c:v pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -r 30 -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2 -FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-byterun1 +FATE_IFF-$(call FRAMECRC, IFF, IFF_ILBM, SCALE_FILTER) += fate-iff-byterun1 fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 -vf scale -FATE_IFF-$(CONFIG_EIGHTSVX_FIB_DECODER) += fate-iff-fibonacci -fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f s16le -vf scale -af aresample +FATE_IFF-$(call ENCDEC, PCM_S16LE EIGHTSVX_FIB, PCM_S16LE IFF, ARESAMPLE_FILTER) += fate-iff-fibonacci +fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f s16le -af aresample -FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm +FATE_IFF-$(call FRAMECRC, IFF, IFF_ILBM, SCALE_FILTER) += fate-iff-ilbm fate-iff-ilbm: CMD = framecrc -i $(TARGET_SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24 -vf scale FATE_VIDEO-$(CONFIG_IFF_DEMUXER) += $(FATE_IFF-yes) fate-iff: $(FATE_IFF-yes) -FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit +FATE_VIDEO-$(call FRAMECRC, IPMOVIE, INTERPLAY_VIDEO, SCALE_FILTER) += fate-interplay-mve-8bit fate-interplay-mve-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit +FATE_VIDEO-$(call FRAMECRC, IPMOVIE, INTERPLAY_VIDEO, SCALE_FILTER) += fate-interplay-mve-16bit fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema +FATE_VIDEO-$(call FRAMECRC, MXF, JPEG2000, SCALE_FILTER) += fate-jpeg2000-dcinema fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -c:v jpeg2000 -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le -vf scale -FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv +FATE_VIDEO-$(call FRAMECRC, JV, JV, SCALE_FILTER) += fate-jv fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1 +FATE_VIDEO-$(call FRAMECRC, AVI, KGV1, SCALE_FILTER) += fate-kgv1 fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc +FATE_VIDEO-$(call FRAMECRC, AVI, KMVC, SCALE_FILTER) += fate-kmvc fate-kmvc: CMD = framecrc -i $(TARGET_SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, LSCR) += fate-lscr +FATE_VIDEO-$(call FRAMECRC, AVI, LSCR) += fate-lscr fate-lscr: CMD = framecrc -i $(TARGET_SAMPLES)/lscr/lscr_compr9_short.avi FATE_MAGICYUV += fate-magicyuv-y4444i \ @@ -218,7 +221,7 @@ FATE_MAGICYUV += fate-magicyuv-y4444i \ fate-magicyuv-rgba \ fate-magicyuv-rgb -FATE_VIDEO-$(call DEMDEC, AVI, MAGICYUV) += $(FATE_MAGICYUV) +FATE_VIDEO-$(call FRAMECRC, AVI, MAGICYUV) += $(FATE_MAGICYUV) fate-magicyuv: $(FATE_MAGICYUV) fate-magicyuv-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_rgb_median.avi @@ -229,41 +232,41 @@ fate-magicyuv-y422i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv422_media fate-magicyuv-y4444i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv4444_left_interlaced.avi fate-magicyuv-y444: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv444_left.avi -FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec +FATE_VIDEO-$(call FRAMECRC, EA, MDEC) += fate-mdec fate-mdec: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an -FATE_VIDEO-$(call DEMDEC, STR, MDEC) += fate-mdec-v3 +FATE_VIDEO-$(call FRAMECRC, STR, MDEC) += fate-mdec-v3 fate-mdec-v3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -an -FATE_VIDEO-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic +FATE_VIDEO-$(call FRAMECRC, MSNWC_TCP, MIMIC) += fate-mimic fate-mimic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/mimic/mimic2-womanloveffmpeg.cam -FATE_VIDEO-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb +FATE_VIDEO-$(call FRAMECRC, MOV, MJPEGB) += fate-mjpegb fate-mjpegb: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpegb/mjpegb_part.mov -an -FATE_VIDEO-$(call DEMDEC, AVI, MJPEG) += fate-mjpeg-ticket3229 +FATE_VIDEO-$(call FRAMECRC, AVI, MJPEG) += fate-mjpeg-ticket3229 fate-mjpeg-ticket3229: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpeg/mjpeg_field_order.avi -an -FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels +FATE_VIDEO-$(call FRAMECRC, MVI, MOTIONPIXELS, SCALE_FILTER) += fate-motionpixels fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -frames:v 111 -vf scale -FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186 +FATE_VIDEO-$(call FRAMECRC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -frames:v 30 fate-mpeg2-ticket186: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/t.mpg -an -FATE_VIDEO-$(call DEMDEC, MPEGVIDEO, MPEG2VIDEO) += fate-mpeg2-ticket6677 +FATE_VIDEO-$(call FRAMECRC, MPEGVIDEO, MPEG2VIDEO) += fate-mpeg2-ticket6677 fate-mpeg2-ticket6677: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/sony-ct3.bs -FATE_VIDEO-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1 +FATE_VIDEO-$(call FRAMECRC, MV, MVC1, SCALE_FILTER) += fate-mv-mvc1 fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25 -pix_fmt rgb555le -vf scale -FATE_VIDEO-$(call DEMDEC, MV, MVC2) += fate-mv-mvc2 +FATE_VIDEO-$(call FRAMECRC, MV, MVC2, SCALE_FILTER) += fate-mv-mvc2 fate-mv-mvc2: CMD = framecrc -i $(TARGET_SAMPLES)/mv/12345.mv -an -frames 30 -pix_fmt bgra -vf scale -FATE_VIDEO-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle +FATE_VIDEO-$(call FRAMECRC, MV, SGIRLE) += fate-mv-sgirle fate-mv-sgirle: CMD = framecrc -i $(TARGET_SAMPLES)/mv/pet-rle.movie -an -FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg +FATE_VIDEO-$(call FRAMECRC, MXG, MXPEG) += fate-mxpeg fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mxpeg/m1.mxg -an # FIXME dropped frames in this test because of coarse timebase @@ -276,43 +279,43 @@ fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/rtjpeg_ FATE_VIDEO-$(call DEMDEC, NUV, NUV) += $(FATE_NUV) fate-nuv: $(FATE_NUV) -FATE_VIDEO-$(call DEMDEC, PAF, PAF_VIDEO) += fate-paf-video +FATE_VIDEO-$(call FRAMECRC, PAF, PAF_VIDEO, SCALE_FILTER) += fate-paf-video fate-paf-video: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, QPEG) += fate-qpeg +FATE_VIDEO-$(call FRAMECRC, AVI, QPEG, SCALE_FILTER) += fate-qpeg fate-qpeg: CMD = framecrc -i $(TARGET_SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, R210) += fate-r210 +FATE_VIDEO-$(call FRAMECRC, AVI, R210, SCALE_FILTER) += fate-r210 fate-r210: CMD = framecrc -i $(TARGET_SAMPLES)/r210/r210.avi -pix_fmt rgb48le -vf scale -FATE_VIDEO-$(call DEMDEC, RL2, RL2) += fate-rl2 +FATE_VIDEO-$(call FRAMECRC, RL2, RL2, SCALE_FILTER) += fate-rl2 fate-rl2: CMD = framecrc -i $(TARGET_SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo +FATE_VIDEO-$(call FRAMECRC, ROQ, ROQ) += fate-roqvideo fate-roqvideo: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -an -FATE_VIDEO-$(call DEMDEC, SMUSH, SANM) += fate-sanm +FATE_VIDEO-$(call FRAMECRC, SMUSH, SANM, SCALE_FILTER) += fate-sanm fate-sanm: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video +FATE_VIDEO-$(call FRAMECRC, VMD, VMDVIDEO, SCALE_FILTER) += fate-sierra-vmd-video fate-sierra-vmd-video: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video +FATE_VIDEO-$(call FRAMECRC, SMACKER, SMACKER, SCALE_FILTER) += fate-smacker-video fate-smacker-video: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, SMC) += fate-smc +FATE_VIDEO-$(call FRAMECRC, MOV, SMC, SCALE_FILTER) += fate-smc fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x -fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi -vf scale -af aresample +FATE_VIDEO-$(call FRAMECRC, AVI, SP5X, ARESAMPLE_FILTER) += fate-sp5x +fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi -af aresample -FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp +FATE_VIDEO-$(call FRAMECRC, THP, THP) += fate-thp fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an -FATE_VIDEO-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq +FATE_VIDEO-$(call FRAMECRC, TIERTEXSEQ, TIERTEXSEQVIDEO, SCALE_FILTER) += fate-tiertex-seq fate-tiertex-seq: CMD = framecrc -i $(TARGET_SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, TMV, TMV) += fate-tmv +FATE_VIDEO-$(call FRAMECRC, TMV, TMV, ARESAMPLE_FILTER SCALE_FILTER) += fate-tmv fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 -vf scale -af aresample FATE_TXD += fate-txd-16bpp @@ -321,53 +324,54 @@ fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -an FATE_TXD += fate-txd-odd fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -an -FATE_TXD += fate-txd-pal8 +FATE_TXD-$(call FRAMECRC, TXD, TXD, SCALE_FILTER) += fate-txd-pal8 fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, TXD, TXD) += $(FATE_TXD) -fate-txd: $(FATE_TXD) +FATE_TXD-$(call FRAMECRC, TXD, TXD) += $(FATE_TXD) +FATE_VIDEO += $(FATE_TXD-yes) +fate-txd: $(FATE_TXD-yes) -FATE_VIDEO-$(call DEMDEC, AVI, ULTI) += fate-ulti +FATE_VIDEO-$(call FRAMECRC, AVI, ULTI) += fate-ulti fate-ulti: CMD = framecrc -i $(TARGET_SAMPLES)/ulti/hit12w.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, V210) += fate-v210 +FATE_VIDEO-$(call FRAMECRC, AVI, V210, SCALE_FILTER) += fate-v210 fate-v210: CMD = framecrc -i $(TARGET_SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, V410) += fate-v410dec +FATE_VIDEO-$(call FRAMECRC, MOV, V410, SCALE_FILTER) += fate-v410dec fate-v410dec: CMD = framecrc -i $(TARGET_SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le -vf scale -FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc +FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2, SCALE_FILTER) += fate-v410enc fate-v410enc: $(VREF) fate-v410enc: CMD = md5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -fflags +bitexact -c:v v410 -f avi -vf scale -FATE_VIDEO-$(call DEMDEC, SIFF, VB) += fate-vb +FATE_VIDEO-$(call FRAMECRC, SIFF, VB, SCALE_FILTER) += fate-vb fate-vb: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1 +FATE_VIDEO-$(call FRAMECRC, AVI, VCR1) += fate-vcr1 fate-vcr1: CMD = framecrc -i $(TARGET_SAMPLES)/vcr1/VCR1test.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, MPEG2VIDEO) += fate-vcr2 +FATE_VIDEO-$(call FRAMECRC, AVI, MPEG2VIDEO) += fate-vcr2 fate-vcr2: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/vcr2/VCR2test.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, XL) += fate-videoxl +FATE_VIDEO-$(call FRAMECRC, AVI, XL) += fate-videoxl fate-videoxl: CMD = framecrc -i $(TARGET_SAMPLES)/vixl/pig-vixl.avi -FATE_VIDEO-$(call DEMDEC, WSVQA, VQA) += fate-vqa-cc +FATE_VIDEO-$(call FRAMECRC, WSVQA, VQA, SCALE_FILTER) += fate-vqa-cc fate-vqa-cc: CMD = framecrc -i $(TARGET_SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, WC3, XAN_WC3) += fate-wc3movie-xan +FATE_VIDEO-$(call FRAMECRC, WC3, XAN_WC3, SCALE_FILTER) += fate-wc3movie-xan fate-wc3movie-xan: CMD = framecrc -i $(TARGET_SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, WNV1) += fate-wnv1 +FATE_VIDEO-$(call FRAMECRC, AVI, WNV1) += fate-wnv1 fate-wnv1: CMD = framecrc -i $(TARGET_SAMPLES)/wnv1/wnv1-codec.avi -an -FATE_VIDEO-$(call DEMDEC, YOP, YOP) += fate-yop +FATE_VIDEO-$(call FRAMECRC, YOP, YOP, SCALE_FILTER) += fate-yop fate-yop: CMD = framecrc -i $(TARGET_SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, XAN_WC4) += fate-xxan-wc4 +FATE_VIDEO-$(call FRAMECRC, AVI, XAN_WC4) += fate-xxan-wc4 fate-xxan-wc4: CMD = framecrc -i $(TARGET_SAMPLES)/wc4-xan/wc4trailer-partial.avi -an -FATE_VIDEO-$(call DEMDEC, WAV, SMVJPEG) += fate-smvjpeg +FATE_VIDEO-$(call FRAMECRC, WAV, SMVJPEG) += fate-smvjpeg fate-smvjpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/smv/clock.smv -an FATE_VIDEO += $(FATE_VIDEO-yes) From patchwork Sun Apr 24 03:33:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35402 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219726pzh; Sat, 23 Apr 2022 20:35:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysuFvY3qldsK9sc9M4rMOTLXRohIDK7TIUNi2+ZkDEFRFgXfIm37pAnNN+Gj0RIcuX0PY1 X-Received: by 2002:a17:907:7f87:b0:6f0:a11:b0fc with SMTP id qk7-20020a1709077f8700b006f00a11b0fcmr11017559ejc.448.1650771359394; Sat, 23 Apr 2022 20:35:59 -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 hp13-20020a1709073e0d00b006f361442e09si2100678ejc.912.2022.04.23.20.35.58; Sat, 23 Apr 2022 20:35:59 -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=JQVAN9Z7; 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 ECCDF68B3CA; Sun, 24 Apr 2022 06:35:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C5B568B2F2 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XXqeSsXdRsg8gpkhp3eDCx4TWrvwKMDRGYAnAbaOMq9peFBTx0WZwCWq3hgj4pi/8vOXPcVCWoDwQhDyhQ6E82r9dp5DlMP70RjiKUPJ6e/Su1uKpIfUuBlF5+e7gvpjEQdZvZ9FzWXqs4f0zp7psdJ/Q7vJDX3BCJ88ceQaV5/PWXmYxMSszj7hxVlAuO82QK5zVQ9+s8txt3ihxRIdWFdRL+6Au66qbEEx8MbIIMx7Y0KLyREexsZlqLh1CfS9QEHze2MCFggPqWmqAPXvr6HtUbWgkm4GKZwTwM3megwUQSFT+veLztaHsxJx9rlDaB+Y4JBZxRORH5k+Wrg1+Q== 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=YzQlbdAaC6fPb/D2enddoWolVw55akvGvv55hAKDhtk=; b=bk3UgvQcMH9TBR9i7cRSltPwnGchrJv4yJhNkc/fbIIGkCWrBApDzr44gPZLUoRmtHwBSCR5OVu8pg3A/Kr7popmFnTVAc3vtwrbpvCeX/fEFPHDMZe3nlmShp4K8dIgCj00h/v8TmauYsJgPZq55iGzZ7nswA/+/6hxK96cvvi9U7jOXXSCq1OPeeEXa8DLhExI/0+qsRJc1zIIhIiqMkSlaYzUU9edX93o4DLVPOsTBCfiUJ5SyQs3zyjXVBonnCecAj/SZakbbxsX0hsjTe0gj52Qv6mYbpLC9XV3zI3RkWTP5sx2NZ/azGiTIi86a2Afs32OnYNTbsUo/ynt4A== 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=YzQlbdAaC6fPb/D2enddoWolVw55akvGvv55hAKDhtk=; b=JQVAN9Z7UzfLDeFSCGl4w57Ws4JWVi6d9diRgGn+OqbM327eOHzB676AYbaNx9RkU4l+8JHXQIowWKV4XiMsUesci2olrfAZNAcimhkRhquwx2iB4gnfzZeJn0zZG+yq40o/f/OD7y+Kn8CabYzsNf2K23A6qqQ3gMCRYDz4GynAFfSkmyMDruV5Xy4iikb5W0tnEicp3J44E4tjkIHz8/A1L8YYtRKuMx0/vWSmtK5+/5ziCbKB3bs9Xk82XHljMvV3q4/eQD39KSK8qq9/rS4zdgeEA6Q4UW+r2opNKcG4GBwP+99+D7TskeALhQeIxMjLKtXdEOm7TYABFP/LXQ== 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:34:49 +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:34:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:57 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [+dBaRUv/1E5JSKvR2GTMWMzWvhhmeKA3] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b3cb80b-0b0c-4444-95ff-08da25a36266 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXfAgm1blkz75cNWWoLkIO/UWIlUbQEYmyNQi+iKFa3jWiwSvhUVDxKZQBQV1yWid9foDrHHudM2sc18upuNbl02uS/KtEWGiKjQ3+xMSHbZ1i4BzBpkn0RrrJIHFj0rBEdP8m4bPm6mLQOYC5f3QikR9JuZdT5zDE2xpUuYKQtzAH28+Ud+uInhrHX+KXIAFvSpvSDhh4jWd3QE2OCFUCTS3EKddFaTNkXYRqsdN9+xD5wipHjngpBe/2HMPjW+Ij9qJ9O06o9eJ+1grJzocMVvwSk9CLIpNcxwHkuOw5UpnmLmTktGFrvrTL0M2ojFOKufemx4x/ur02d8iBSLSNF9sTTpcFajuvFxCme/ZQMLva3NW3YzZJqMg/ILh8zdVVCACwFCRCSbmUbmw0f2pWpcaHOZkJPzoAQNwy5U5HEmdoTRIWPOkoqyo3XNvQmnzlqhTdaqRKgLJiFups17B0sGjG/0ejRhiays9j8xnnQYcMRySPjG7mz6m0AQzJRzcdmWcZmCxtML+824Fg3qWZqUFhZ7vAeal6nNVinKm33pjPLgGVJjsc01leo2MOkZJ/bJBhMC0DeZZWpvwNpkem/cu0GglMy1UEMTO3v3ivvkRGl0eJfhz0Rc0qFkwMF7fPHvC3iFTe9ex9MqG2HnD2hVVorRihSjdaU5uBc0ZFk27QkwFY3C/gREQ== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RL9ZIvCC5bonyvuSqAQnsJJRmnlXXYdwiHtMHkcgqkXXNTZbt358jL+wkM5+QzsbXt0Q0aM+ysFHsoceOneXgM0f4y+MDr/nJfqb0KSqwvvIn+FSg6EQLTgJTWWGzOPnxzkCi4/XRdQEUNwA7gyT6pYqbelgQAgnBofUb7xVEHeQX3I30+N2Jowyrcaq1EUWcCxAsFHVujgoeIVD3ljQRGVoDA4KKiXWZ3WxWLCVWL+NSbR/32Ljr12P5JtZQ7dTAJzdDr7vwFBogHTTImfShCoxXC65eqbPRyvU4BnbIJrqRrKUzf+zkzs5EmZn5lBPc49jG0h9zgm75m9KbByJvqmGLnmL3pNOU2LPQXfxgIEvk9VOkie/EsLyQlaFogzJqAbtDBAO3R4EYEzdKr1tk5QS97F4xmvImlbNz3kYPqxlgHBBqAGmQQkAFzSlH4bgdn855d1EWhIAgtDQAGhzxMytckZ0WzNMuytTjGa0Z2QnF2+3BIUH9FsSjV4pJPuDNe+gF78wtTo6SzZ27MSMKFHFg+mYaKuO9L/W7zRWWUUwTDZvpfQAiL/qpyXt4r4/DEzgYn8Cbt0etUdFf/0ADg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HmjAgC/bqCeZPFmP3CApPmJZ5Rr0JWeWSDogxjeOkSgm4wTcOuI+qxB5ZTAXyNpoDpe2hkYO4sumNutni7dAHJveV4PdXjvmliUVBA7zLbxaLxwvXeyQkgA082KaJEmNkNciyW868SWbxUzXsfmQtUWwDPDTnyVLO5muqfbPQA0y+i4u2CT6wZzcj9x6hJnONqG7TcPkp/eJpSaVbu0sgDaijcebXDv7B6vqVdhf1AT/v4kg6OvUb3gMwQM1q7gK7w17UfJ85p+PZz16P/3XeXSUeaGQHrJlLpaGWWj5+Oz7pc2IZnThH8F16FtRv0yyUYrOW0zgS7MxTKYvTg2FPmpI1brnOY3ifyI1elBBWHUPQgT7R4AWFlWKvnpP8SMMazgwXjg2izU4JKWtp4Zp+f5foke6s9Y2LyJqMfItr/sU1Xt4klG2iTUE7CQEkOQ3LEgaITaRq9lMUUzOilmYPFstHkpDzApT61MsnbGcECcSW0EhVHPMY4v8oznJeo6GuE7thOosKKEUSPyygE8MM58deD1pJU+++WKCzZEzkFgWFfwwVNyhz5BYyyjctflGoXDatK5lPBquekim2idRs+mqPj+gVi0cSXvnCtsH+uh11dGXlQQdgU8OairB5EKONq0YJPn6JzxxLj6PYCEo3eTqRIHa/MaREOkldMR4148PfUPkeygV7MDju5HZZb+KWcQHwsbDEaCxghGRlfdrgjHQrowfxA+APnt9a6wYHdTstdDDhZt1iuIu3K7srlC2SAnJESRBM/QD3RSEkGP4RPGxN28tMK0HQE7L+ajh1teVoVenX+kGXOEdMWG+y+XhR4sHe9bnWHBDUlc5Lbi4znVczXm7qTIG0ssTLmv+tbrirun1DhFHjfKI4f72iaUHcjMrtoh0i1yCWxg7hu70jR+92KGi3l42ZytFqv1+wgL50IgXvfzA5WDb6JiL/VfYxPVL7bH8N/Ms5wRMhqtkDbIzLSr2D4X21JBUXKUeDFdrlsA2CRxnnT++6cz7fNtAgtgOFIuTbkaEoluuauncGxrWwNa7Ao/YprrKGo5h4LwQ1jk46F99Jlrc4qQ0p7aqDlWO/HvLbs8b8GRBfsgx5qFWcHmRWfY9JyCK6Ox+qftqbBozAImlnN62TcvY2Fgyx0iJYUalid6olNNeRsihAxTCGxJklMIKC2YO8J3iJ82TrNkoVjKtA1iHco/RmShZjO1bRP69uEsd7toLlTjcYfzxDLZekdOXEHy4czn+xG/O19y1bpqawKvArxE5kNfDiOXGa5IkOoOS7VpBpc5IudVoV3vtaSlHNDArDJg24IlxCCA6h4TymsMAA5XyN0VKJuyERXyHX5l1nMjsiFf2D0Mb7OEi1CiMXRZP2SnX9wxbgvIi196H0OStyIUOOaJM96kbaWD51lZjtqQbDD/GyHNK3AxeRIGElsyfqUAgNSmCiYkQlOJ8lcS7q0xF5Vwb X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b3cb80b-0b0c-4444-95ff-08da25a36266 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:34:48.9163 (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 12/32] fate/dfa: Fix test requirements 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: 4nbjLZhlPnjH Signed-off-by: Andreas Rheinhardt --- tests/fate/dfa.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/dfa.mak b/tests/fate/dfa.mak index 5b725e3a99..682a9d10b2 100644 --- a/tests/fate/dfa.mak +++ b/tests/fate/dfa.mak @@ -31,7 +31,7 @@ fate-dfa10: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0009.dfa -pix_f FATE_DFA += fate-dfa11 fate-dfa11: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24 -vf scale -FATE_DFA-$(call DEMDEC, DFA, DFA) += $(FATE_DFA) +FATE_DFA-$(call FRAMECRC, DFA, DFA, SCALE_FILTER) += $(FATE_DFA) FATE_SAMPLES_AVCONV += $(FATE_DFA-yes) fate-dfa: $(FATE_DFA-yes) From patchwork Sun Apr 24 03:33:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35404 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219820pzh; Sat, 23 Apr 2022 20:36:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8+C33EUCvy8ohTTd5DVYVnPL+M+J13FJJbpR9OI2LA3YcHfIYZVcBY07/OcK6asXL6MGG X-Received: by 2002:a17:906:5811:b0:6e8:47dd:c55d with SMTP id m17-20020a170906581100b006e847ddc55dmr10625178ejq.191.1650771378300; Sat, 23 Apr 2022 20:36:18 -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 f20-20020a056402355400b0041faf0432d1si11224832edd.461.2022.04.23.20.36.18; Sat, 23 Apr 2022 20:36:18 -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=RZSjC0e2; 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 DC5DA68B3D5; Sun, 24 Apr 2022 06:35:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E950768B2F2 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZEzgFZsbH+dLFw9D52oOauWBeNCO6thXAAq3mnZXe5iwq30ZbvsOT/U2RiGjdfmfuFYMuCLL6Si7lBbRr56juzbmAlOLuS3z1HTxt0E6OyKactqIijz2frh9oj921lnvYpgnCCjTomtDNRhp+MN8pBToQXjlm03kVzinYUuGsA3FAU3v6IGxvrAeLeTYnZproRzLEQjYqYQILdxwg+TgrdOCYGXUrIpTzPYG2V6PdzPiWlgZePdip5GIrrF43wcJEKAmURDU+x/wSFttB5F97/w3OzlYfaH6YALOU2RVVX9Hy9U4Umgujzhf8osUzs1fIJXCM4aNHLV30PGrTV+Ig== 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=K6bU6p1tWb5IfjW8/sWbXA5CLYwuz7Y5EdUcwIGONyE=; b=OYlBwYdQ75VGnY8Z9WEwajdfFwa+GDz7WImlJgJVUC2YXyTq0KlqCZWZ0DoNvl7S9KzdF8nyoPpPIkmbJEOQWZqZvWY0QXbXzUnofx4oRiWB5Y486PeAm7Bg5vr4uDpE8KFQ/fr/iq+LV12/GdNPS7guUIMFvUmCBcyxlz7pB5zehU0DxKXEbF7jZJIuKRZyHO9s/+BIzUzsJFggTweEdXjrZqIYVOuR1yMWWkGQho5w9fY16l51B4mCzgmGew07AnXJ92aZ57+u8dZdHALqCICJFvB4lQH1IkOooOL8UKrf5M0gw1IF5ILSY6YsWJOQ0NFortQAG03ULW5Ni/RTpQ== 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=K6bU6p1tWb5IfjW8/sWbXA5CLYwuz7Y5EdUcwIGONyE=; b=RZSjC0e2RCOGVrD3g8SlpXlGtxDnOK0o1WLUbBuUat7YnByL3f6eks8AVj2YZ58Y9IJ9fE9ANFYpbEKhDh7Zs4EdrChKrffQ+3YWMNkKAgC7BHNGj0/jr7F+JiyPsnxz83gmu2I67DtsUMe6Ke4AHXgmrF8dIVwLohFqijxL5lWTgo1r5VfT9oUYirnHiEVk/D1CcwHipY5S6U8/z/OH+YW70e7nYZdZP9YRdjo4qp4Yu/SSyZSwLhP/R5lB2vPjXt1Tugt81dYufFR1CgcKq2RRvdmCKw3EbqEUw9ShO2Z7MLghyFGOOGWaNVxeeoq2FukUU8UgPedFfLRBS4kUNw== 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:34:50 +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:34:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:58 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [qU2PGDIw3BOONZua5K5Q/wN1HEWXr6Fi] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3301057d-5955-43c5-eef5-08da25a362fc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbTWNwFwaPCdfMWUfbwVJGyrbLMPz2Y6lSaqoEkn2tDvb0LfdSIRTW2oKI5FiOXEDiL8AAK06OwyCk635+QI07D6oVJXHmFzZuz4LE9ObgkpzUWRaNICYshB6Zdn8WpmkZokBOVQQb8xvXgbvexrxqXzm622Ujg2m3oWC/zz7LCFSNzr2y11ouLh80dVnQpi1TRwwslVAe3sDhOwI/kODTGRrI2SLygjvMgwgWc3p93HZzCIZF6hcqJt/PQ32hs4e5oFoj+nqK+76ZrCXZi5qv6XprhrQ+Iz3EkVlntqlr1o4gyXT7wSd2GolbnHgot5E1IhjuMC4sLJPtzfXRp7DPqkqx5FYBe6tdVlMO7Tpxk+H7kHuVkKCCw5/GK6kFKdMP0rNwP74OFor1ETETESaf3RshbQwLsLTCSC0ZAG4NDa1Y7x56KBY83tSppNzAB46yF6BBFv4z6ZcZGSA09XEXMbUhjEODWCc0KJ/kZDsETVz7XAdv9qrtg58fagz6l+SA8RF0krEw/8sxFSUro5V+mA03l4Bb1rlSsqoNLl0NkM/4hRAJuVXPDwclfMDEMCDpmXtpbX0BdzBdum3zdRbpDFQ+syOvINc0fl7fbo19si9zodruO5lVhHOH7xKw6fJpJGamQbG0bfTGDNO/AYu0WFjNiZaL7DCYu8KZFxgiLpXgKJUmrI+vIAypjPMruBBIOpAql62l0/9tJAfnHiW2c0= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V1wtqbMuoONJuFSeXUXtwW641mdruwvsp6FIf1Y9TrblVzIYDVyTep4HuAVd0Lc66yJgEolnRegR4ayUEntyq8tn96EzyO9m6k1zbo9Ty3uyKsk6DBZ7w47DG3Q93Sv8CZc/+XaE7KBLmlMyzB4jkVyYhvPvlxozC+BY08jaz9cHt0pGeSlJEBeho7G1Z0PHA6WG1u+IVP2VVbNKHkOuAn95IjE7XYEanpsK3uZSpiDp8xtn9P8tjnDxmgDubvBi1sDLo7hrm189ANEuqmG2jmibzJ1zVJ05AYlHRxraDWOjZG3Q30AXgBUSvinZIP1/z/h1XCDBt01I4ar+cKh8jqiKBLvNQWrh77VqDUNOyM4uqV3l55tjUOrzqr3X31EM2u4QNZt8SoaNOxTb3ITfEbynFjzrq5mYZYYyCwvBdF18eT7CgfJSXYUHXVMuziWZ8YlygoXdhlPus9IG77JgRUuQmi3K2+/YJDK3yMnDBWEK4Xh1rx93trWMFegUqKZYvlrthquDYe91plMcpoXi/76oVhV+NZVaoO480PDb1kKCE4/wSYC2IeOMhjajrHQQmHaWXS5F+ELNrPsjLxSQOw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: StxyX0usQl+QiVhYF+MSyDC8aUiDvvwCGJvdC5L8vZ66P2GZF4OOs9uE96Qtdw7oSFtFrLPlVBIB+CohkHulAi8ibhcFvYnuXavcf17HDPNHw6UDJP1CIss/MazXemRTTIzmuTz6D4lW6fu05EB/dY59iS+6AxWUwk0v+yNlheylJMyKQfM8ujnxjmNi3YcZWGWgYCBTxJ3DSa9a0xNkeohMaKOAq9O2FMyiWahgIBrnjPzBcURUGIXJWwaDxlAE0zx4lfgNbvpO52Ncrfopfr57f0ONVJG1pwvV1/Ohe4ZGGO4IzOPpuVC/vW9PwgIMmegjp0wgqAe+gB/Mxp0g+pzPqC3Kyk6fkXJIu5z03Xedx0y+r5qhnyBrbmcd8mQmbMIPFt5HsVLJCNyqfdmg6xgBAurRdeCOBQVVGzl1scsvTW6g+2CLfrUshYpYn1xl1Wr2EVzSEKG6ltVQpN6TPCenoNb90BcSloJEImvAiCmJuYVYyYAsP8bSZkoFzT3PnMbYDih3IN6DmhCDUNiTjQe66clbvR2mM0I8l307fHOqKhmstAX5HT86lhnLye4VHCkvlu0F9To3xyWhiCnlalrPJdOSkNTE2npv5Hv7gKLuK2bHFOHOZ/g9oyI0BVrW0m4ffJA46qwLRADB4r9wLZHgZLE4pQNG9cHqu5JQNS004OhYluCgfT1p26lzF+xEkOKoUUk/tXOfjj/4o/iK9XCGBX0emmZLawOQMJqPBmzmMfO8dN+CnTa3GjMpQAYTwLH7ekdaMgMKfS1SuEhyyFYfnYxltddlXNo+QZLg/tYE7gdys7KqqQV2sPtt3AnIvc2wvofjBfBOfM2FG8Ttly3EjZT8o0vump54V4N+Cvsuu6gN33Z/ZqS4ST4goFjbrdOiDvjq6qQ6FGrRHLsVxXERUgB5S43NpFirXmloNYWehNCb4N5eQuawhfJQagWCYZSGf1WD8Q1TMHoLZ2YGB1T2yXb1NrU9Wp8mFjouXKFUNsNnE8kgZhOo/Qtb72DinyR5VdRUn2nTb3YxkRlHUi0rjtK9PmZxhTkjp0fyegEOWcCgr/WTOiOtaAmsnQZ9AvzgDiYNFhtmiUwtAhQ6BbQOo8rjFld6HQwsicYoM4GO4z+oy2DLdfoWaeQk+vCsf0d3MkYJocoGIn7oHnyEIw4LpDFIutMmcvzJyJN2EakYr03hGa9qhxXjDjf8cBSweaEOnjzxtSWz05X6kPCK209GspUREDjrm3ojyR3wewexdByU77vfwXvXqIspwJ5mzD6fq5GJQLPRhdMqHJRhqQv0MsphAszrYXGUzwY7bTXRlBjmO1Gu5JFvTbdpIfxWZ6MWIP1OmTfFxiIcyBmTwAwqp6wqb0ELaM2wlDCDDgTJmizAcECtB8ogMK8STUL3uk+tKmU/+++MuhGYDeaH8z5m7ITp6fHmgEQ0yx2AdTYlP/2oHSOk3eIvC6APxxhs X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3301057d-5955-43c5-eef5-08da25a362fc 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:34:49.9174 (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 13/32] fate/cdxl: Fix test requirements 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: R8vUjkjErd5f Signed-off-by: Andreas Rheinhardt --- tests/fate/cdxl.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak index 2a4e2dd510..db3045c27c 100644 --- a/tests/fate/cdxl.mak +++ b/tests/fate/cdxl.mak @@ -7,13 +7,13 @@ fate-cdxl-ham6: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/cat.cdxl -an -frames:v FATE_CDXL += fate-cdxl-ham8 fate-cdxl-ham8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1 -FATE_CDXL += fate-cdxl-pal8 +FATE_CDXL-$(call FRAMECRC, CDXL, CDXL, SCALE_FILTER) += fate-cdxl-pal8 fate-cdxl-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11 -vf scale -FATE_CDXL += fate-cdxl-pal8-small +FATE_CDXL-$(call FRAMECRC, CDXL, CDXL, SCALE_FILTER) += fate-cdxl-pal8-small fate-cdxl-pal8-small: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46 -vf scale -FATE_CDXL-$(call DEMDEC, CDXL, CDXL) += $(FATE_CDXL) +FATE_CDXL-$(call FRAMECRC, CDXL, CDXL) += $(FATE_CDXL) FATE_SAMPLES_AVCONV += $(FATE_CDXL-yes) fate-cdxl: $(FATE_CDXL-yes) From patchwork Sun Apr 24 03:33:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35406 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219896pzh; Sat, 23 Apr 2022 20:36:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5gJ3ZFvXtuEt9fcH92pbIv6GCdpSO844p4Xs6ZuSuZSx50EDlKeOE7KL74gWApe/qy6FG X-Received: by 2002:a17:907:1b14:b0:6ef:a5c8:afbd with SMTP id mp20-20020a1709071b1400b006efa5c8afbdmr10938776ejc.151.1650771396672; Sat, 23 Apr 2022 20:36: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 d12-20020a170906640c00b006e86c3056c2si10161997ejm.33.2022.04.23.20.36.36; Sat, 23 Apr 2022 20:36: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=U60sWbXD; 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 D6D9668B411; Sun, 24 Apr 2022 06:35:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AB8268B31B for ; Sun, 24 Apr 2022 06:34:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HoM6RPinALBh6C94+n269UurmarU75+2H2stIX4yJ47nnaqPlpKmKWggh3o1Y9aks9qGyT2Lwd/Bwcof6bQQ10srnwk4/Pm8kSuRNYVY114idhK8nQrLvUglZ3tzN7DJC5CYSn2XGu7ALW09Ab2a/TjfdIOXxA173jlU4GksEvlqpmM+wjutC13hyAillzXoRXbIXei9sxPK/Yh0gdKz+5MFIJNoRHbeL8ji8sr1iBNbsgCC7urZbwS3xW+uNyV+njIKwaDjPIA/ajdXne0QQmD/BScYca0ogJk4GUTYiLg3o8RLs6WTDrMa4TUYqe3v6bvEpf+QaEjtwtJvVkSKlQ== 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=C/ac5AnGsZWZSmM1H9jhLXgtMOJGm5LFo0x6iM5hvis=; b=mx1ZJ9M/cz/h40Mas8Zcl0lXUdKZI2ZkY7dnXwYlWKKJ8pffT4VLi89Uo5Cd7QAnTeE/cTOgWPwfLE1wznhhyqXYOjkeeKqrx/xk5Pm246Pb0ic/VXiLc0fd0h1Clmml+NfD2chDBVT8BRHA9wilvXrWTDbRNnunkzBXkmvF6cDdZxwLz3m8TGiLyAqLzn1VBkzndGCdGUX8wGMKHAZmEsx2YF7PeWK1l1jzQHslO8d60d2JjHrDusBsDjj9Vubw24BUcXjh5zRUQAyu2MMBVsgmpBfXdHfZ1pFOTCiJAV2S0RJC9KhQzwr3ITjB6E0s9Z0l8IOxi4PSn/36b63HZg== 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=C/ac5AnGsZWZSmM1H9jhLXgtMOJGm5LFo0x6iM5hvis=; b=U60sWbXDHQWse/ruGhuj8gzmGCDY66EW6u8hls7jJI82A02LfmgumQb7KITL4Tttv4KL8curSFgpjOUTD3QkzqYZL2eIPhadm7E5A/1ye7bL0uGAA0Ui4lHkTVQdVkTmaNCbureWFrPLpfPF6oSq+nQRT4SWyGiK/FXNO+Lqe7SWW3pRpsC8TNUdpYGs4VNN8+advcOEqelN/qiMYYqEcunmk4S0/dJ611Ex75whOWlmfUV4PvdJPuU+dOAeZRoUyP2DGc/oVADHyj4r5tY0BQzO5+WBiXrA49FQuCsRdgVooL2P/tkZ56dWIVcV/9HRQ63z9YbrwYa72T4pakMfPg== 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:34:51 +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:34:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:59 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [7hizfF/Sn1btzifd77vF9VHc5CWhr2v9] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f970467-5f54-4944-d158-08da25a363da X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbTWNwFwaPCdfMWUfbwVJGyoWIuYaNCPzLFwHcyU+r8yKLKQPIW+WWshGUT9gLsTdS05obG+Km73Rr+cebOPsK5fYvS/2OUYwvlpiK606wIDoUS/sMHn6OCMDlt7L780VufbN/h/8BsjnXklH/o0SKMS2rdF9TJdUvGghAN1cG71DJApgNMnPgXN69XU7QXIpHSQSOYf3D2BbK/itV3wFoTbD4Fbya9nUAh/atF/GHFmIirrJwpYEIb+BC2Gp+U3AKkx7hWa8yorWGVSrypiqqAn8MJoYEx1R+tPg4E9B5hoAg3gLTpnvDLzGnGAN6f8ilUCYpJc1Clsp+eeDi+PAqGk4gVUdMFrSvER9voi+BDY2ZHQDcweFE0zxn1Y+p3GOprZAuWKcH0ghSUKSwgBIHJGC7sbFFb10Epae1iRVajq1441+Ee7Ikx4IM7+uQwbcCvNSXGWYsj3jaQufYWhusNVtl3TMqXlunhRC2stFUuAysQV+EX1sBX+hUPmZMh+bEGDcchV76nJEUyhc91PznZOav05aemNnSnczck6zN6iMpPbwxm5uQIKoDKdeQ10VGFVHki7ok/2QLR9zu35zAoSFq0swFClW9CU6QoG68VtO/7n03jpOnXQnAEvbk2j11wxrITpVqtZ7UOi/CGmlMxQw8CXccSiJS4Hp+Bjbnxm/ahEYbGeuEWYFCNf/RQjbjzOUvXY+CMIA8BZOMRLcQIs= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M8Q7uXCTnwYbjaOE20YnbSbUmNrxAGqImS0bmGN+m6rNCSuX1EGbsikZ0KRKGii03rTL97APMvpXXBSYSXfIEdynSm6uB8FCf+nQ61JuR2qHWT02bGkTASFpKPYgsKQY/TKbhmiCcj5vTxQ1ZpBYQJPbQsGunboJbbk3y3VHbh7ADaZC1hcivIHY/WblhaC8dg4CGxQZaYL8yxHtOWW3TkEudV+7MxcxOtO8JTnYRVgzy2fwXsBH/ZCCc29coxKOkAq9fp+TfdJI/gSkCc41PEnYA6AArwKysyIK/HOL8A1OdADmybjyyqnYu/R7TYoNDNrYVlQtr83jmsBJiCa6tXsKbDXmV07Q+nypizrT+IrTuzlM+TsC2KGXJQdKrnuC5TpalecUPUuDn+MuPfflqHLEtKZKt/MilNf9rqsnZWq4jQNnXaXy/SDEN15A+yDtrsLbPtZGZDJxZO2L/Xm4VBRIXzodfEzLenkY7+m0RPtjl9PJpHln8UaGrxe0RCmpldXNgxkFeRL5jynrZOjC6henKzrxsgcgtVv69iN87OLN6k7c6uXvj8JI5RIyui3CZelHNbUi7mxtT4V2R0d7Pg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PutBpmqLBzzyJ7teheT5vXaac0ATood5TGfqpUo0waSxtiGWX1aJscMDDGz1TCzYFAa7hQXHoIm21qz1kd9dfy6m25itcdVYuCNbXMxx/fgS02IhEDWSweJ1/4wXtB0rznifp1arr6W5UvCwrF2ykkOADd0kZTPf27HLqAOgeve0sim7z+p5fMEsNceA7GIGh9YwOpdliHNEhpR7+9yHHQJGfoFEYOD3K3T78uzkSxgRecbI71ORsIkdFZkTBunE5Gsj1ahgEeP6GBD0nSt4eh6ULCf89WHf4zIY6pG4Gi/juSI6iYIKfsC3ibrdopGgftykdoLtBMBfwsAYYjboFynyMwrYr42hxJF+8y95BoEzj1fgGPHqYl7iiwyn72OuhWWM2PhZ79PtG1ptQ5wFxju3n8FyjT7Wsa7H6eWYK4+O6gDaG5RXoJrqIW+670sTPBeyTmUmZSwCFYthogztjvgjIH1nRKOqGHPu5omtbhj0ldn1PBMGwX9awmqo37q0BS5+bRmKDgc9E9JKeYnAWtUydWQo54UsJZV2w6iD4AJJO0c0g2lunC8T0zMn+pxqJITaX+WB3h+BnNjVATQJl3lSCSMM9gWMSX6z8n+0V3KBn//RKlPxnj596YYkIP/A5DUhQoobDxM7DEFbVSmx6u7UxPnqUnmQ2HtPFpDiicIEy5aBD494bdgIWiNfv8cldede7Sv6OiSQvc+xXmYWDKEk8A85OwDK9rEznSUYXYc7JpGEJ2Q1h3gFg0pkK8t4ezeWATX7VS4FLrMpuOwMWmoHpdDrQf89CC6fyXdUOIWTqJZPqG43C3madYz8RKh0le8h+WhWtzJDV2UFNktPV3AjGqO45LNumCEAPaJL/T8JkFsPcffbsO2SHVFU9vPxO3qaOZjjrIn1WPWe5hAFH9rIwa1Lc5FyemsTq+hWxRL4DgipdpY1x8+SmCpx2klr/TTCbnaD5iNby3GtVYE/iEozhOkOdbVzlgOuvfDUUB9Odxtg5+zOVRWlJdp0BCKJ/ixv/71mx7xlWifMlLjeFfhF9Mdomyig1XWnWw/TdLAfyIxeWC06LDUewRyuzTLN4leMCibPX2wAHXP6qloPFnYAJeDTQ4an5UOr2s9ASl01z2W9QPtTVFjwKom06d8vN3OVd/IyUuWTPv7QtYP6KFdC9akkExe/JoZ7+3rd6Nd8mQcAye/45gD7CyhMnMUk6PTQ9D0yFZ0FsRDw+2VCVEa3vZXdp6Pbcl8EPK9I61GeGfbV+urTig/AL0EbV1uNauzaoM7U+xkoL9dFIVe6qn1XcHR7MAqN66d/uatnlZYJwKnvuPwGXPc7sa1MAcQBAz74eZZRTi1FeUlNzeH+tZV3LW9AP6q9s9YKuW5PmiB8rdbLIU1/CbsHKeDE2mbcpwmuF6AuHx5yGFzawz1lXUqKvAG3NB1avZ3mhM7NnuvTd2qh/NUv9VRGKbtorQsE X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f970467-5f54-4944-d158-08da25a363da 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:34:51.3715 (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 14/32] fate/bmp: Fix test requirements 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: 3LhHWJCfuEM3 Signed-off-by: Andreas Rheinhardt --- tests/fate/bmp.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/bmp.mak b/tests/fate/bmp.mak index de27f19b15..050d3d1357 100644 --- a/tests/fate/bmp.mak +++ b/tests/fate/bmp.mak @@ -22,7 +22,7 @@ fate-bmp-15bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16bf555.bmp -pi FATE_BMP += fate-bmp-16bit-mask fate-bmp-16bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16bf565.bmp -pix_fmt rgb565le -vf scale -FATE_BMP += fate-bmp-24bit +FATE_BMP-$(call FRAMECRC, IMAGE2, BMP) += fate-bmp-24bit fate-bmp-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test24.bmp FATE_BMP += fate-bmp-32bit @@ -37,7 +37,7 @@ fate-bmp-rle4: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/testcompress4.bmp -pix_fm FATE_BMP += fate-bmp-rle8 fate-bmp-rle8: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24 -vf scale -FATE_BMP-$(call DEMDEC, IMAGE2, BMP) += $(FATE_BMP) +FATE_BMP-$(call FRAMECRC, IMAGE2, BMP, SCALE_FILTER) += $(FATE_BMP) FATE_SAMPLES_AVCONV += $(FATE_BMP-yes) fate-bmp: $(FATE_BMP-yes) From patchwork Sun Apr 24 03:34:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35392 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219947pzh; Sat, 23 Apr 2022 20:36:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDgzSOUS/NIVf/AK5RPxwQNP6rCcgIyXRIMaBf2cAccFSYmNKjeiQxWuAuWOvC4CfzIb3a X-Received: by 2002:a17:906:5d07:b0:6ef:f147:caee with SMTP id g7-20020a1709065d0700b006eff147caeemr10911496ejt.292.1650771406337; Sat, 23 Apr 2022 20:36:46 -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 v14-20020a170906488e00b006df83f92f6fsi9804511ejq.293.2022.04.23.20.36.45; Sat, 23 Apr 2022 20:36:46 -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=jOTQSvsy; 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 B48D768B41C; Sun, 24 Apr 2022 06:35:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C64268B33F for ; Sun, 24 Apr 2022 06:34:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=elqeB/YA1D6ATjd+/agR/935Yo6QHnExBG2p0qK8srkALbPYRiQ/WG7epVjOIH/jIxjMMZvYfL0CbL+eOTrpEvu99FARMHkFo1tms4IK02g0RwSDNYZe44bFcL9AYFgxAUFbnG5Pjk5jv9udWhtW0Hq6sw2oOhAWM+My364kw3bckkCd33pwUp9W4PGKf/sWnP1bBgHOrbft5XJqHigSLvwsKNuKQQLyusaGujQTpyM4xfn5ZYkiLntqLt0YP2yewSlB1Q0z7liceCS3L2qf/LZ8reJyvyA7BhYlVQYBZMXnQlezhmPEpIRqvWqrnPyVlgHy3NKfEWpFlBMud8UbRg== 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=qieXzWIzf5/QyI7WYmm50mmEsXuAp5gyOefsGd2WSkA=; b=aDJkiQlwVrJnxd/DGqmPGoUeYt726f4SYRDmgcx2aPDlwlVrcvNutkOrxMzp8ALYsorctjShCest//u8o2eBgzVxR03BQ1IYmpoPOyvAJx5qnja9uDiOZsnRsF2vD9c6myb2vFVXI9GEoKs2jaTIIqB5S0Vo9vL8AqlKAOXCCc8I2Ta+jc9kH5u4RosL8nWOw6v3IJ4GJWalYghoXAqHLT39TxE5f4v5SFbs1oyxWIfD15+zKWmp06o/bJtuiIrbCA0P9pY6u2tNot8qqlTpRCsghJnk6V8u9COiEAG+anKEmwjaT064NkhdKDK5lAZdvqnn2laiq0qhOOFnKwR3Xg== 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=qieXzWIzf5/QyI7WYmm50mmEsXuAp5gyOefsGd2WSkA=; b=jOTQSvsyAk55boCGcXS5xXfJS2jAXjUFGZvTSZS6eChA7ZcKqD3rkZdEL/vGz2lO1LdDMjFCGlZhPeyKKXBKbArAaELUBpzol6MrP310mLOxwgIfLTHxeisHIXKxK2qZ6G8mjgcfRXk0iys0gl/qLOqMh2iFhsUJ2QlVC3v/28jkzxJx3PhASRMn232lzoVj+G2u7DLO8fv/stDrKgADVVb/S9YV0K8xY/G5rXl22tXygAoMjFtGdiDsq3T7EkQHQ47fEOkv6mbWF85nu429tGsqFnf4xkl7TQN4vLTgTg148RGBta9IAvXo/fE19sc+2TJ7i5rg7L5ZnGj+U7FAhw== 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:34:52 +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:34:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:00 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Ct0v3AVF27bY453DessSs8wSlypdrimw] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56c251e5-b393-4540-0f06-08da25a36473 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXfG5cBYvl1QIL2RuxMjL8vjfDOS0yNdm8sMGqIVGAcRdjS+S1o9TZqpROCWKFa89krJHHIZNuPESi1XpMhtuQDaCCtnlVlMrvyWFpC6tBCmCgZmRebQJN1GgkDp29amhZX7evMNLjpPxuxPcNa5xtizRC2GB9FiNQ80qBm2X3j0jBylMm3mY19m8+Fg5qRhBwH+nwrKm9MPoqtQrlfzXPuiL5alR3A/L4R753oHqusyyZJyf3idCRTc5rXZMeuIQIrTP6g6b+cXnZSHEc/PmULnTsktwjTd7v2K+fIRuryyPKCGmBcf6hPFy50+aj0jNJIsUmeW6Uhh5ZRCkwRbZOAnxHUFdkfUEsPguepLhiJEVR3NbYeyokoxEwxxu67Bf0T7wT8WnEdCrY3+v/aXt/c9eDINjCHFTzXQGURi7EC8l1dYL/ohrUqqs6Zf0NP++EA4eWjC008WW6sL/KAErMifvppMHd3qhg3r2hKTrdfYejBTquz7M255v5Rj5Imf02xmPyFCYq3d9LD5aEbgGRQGEIOgR9/gQyiaE/iuHKH9vAqbeU3QLFXJGn83cu8Q2F+0lH3rYFkwKUgM+/ORoqGgw9SB8ttKkcgeFqDaAIOxUANVqeSPPMnfR83Tkjn5J0vZSlngMr1BmZjlvlb9GB1TG5FM8q6flAGajhLx0v74HbUQyjX/x0JVQ== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vl4IxDR0h76Ehi0sSNnjffNOYtFb+a3sNtatYYQKxukoUIAzLXbmhg/ncdUj6PmVXK6kM/IQ7bLvI+L4OzutMi8PqkdwIeQRwhw30pRz5Lfc3ZuIjqgcAU4vfvlbB12QPUPp+BJ9W1INibYFVM7mFZR7RCmVUxsBKWBU3Z6rSNV191wveKUJA/DAXRFHvuvIlRRrYV8q45cdhHtBsSXcwCOtmOtyIUD2M200Rld7jpYPKWn/ndtLwaLh1t03LS1EJRQc/3eqVc+gETL1SS0qou2WP7OaoqAY3KuXGh84fvk262Ecq/hR/kcu2xcOBgn36ZwsjMWqix7fMXG277c5PhxQqJQRZlyTx/bkWTmFUtTopQ1GXg/hXcBSOaoFiNTBrow0B8qQ81URwY9O+9oV6xyfuUwFCMmP6WPvNLIhBemo0h4O+jCbCzRRpNOghYAgkVQEfCFV+69J1BD9wxwhBucdA8zkc3QfplTNhCfGZSIHAGcwj7mmOcRdx9Ym9xdrpkL3Gd9ShxKBuyuI/QJKFoofnRiVz6AFdWqxvzIvoKow0DR8zZMA3omaR1fjrggqwqIHAu1srEZyCpvDyiYFrw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BZAesDUU4FApszHDeh9wIKyQJZNW7xvLlSivHNjWwq2AKRzAPzSxkQ7G76NG24y6z8nVQnt71k1a2d7BDSx7IHxG5IX8Klxs0D/kLlPxc0JVqu81BfZdIM6VBB3x7Nj5Y1BspLJg9RQgi2jqPN98qa01pfeONEXxtCAulSjXDYBkn4/nNWxQ4LJFWmtmGUEtpQuz4AVWtDiT25NdD9jnF2BBgbgFSnWe5udodVkhKj9bB2q54sX/kvVNaekMOWfYQgN4XuhZ3c10iRmNeZ/jngv6DGF/Oj6t54j2jaVFiXTXi6EMwJ3K8qDWkZClOPsRhES19Frft1uNUjPqCc0ZhvqDGcKzEX/RtIcgdg2l5x+u7LHuJAz6EQ/HtLjWJTICthMjQ7G9kD70SRe+cg0Ktg6rUxZIampSvONfNHZTdRtmw+7jA7m7p0Tkxf4LMXbrBnePPHtJzePwHYukHcJpUtGE3hw650EQ9zGwe1fAQ+uuIKISxNQxBe03WxL933HsQ6+Mv2BBAWHeiXAt4Y/y2w+POnZgVqRPXqrPgBvGJCuYKi9SA0mS7Yql8yMNh/O6yfmZGKZt7mwkyMQTa3Vtqd+c3V5pBTrUgdxW6av83x/A+F2phtT2ZkHZXDPOmvd2aTR17xFmFPXB3WYFUiHVqzp+vpIUA8LTXIUPz6/OagW7W9YhRDqMbdrYIs+GHtK0ngv7jjxiakQtw13yIR+1TPCyV8ZgppUtTwnbKdOWbKbE5bblE9n4qi0TnBdyQJlFoHCpprCEcaIMbkcuwCySSnn1cBTEWBuQR3VukfYm2uQ3ff9VpBJpfxO+g6mLWJkkfJn0SQJt3BbtGue86N5OX+1AAh9WdnOG1NkYatH0FHTjcfhP8R1Yp2tyV8XhZkouvXr/W39coJnE8Lj5M/AdgpjLJ2K5iqce7myF2DoiinBJydCiPIvKz8UkCAm0RrtzNMsoDIyjnzJJIDgDrvZoD12VIyQ64saIdFNvoxQuGsH/gJeWrtdqjZBFgILPeJW6ohoD+sIaeMUFwNqAqWY6iEbA2G8dJktcqkzd+ermCIAr3kcHDDwdl+IkmhZjZSmV3G5Iy2BthhBMEOgxP5IVN0wT3yLG7kzbqmo1iMOckNrRMEMq+wYNRwQ4xHL8ohbHotaGuIcgNC7kfS3I4delkL4LyZhGNHVxHCd5on+es2UYAgrg6sfY+er1JPxAAY3uEmfEIMwLv7Mynsym5OXLS+wcYSxWPc3lqL2zJ9KzbEZe2YCbtnVviMbUkxPINSvOkNDJdxphX2Hjhv77sn8bT9WX34g11EauLAmtOvCol4J5DeTr7OlEHSCy2mYANomxN77qxtlHc84+eoWXnYZX/ED7tWJTBci3CSocHxoKtpuX+DlnhBptGA9HmMlbiPE0Cf3FqLtaYvndlWRD1uXjTuuHtfnAy6kd+5uZ+d0zWYjZXrdTDtVrFtz4RZSo6Y4U X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56c251e5-b393-4540-0f06-08da25a36473 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:34:52.3223 (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 15/32] fate/utvideo: Fix test requirements 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: xKBoA/if7DdX Signed-off-by: Andreas Rheinhardt --- tests/fate/utvideo.mak | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index 9329df5386..bf8401c370 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -64,8 +64,9 @@ fate-utvideo_yuv444_709_gradient: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/ut FATE_UTVIDEO += fate-utvideo_yuv444_709_int_gradient fate-utvideo_yuv444_709_int_gradient: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv444_709_64x48_int_gradient.avi -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO) -fate-utvideo: $(FATE_UTVIDEO) +FATE_UTVIDEO-$(call FRAMECRC, AVI, UTVIDEO) += $(FATE_UTVIDEO) +FATE_SAMPLES_FFMPEG += $(FATE_UTVIDEO-yes) +fate-utvideo: $(FATE_UTVIDEO-yes) fate-utvideoenc%: CMD = framemd5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v utvideo -slices 1 -sws_flags +accurate_rnd+bitexact ${OPTS} -vf scale @@ -116,5 +117,6 @@ fate-utvideoenc_yuv444_none: OPTS = -pix_fmt yuv444p -pred none $(FATE_UTVIDEOENC): $(VREF) -FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC) -fate-utvideoenc: $(FATE_UTVIDEOENC) +FATE_UTVIDEOENC-$(call FILTERDEMDECENCMUX, SCALE, IMAGE2, PGMYUV, UTVIDEO, FRAMEMD5, PIPE_PROTOCOL) += $(FATE_UTVIDEOENC) +FATE_FFMPEG += $(FATE_UTVIDEOENC-yes) +fate-utvideoenc: $(FATE_UTVIDEOENC-yes) From patchwork Sun Apr 24 03:34:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219858pzh; Sat, 23 Apr 2022 20:36:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVabIrezHIO2LIpT1RmJBAI4vL8b3RogiAEV7GBtqkYinw1++R+X7QARPoL3Pzr5mx5vg/ X-Received: by 2002:a17:906:dc8a:b0:6e0:94bf:1ec3 with SMTP id cs10-20020a170906dc8a00b006e094bf1ec3mr10326790ejc.447.1650771387442; Sat, 23 Apr 2022 20:36:27 -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 s20-20020a170906355400b006e87c64e80fsi10440866eja.86.2022.04.23.20.36.27; Sat, 23 Apr 2022 20:36:27 -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=sQZ+fxYD; 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 EB58868B3E9; Sun, 24 Apr 2022 06:35:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074062.outbound.protection.outlook.com [40.92.74.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F307D68B2F6 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N6Q/TNHfFLdyfRXK4SFD2ovVwJSwIpbRqWrS5qygtu7r9E49JAMGPTucor9UxNu7mE98W8Zq/awoaYjyw+Podiayc9ZiFQG1//VxJenf50UAqMSPV9rTWHmcAPgT65Vjucd9389G6peY/1JgstXkUpx2E2fBB0nt4m2xk1d/8hBRPheOfyaj4Kc3zABPX86kFtoA0XB2CV+3SSBJM/9oBqa9GUC7ODnKAr1i2GktgsDOTF2Ipn+rEARV+4jEeaWkgAkgI/wrQuZ6Nmvaw1X4EoXiqaLBNriyG7QasHTLIUoSe+cfHruglblEtD782avJGkdub8rSxwwaoWmSfJHttQ== 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=IMtuj5waTdpMfNxyae8mS4Rp0s+MdVIz4gSs25xw+YU=; b=gCxzabdSqSQS56ph80Na1//LiIwxgMCYuaOpxnaknk28L0yOwswMXr/XpGbjysciiK4NgdE8OWZKJ0ER5LULa3O/OKzLCF0bMX4NVuCHfXR9ZpAqB0h8vPe1rVGXxDoMFERbzcyh3LBpzvMiPoCdFS8IJOrTEYWiWO1VW349XDMOBt9DcWiGxCiE+eysFQFxrMU9EC5Pcj4aT8Kp9oJXuKvvsfWoi2PTgpQ/87/qyME6mcfPT1aS6KiVhAf6MCdwED3FVMh78IxxZ7S/dkj7V1jw6nHQ3Cyk1auPqEpIcl8HltvFqKSkEOn9ZeaU96c3nk/SApTOif6VpYEEFaJCRw== 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=IMtuj5waTdpMfNxyae8mS4Rp0s+MdVIz4gSs25xw+YU=; b=sQZ+fxYDY9VBDma7+wsOXiCorIkBRc9aUuj4BrAukThdEDjnk/vyZO1m39w3eh7ZcdTKuyzwySwd+4TIzkPRrqvDER1uQFKHFRtF/Mr597ne7rMCWzhC7ULZECQGdwR70svuC7NL/xke6AZgrllCymhULgVLqqy8p3P7iMJ/6sy83Vg7pFPYwpJ3E5zUcUifJBxyDvm6lenUvVOuwS5Fv1zuctlpLpoKAb7/5hOyF9bCKBKclmGgOB73L2YYGc4rJDXhGNva7r/+8Pc6cVxYy6JllfUTTqjjkFySKNGKM5ZdYwA8j6zFU8WuAs5uDllQdSTnhhk+JxpI8MkKnm9jXw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:34:53 +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:34:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:01 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [/TIaTqDLSrXKZmnKD219M9/6T0fy28T6] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 49fc71f6-107a-469d-54c5-08da25a36515 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDakgk9ou+wVxje5Cp1JMeyFfyLgwor3/3br4QoswymLMevwSL8PaEgdEiLg/ncji9Xx2L70nSB0yy3oxzjnbYISp6rXqow1agVgnFGk5jEB0fvBUBmikOHjR1tFyNXSgQUt/spuIoOFg4ED3063mfXzFMZy3H7TzNPNWequfZBdNus8ceIHyMQnZszWfovGB2Wxjga2GGYqCW/qu+aimeiu/62FeLDWFnivRj9o88I8fyisQPWqIrMf2ofONyi2cPRdF10iGtIpxWFuSCAMD9T/szhOuviLev9fDF4gvYUtyPLtHTImCoyrx6KubBL5tHn6BJDmEQbrkD0tXvV5Nqqtf3PwjawYt37Kigoayc9MtB0C3Q3tfKB/aCpW/42dTIN2dCrYxgmGcAl6AQ9FdwruJtJFH1Td1Ks8rDtBptbG2/uf/6ov3pE7UeXeuUWfxUrXweTAMGlbdr66Ac8av56t55E/xI2YfaKX+tWXPpNByJCIz/tWq27W9dmJCPzl5fwIitNzY5A/yTrV3o6rqtwDNoBSH48SzYT7gYZt7TWHgSQE+R6wuJjuR8yk3IguGdI8/9ljmp+0KyoCDmzepkkgrP/9eA4FXNMr8CpTzYdynk13Igu7ZFoCggn8B6NwK/U9rTbaO3xzAA+Sm9D5bMqD9txzfE2pjCiM1UykiCdoCHzIkGwtYkcLWCKTx/ZDy9sVmQ2NgTBD6fW0o5ef1BgZfXoNjVhrC3BYFtjB1rdXY= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RcVn4UgKmq8/QfMYQyl4DoFuYZzWWieLk3uZvWKoi947yUb4n1/Acf4AcCV9Mzt+hMvfZcNky0faq5lYcLFIEoV96OvmXofEuN7AuZgZ41T9OysQJS2iKzrqzKJhTpX0qyE57dfeKGxaddx6NLsqWGzRtHg1IgvcY1inFdAw5fqrOUb1K+wuGRBsHG7QwHIoI2rr1LXJg04WD6lTYCAky8q2oPmIOLPjrU/rSX9ew1gIaccHyT2zkO85Og+/xeILh+jxS581U0Q24yYvubrZNgceFI6U/IZ45hCxiQ/cvo+4gegSquTJ9ddPPy3ccrWb9Pi9Wd1qUQjGSOwP6rAATSvefN6anshhybKe0YILV2KFf2kr+MiHB+12C1TnX6dI8ZJRHSl/sraA9fcwCYnMU2M93t3V829xW2zgxDFAW6LsqAGdh5Xs4uklFrldG/yUOQ5fHzPPVmdl8I2J77qlrAR12onfqLKwwr/1g+syrbVdy/Mk0Ii2wepZc9t0sHQkFjwwrbXzlIQDBBbKp6EozA4SGRzgI1YQ119XtC0NkCguHNtxD30xMbYjQE03pl7y7gk+Cpw+v1sUCmBI0lSggA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JVX5oRAXUgz3DeYxYDM/b2t+fKMbMdNq3KDgHtjStKB93ijfSWDgoyHEUSNt/xURf2euFYujFtVZfwQWfxSI+4Ok6mQC4nQXKlqalVsU7Eg/4ZkkSXzFhqBOHU+rlxlLK6YBsZLmqhq9YJyKVpqaS+vVPp6igoUkSEkOzOTtyXwSbXpYWjMCBs68UF/mEzZHBJl8b65Dulq8aBIuOwRCHojj9eIGiYIPsqekTL3gxnPgdokU7Xu0HlwIRPEVXOcNDg2QFd6Inh9YMgIiSCpA47J3ZFVhBSYcDcSAcfDeR02tb4E16sETV3TmpdXT2qeylV2cv2yDyt1WgeULc7GBzzYOoV0oJ2FA9yYh7U6iML+vacOvXdtngY2M/CI3h+fXw3/pKhyE2N/TZdYFkXjxQvDGlFWxoyKasrUBPi4omj7wk/VE5KqNWeoPqgi9R3Vulu3WrWpz+n27xQ9GC5Yy9GO0ufk+GH86l5HnOuUvnXHXh6+zLm8LdYzDkRz1jugXgoOsQdGslrsIgBeK4ialbnYiflr803WfRSX6QksQSecRIXTukMHMoALoST0jWUi1QCNZ2/YyW823TsYDN6iuAUXjxALsDZWWUdlkSqoiN2lcljY6SOlNha6QejNRPA+jFdt3fSiWM/DOTHHaUtZakzXQrDzpyXuVmq+3tQ8hr7R0LL49Q2vDJHJMXhf69Dh7DrnLHdoRjSFTPHuGc18LIe4bJfaZ48ltGEvPEel2mQ0iozAYAJx0BHe/qjV+7QjB0wFBqxCU2x2svq6/tCdC9BbulQOHVMRbV7QXYagfuEKhtx9JtSrVznuCaiMdESEBfNb4n7iA1FBC4F4xjP3BUSEYHkbg3C56VDe9B4krzP9efgkRBNzyUEBSc8bY1PEqrSMY4uL4LbuIlqs7D9zqQ14Q70i3Fg4A4C3ILBhs2XJm8p4KAY7poX8hqSQMOvNg+6ra25bdVxv/ZKzO+40sZ22A5MdvikiOlLArYZ/t2kX2s7vm7goy9Wytuh1TjTqpmZg6+X51KMbb4msR1pGkA/lP9gQl53lvDZuqPkbF1x7R1CTKkeZk/0FyW+ryn4mCFtK/PTTqx8hHEcq45LZKkJFX4WW0dr1YkpcXCk8bpgNyMWcnwpYCRZZClFowzTuh5z4vNzFaST7AAbw3s4oZ5L0mgTFJygz8mConP1PT6XghEeamwy8D71h7qXdHvUyJRzVg8qzsfy30b5yepeu5Bc2/QHyuOYkRq9c8FBQK6F5Kq1GSkcOb1OzqgK9k5txxGC8rWwqkZpNJ6zyp2D6wqK6cF0HDcGsk4JOrYD9pwuGA8baARCxMVFQ9200sTAnetZwz0aaSBLPnb4XTqAT+TGeZ+m/A621lc8zrkyOHKTPQ7pySIZRxZ8n8EB6M1YrjXROC8c+vDokjWkGjI9dxiz/MhB9BusOnbsPgSzArnubYRcwOEmsUDIRIthj18h07 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49fc71f6-107a-469d-54c5-08da25a36515 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:34:53.4014 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 16/32] fate/fits: Fix test requirements 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: bQAUMB2EObgC Signed-off-by: Andreas Rheinhardt --- tests/fate/fits.mak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index f16fc83266..ea471d6654 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -18,19 +18,19 @@ tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data -i $(TARGET_SAMPLES)/png1/lena-$(map.$(@)).png \ -y $(TARGET_PATH)/$(@) 2>/dev/null -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-ext_data_min_max +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-ext_data_min_max fate-fitsdec-ext_data_min_max: CMD = framecrc -i $(TARGET_SAMPLES)/fits/x0cj010ct_d0h.fit -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-blank_bitpix32 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-blank_bitpix32 fate-fitsdec-blank_bitpix32: CMD = framecrc -blank_value 65535 -i $(TARGET_SAMPLES)/fits/file008.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-32 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-bitpix-32 fate-fitsdec-bitpix-32: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0005.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-64 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-bitpix-64 fate-fitsdec-bitpix-64: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0006.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call ALLYES, GIF_DEMUXER FITS_DEMUXER GIF_DECODER FITS_DECODER FITS_ENCODER FITS_MUXER) += fate-fitsdec-multi +FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += fate-fitsdec-multi fate-fitsdec-multi: tests/data/fits-multi.fits fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap @@ -40,7 +40,7 @@ fate-fitsdec%: CMD = framecrc -i $(SRC) -pix_fmt $(PIXFMT) FATE_FITS_DEC_PIXFMT = gray gbrp gbrp16 gbrap16le $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%): fate-fitsdec-%: tests/data/lena-%.fits -FATE_FITS_DEC-$(call ALLYES, FITS_DEMUXER IMAGE2_DEMUXER FITS_DECODER PNG_DECODER FITS_ENCODER FITS_MUXER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) +FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, IMAGE2_DEMUXER PNG_DECODER SCALE_FILTER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) FATE_FITS += $(FATE_FITS_DEC-yes) fate-fitsdec: $(FATE_FITS_DEC-yes) @@ -51,7 +51,7 @@ fate-fitsenc%: CMD = framecrc -auto_conversion_filters -i $(SRC) -c:v fits -pix_ FATE_FITS_ENC_PIXFMT = gray gray16be gbrp gbrap gbrp16be gbrap16be $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%): tests/data/fits-multi.fits -FATE_FITS_ENC-$(call ALLYES, GIF_DEMUXER GIF_DECODER FITS_ENCODER FITS_MUXER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) +FATE_FITS_ENC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) FATE_FITS += $(FATE_FITS_ENC-yes) fate-fitsenc: $(FATE_FITS_ENC-yes) From patchwork Sun Apr 24 03:34:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220036pzh; Sat, 23 Apr 2022 20:37:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHfgt5nF20UBXtRTkIUYaCERjUFVy3RyTM1/GmMWXbS1dS+aQ+CD+0Fn8mR5WUmfZeU6Be X-Received: by 2002:a17:906:3799:b0:6ec:d25:3afe with SMTP id n25-20020a170906379900b006ec0d253afemr10760473ejc.44.1650771426156; Sat, 23 Apr 2022 20:37:06 -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 b2-20020a170906660200b006e09345838csi10780222ejp.743.2022.04.23.20.37.05; Sat, 23 Apr 2022 20:37:06 -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=QsEEhWSu; 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 8108768B42F; Sun, 24 Apr 2022 06:35:07 +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-oln040092068084.outbound.protection.outlook.com [40.92.68.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 435CC68B3FF for ; Sun, 24 Apr 2022 06:35:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SyoSLCgKOrMBkJUhD06Oh/PzRdL/aMvem33O1x6rvNsaotQYSLrpWDTR3TMEfWtaPohiWhWFhSWv0EEvoLmH48F0Goa9DXx8kSaBHKtnHQpqkrXB5G0NaQZa+6hV9wljpCbyU3CjnqqvqwZetGN4C/tgtevPj3YxyivM+PiGTnvfLYD+8NyevAEEZJm9JaRjzZP8T7BqO8f4pJO1N5NiXWrf2ypeG5VfTwZeQTz2HvVG4ydhd0GwWwpg9TI7RlXrzQD5YZfxjegolHUJxzTe3M4L9R7n/t98I+vkoxw8P9xmH5BieReDRT1AdrtoFCQ64qeByQyZZ0jUOgwm7UdKWQ== 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=Ix7AV0xTu1vq2bmA5982lo+U7frIY+9KYtPtetV9Zr0=; b=TxNRiIMwpD7Xljre5IRbTz2esXsW3acvfrLpF0ZDgVAK6g/63m8UAp+U+9v0NKPAJgqRqw425P9RQ3u4rsW++W2Oo7vYmbYSM8dZngUufDk6WS1qvmErx8fg+xG8dp7mx2dxHue+e/c2QTGxG8Q1Kze3izT49i3I4hdnHQgIOnDEUE/KnidpAU0g+eCq7P7lXbs9qNnf2YdaXIC1vHCtfOrynjbyNlXmwVlZ+7Wayir4/jaUJs0yxFs+HmiyGCvZqoayvtUdqhcQSr+EFq/h6mJY6HEOweErWmwPJ2NQ2SRR5xDksretdrDqbmcLPXJYXJDtqPIedsRi3R9T4xb8OA== 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=Ix7AV0xTu1vq2bmA5982lo+U7frIY+9KYtPtetV9Zr0=; b=QsEEhWSuArDYG60kajDnJKUEg5xZvhM5x9+NLt9jtMwLilsWD7eSAvnvbJIZ92+EIbXEzc5grfdh5kENqVVQFNnmgg6/+Huvycxu2V+Tr8nLkmmzvlHwxj2wz2vwqqj/qiwALOkBo9M65RH7bn0OHSLniGhez65a/7BlJFESRLdUr8rpPDosMmgRjbzS2jAoM33RczJnwmVHKnhynv7p0HewHRw937APO45qNFoc29cvSXS7cukaueJEj6K+kocin/pIMS5eAIABM8MaAwvuc33Ob8Y9Dp2oj0N4ZLtPSWbav3Na+lgQ6y2RLM7Ck919U8WhADSA+uQbReC5QnVfeQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:02 +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:35:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:02 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [7t1unveB5ZOksbhgCKana3ZAFw7g9FXJ] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 251f1f86-3261-4dfd-cc12-08da25a36a32 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbTWNwFwaPCdf+T5sz059MzTyyY1HMNQGjTF7elK1fLsIISdX66tI73Qrup4/IlL6abnPMS8K+m15WCwwMLyNwPq3Tn1FpvbxIiOCwBZUWT0fzGAMyBF9bVAvEnl/BCx1GEAC1bjU3WxSJZSLj3dX9dkA81dvbQPEg+yRzRmKojY+HDHma1KUgFpfAqvsRkzVrVtj6cPzxQ7oR7BouBDBTGoRIDaVffUOSLxZhEDAQTIUNl9BE8n4OzWnTqWxhOeZIUczIOUS1r3cw+I+ZCn7BEIrH0P6cIYHtAWv3Am/rumGYLkc7I7OBetX7QjegOyitKYkFp0WMFB4NU9uomWc8RNEdPgi7t3+nfMfs5CMd/gfJsK5yCPQmw8zUscJBs1IKFNjy1Aq8tud56ESInNMLpx78oCeYjMXNMSa0zcEY8FdHhLXsAv0S+cdAp9lBbd2iubNDc1mG2XTGYj7VEtbCph1gwliy05Az58qUxWZcwz4apMMCXp7muRFzpwKMG79gzTvFlR+pDCS/eTLY4f7XKfpVADFglHp/BfnCUkwp9x6hSyvm7HS2j7EiBRnkVl0E0MlGMUq6xkBoH4N59ZI4HmO4QGdWJYMaKMCfvHSut9uqtOmLpTB5T8h/Ac6BAO0845nHcLy6MYHAoEcDL402PuHkx3oM4yKw3M+8qCyukfyOfN7mHoYa0tR5XIS8PK+qs8cHjYeBWkieEfbIZ9VyjI= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l7m6IM1kuz3wXS4K6B3AAgnh89XFY9hpuaR0/1uGly/wlE5XiwWmcFHLD7y/HpdwWh2wkDtJUa0VM1eoKVyqO1cHDQlSHAUEsPQdd8uD4TcHZPEOgpSUFIYWGV/x4Goe9oMCgZMAdOXaEpYlhAJ0SW+AUp4ffQJRNz+uuk0IhgCktK3GPEzTh2xlldc0lPL8JWwzeGMiaQORDOsO2mAvvFpHnrlWWXmFaFwtzxWVkAmWpMJGcl+QY/B3Ye3B/p6wmrbbgxBEqexZtLn/5dik0pjlGaDI5P7E0vwR0N9tgUnu+KnQtWnROGy6ef3scg/MxzoYuwCTjMNDjSHP0StI+pPI3htvB7C4cwtXoqmFgU98Np8HdVwRonyF8QPlLvyDzCmiYYNF6msZber5S/7akK2Dly4gFkM6Q4g2VutBWayu40rkczWe1nM/C8CnFiEtOGJAMV8lRB0ChelC+z/nvQU/au+SbotNw3DK5lLPJRh/iEMry1lNo4vkaMu7EdWTqJIEcsvrc1UBgJww6e+2TefRKJmcTVOxGcqgUpl4tt0jV5tcVdecsVdzICWPth41UC8cwPrFyIBgetHrsiqdrQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ypYeE9liNywY8ij5mpozwQzNeER8AyoAavO/I0RLyNJwL5PRjuiuVJ4C63aZb2OqXwiC+JSXjJvITRWPb23M85HJOtREF0S9sTP+ARUHSBdKv1+J7t2h9B+Ds0yaj1dZ77EW2CyEO4QcVW4M4grcztySH+dxMDAHHuMF2B8tIkbvFVhHaxFwfX7K/v8rEAvm1wMOGxDwmXC1suNtVJLVcYrnfkxo+0SwN2GXJhpQb4+xWiEjt5cl621mgloGB4ziuuV8vsopk1Hn0UsMHKNwId7gvVzJdaS9SC1n5UjJHdbnbYscxsmaaHMXXJv0M91nQP6Xde4gwZVZR6lRSlwEZL8Cl6q7nMrWXCSMRKLPJevFbMUK+bCx8Z2CCEn5hlAV589vNfHJgn6SKtAMKXWFtHVwQt2xDm8SO6fT3QbOdN2SAIRbWcIcU0lVs8gwQ1/M4Gnd8Rt3hh9b/WgC3HyhgSPmUuVUhj8kZlOQ/pFDzirsmN9hCcBDO7QMuoWK3668/XV3JFsOIeFBQLV7KGtLdzFKPBt4U/mqK/2wtb67K0f4Bc4P+62S2dN4x9RfUWd882AxcExsstL27VPt/mdgZTS1qQ7haktDPtpMeAjLL4R4agGQ0IbfGQEnn7XwP6Oy62QERFUsaKw3UFE7VXvAM+XOwQ+vqc6qokASqPfIMV3yL98+7Mx3IgcI/UkowbgcrddTf9Pp0s2QpfhBnddfoxRsIEQZSGiwndXGlHy0Vtv4jR1axCUNK3QzGbw3paYz7kJMyayUE6PDH0aADtfoywBfVIJMGdP5EpPuiQ4WGkljgzvpN7Cz6ZkiFUYjfGvy+bagg9qIW06HKOjHLpNPheHbGVC5gJZjA9yLiQtz8gGHxoaFQNgvw+p5ZYTTBJr1FnaRHJfHUISe5cnjfkn5pr6YIJq6MztojT1agKdke9cEC4tPgz6RaH8s+9M+GOGrXGRVuoGu3mumCuK1QwZutCwYbIWTacXWRYQDjFvdCFFcqNarlAOxK1VkByjw0atdAF2ZUSsbNTSFaYamQ5aUCgCs+jz7ziJ0mUVAwOhLXWMy9CKT928hHO4vtkhQPKkywjTjsHyi0SessEI/Sx1ddP5ndmpmA7fpw8V3DbcnDqJKVweKlKJYKEXr/unrRLB0HLqZmI4B4RwZzXc/q3YMI+uvl2TCBt33o4TzSGdZqDWogCom8Ux3ksT3VTYTBvEDJ6bLjXl36WEEBqIRAU2ZVyWK9EwBMUdaQq0+YajisdQKKbUmkzLwCchltjj4rFsn9wGnPU/+8tz5/ahlBNzwIVsT5BqIn6Xw8mhTfweMFcS070MJ6vRauZO5yb1d20qzd3QknL75eTNOMweMtgaBEKXqwM8DBkjLyKy8JW5hthsS8k+f+P+Vy2imX/8Ww1eX5fA59sjyJr1DkIVxbLjFFarGI+SctUWOKxzEhAfTvJ/BLx8WeIRSuGAITc2zXEP+ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 251f1f86-3261-4dfd-cc12-08da25a36a32 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:35:01.9976 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 17/32] fate/fits: Use transcode for transcode-like 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: Xr3ZneEj+LuQ Each of the intermediately generated lena-*.fits files is only used for exactly one test; so it could be deleted right after the test. Switching to a transcode test (which is also more natural) achieves this. It also adds checksums of the intermediate files to the ref-file. Signed-off-by: Andreas Rheinhardt --- tests/fate/fits.mak | 19 +++++-------------- tests/ref/fate/fitsdec-gbrap16le | 2 ++ tests/ref/fate/fitsdec-gbrp | 2 ++ tests/ref/fate/fitsdec-gbrp16 | 2 ++ tests/ref/fate/fitsdec-gray | 2 ++ 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index ea471d6654..b9e99d97ee 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -6,17 +6,10 @@ tests/data/fits-multi.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data #mapping of fits file formats to png filenames # TODO: Use an actual 64bit input file and fix the gbrp16 test on big-endian -map.tests/data/lena-gray.fits := gray8 -map.tests/data/lena-gbrp.fits := rgb24 -map.tests/data/lena-gbrp16.fits := rgb48 -map.tests/data/lena-gbrap16le.fits := rgba64 - -tests/data/lena%.fits: TAG = GEN -tests/data/lena%.fits: NAME = $(map.$(@)) -tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -i $(TARGET_SAMPLES)/png1/lena-$(map.$(@)).png \ - -y $(TARGET_PATH)/$(@) 2>/dev/null +fits-png-map-gray := gray8 +fits-png-map-gbrp := rgb24 +fits-png-map-gbrp16 := rgb48 +fits-png-map-gbrap16le := rgba64 FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-ext_data_min_max fate-fitsdec-ext_data_min_max: CMD = framecrc -i $(TARGET_SAMPLES)/fits/x0cj010ct_d0h.fit -pix_fmt gray16le -vf scale @@ -35,11 +28,9 @@ fate-fitsdec-multi: tests/data/fits-multi.fits fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap fate-fitsdec%: PIXFMT = $(word 3, $(subst -, ,$(@))) -fate-fitsdec%: SRC = $(TARGET_PATH)/tests/data/lena-$(PIXFMT).fits -fate-fitsdec%: CMD = framecrc -i $(SRC) -pix_fmt $(PIXFMT) +fate-fitsdec%: CMD = transcode image2 $(TARGET_SAMPLES)/png1/lena-$(fits-png-map-$(PIXFMT)).png fits "-vf scale -pix_fmt $(PIXFMT)" FATE_FITS_DEC_PIXFMT = gray gbrp gbrp16 gbrap16le -$(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%): fate-fitsdec-%: tests/data/lena-%.fits FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, IMAGE2_DEMUXER PNG_DECODER SCALE_FILTER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) FATE_FITS += $(FATE_FITS_DEC-yes) diff --git a/tests/ref/fate/fitsdec-gbrap16le b/tests/ref/fate/fitsdec-gbrap16le index 78abb5cde7..53ef980b13 100644 --- a/tests/ref/fate/fitsdec-gbrap16le +++ b/tests/ref/fate/fitsdec-gbrap16le @@ -1,3 +1,5 @@ +64526d8da12d1fa07ceea5725647076f *tests/data/fate/fitsdec-gbrap16le.fits +135360 tests/data/fate/fitsdec-gbrap16le.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gbrp b/tests/ref/fate/fitsdec-gbrp index 8767b6715f..23249f492b 100644 --- a/tests/ref/fate/fitsdec-gbrp +++ b/tests/ref/fate/fitsdec-gbrp @@ -1,3 +1,5 @@ +38e232e4c1ca57b5866efa01da70359c *tests/data/fate/fitsdec-gbrp.fits +54720 tests/data/fate/fitsdec-gbrp.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gbrp16 b/tests/ref/fate/fitsdec-gbrp16 index f6368f2c02..9250690e9b 100644 --- a/tests/ref/fate/fitsdec-gbrp16 +++ b/tests/ref/fate/fitsdec-gbrp16 @@ -1,3 +1,5 @@ +2078208c93ba417d3fe150ba42bf5a30 *tests/data/fate/fitsdec-gbrp16.fits +103680 tests/data/fate/fitsdec-gbrp16.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gray b/tests/ref/fate/fitsdec-gray index 488ee71022..b7992bfda3 100644 --- a/tests/ref/fate/fitsdec-gray +++ b/tests/ref/fate/fitsdec-gray @@ -1,3 +1,5 @@ +c02ac3e0a9f2ceeb1e6e66c085a63671 *tests/data/fate/fitsdec-gray.fits +20160 tests/data/fate/fitsdec-gray.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo From patchwork Sun Apr 24 03:34:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35409 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220086pzh; Sat, 23 Apr 2022 20:37:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbRG8Yjdmi9MIr4Xu1T6tmiiSUtwC5Wg5h4Tesh1mc1Wz/+CefO/k52bUj6/AW8V9nw7er X-Received: by 2002:aa7:de0c:0:b0:425:d510:8f40 with SMTP id h12-20020aa7de0c000000b00425d5108f40mr4572237edv.4.1650771436235; Sat, 23 Apr 2022 20:37:16 -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 gv17-20020a1709072bd100b006e7f77fd673si10244342ejc.674.2022.04.23.20.37.15; Sat, 23 Apr 2022 20:37:16 -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=uYRC9Ipn; 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 BC57F68B363; Sun, 24 Apr 2022 06:35:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074032.outbound.protection.outlook.com [40.92.74.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 049C768B43A for ; Sun, 24 Apr 2022 06:35:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C6napmV1gn7hkfSof5ky5dv+8jgpxJ89cVUu3jJJ02qf5H56UgcUdEf90jRa1eKLqYIXXxtMyJb/93fKmmvfLhe7IrOfOk40UgmVh7lT0H68WrMjtvJ9ObgAtrutNwFopKDWfaZhOGefTM2FZ/QdEWlEB1x/6lfKlvsRVTDhClTUuUlNuI/vZWE+1LRmmCF61wLrJDWBVOZzP3X6l+Nh/k7p97KSHs2MAH1JrZxm6j2HFpCkmGatA6QpmgZHDG4e3e7VFM7jXamupNTF3G2eN7gUI6ZrUnIkxE0sWOIUNgdpfFhr34ZAnY1Z9X9PtoIEHO01yE8JRXCne0Rti/WFIg== 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=DTsbNeMCLCg0Juo/eVCeus/ZxZ7xY/c1un5kgJZ1qRQ=; b=DTg/JbHzkYNzhLZOdqKurxfawXM37NSssEnxLCQBcKjAs+qxo5rGfZxIoHIQqCDesjKAZemduAy8kQGTTqxpkeuH+9HqFoyft88aS10GrDkSgi8TyrpdGYqM05ioLfEbBup4BvpvFfVpyJPNOuJZS3v+t5eUgItO3S+wo+mkug+Sh3+IZMY+yT9CdCe10WSGNg1yguGKtqj8wwoFOC26sIJDIXVF+RU1SJI60ZzOAtFm3jeFLt/OTLEKV2T9ryBw67qSUGlAmndbwVOdqdzDtIoef9xTI4WhBYBGgUqFbEnbkhSMnFeSQhNCz+BqKrtlxCixus6pmJ0TlU/dP4H4Hg== 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=DTsbNeMCLCg0Juo/eVCeus/ZxZ7xY/c1un5kgJZ1qRQ=; b=uYRC9IpnWgQ+mmp0pkmaXwoMW4B1Fe2dfZy76dasR9PAWgkPQ2OKO+ScO2IHo4gjNFXK87ufmQYrjH/2dJkqyx3haWCS9EcpBhUoe5W03pPNAeIB7MHmqfpLHG5vS2jWudFee3Vdj1SZ+UipoE0X8rjO15e32tCYJPvZXElno5NTKEK14PaNwbc4Vyl+Rhhbn599FWK6qFdcI2fMNe7Df0wmfJZmJKyQPwtw7WOAgo7xtbQNNObfkTdtdYcWp8SyayW2ogWBZ/RpYAI2Li0XmQ6FcjWUp5YHRm9ka116CjxPF5PV0sNhXwCmkQr2L1NL7jpEslmTyC3A704Ry5ZUfg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:06 +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:35:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:03 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [6ahHYHsK/h8QPURI03tyayUZb3taSQDR] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c51daf1-b734-4483-ba8a-08da25a36d1a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbTWNwFwaPCdfkWl7IEuENHATvqli6Z8gPXo3olJl2NUvR2ShPOm2TAk+4iNZEz/AR81H9gzs6zqRb8gSvRva82eYZTQkr+dj47tZSQrtff12YD1DPlfmDP9E+EIZ/WXHUuybLkQ5iG2b2/W8nqKn4sw0A0evpksZzdn5/6asfJxpG1SxOqpvCSmYvJ8O/0L/bpWC7GA9k8Sctiv3O6lDPKbevcQLB/RIDOtcC+yurSRPSr0zxc25voPKGvL8egl5YcQjaZmpX8CosQo6psDxE7luQ6KLZEvUAWSATdmi6gqkGxNVPncvwzlE6rk8jmrKSsNEKxNfIxxFRXIuMlPS3ieEWZPr49eF6Rh2FQW1vUQS2m9bNCu6fVx6R4E2y4UZoi48OKkK/0EJ/E2fUcTdNc8qUcTMI/b4YD6qM6rRhvw8a/5o3oGPzIYkhGgMMpE0aRP/WUlh9QEqn79VcLJvIOaoiMqJBglGgq4hnOqo8vuFeQeORPxSM5avYCiWnIs0NO3FoPmCu3cMnZ78sv4WJipbFrp342fwShaaHa+01LlQTV4fK8sG6YnJ3FJ2aD1I4JQbOqwREIMRgNS63RGMwuNNwFeEGCVsYMM7FT0K/5VFVWf/Xz/rN9aT4EUBeo+Ky3hIWa5ki2UwZka/zxA7+3n6uR7m4khdY67P5JkmwrweKnVFXSJKwezGZd1VUfPSOYJipa3QANgVhuRKKbrosGE= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rb0z5d4DxExoSOkGjlo4JNpnDkNxoEY3aGAZOIs0UNclwLh7ndC2sSxR9E8iG6Cjf/sdlZvHuad3iHun96gGcsfOJLJK/Ev7wYvL4nsQaesz2qeGW+SouBjtiG7XqvXScQo9NESJTPeBiluheYEoUZx+YC1pcQlUhj9M40PotltC2EDWNLE62HwhlpFJCr5YiQNpHWqmitd0JlOcK1fQTCz7C+Wmycm2S+8zK7072/39pljeoc5XCsTk6KVN4P6x4ojT/bvVMTG7BQRZt1G/XNpMpR/L0H+HDPjQkxQ+SVjEJTmeKBcpO9wLXUrrxpjNKbLLcDNC5pkBvoEZjFjeAzh2y6EYVZo9CPsq6JgLRgUOvqkYVrGy8HJbqabeKyxqhFClrTBpiWZ0JFtlfdKz6B6OltLX6AHM1/FI1IlNxQX2fSj0FA4tI/9xJNXKI7jAX/N08B4AkUnAZtydGwZbNG97XPm3WbxE94tiClm579mQbXkC9I8xInFsXupWVzksuQy2a/1lGubUzmzVzg5bS3IRkWhNEIFBVltRLZZiOF5/36jRAu7AW/5oXqIKnt3eQy0lhzf36+wDmYgBAtFvqw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XoIOWMxTJE7nBYLGS7KLteqfc2Xa90nzshj+cjVNGgwBvQzi6gi+zX2vwFmpDI4PjIBxwgu+I4qR3B0ImHO0I7BOAkk4j2RmwK8h6C40mc/Tzrgi+YjbGqqFbGUar3wxF55evxcc42SKm79KBtCg9XyrqyqSQcaonz0QrYsYqbOjec5Fkj0QI9BKEEaVNSqOaEOvmvvxaz7AMU63jTX2anotq8vBk8JpeIu0piCtj5rdYoT8251emJoed2Ba3FK4YWFoKxrD5xVSTluQpytQ7u2OemsluqQyYyxum3lHIqkSj7qeF1NePW19asAMHNGiMA7stq3sqqu0iu7h+H9zS+K6w5MJdhck4yuEtxX1A6CtALZUR/GEemdaNYG794wgF1Txl13HBIjEqeZfINeUheKk7E318Q1ZZm5+2euiNIhX6irIkkInevlFO5r8WhDWUajtltX8aSCHfobWbQccRN4tjJSrv/VYxu4MBXd2d/+nx1ezxK3YwME4CFcBvv7hC5FeBxKK+jLkhq9Hzzf5Ma/w/WvodqMCOBdWE2hf+CWKkhAGn18ZQyMqqqESTvAXk+4WYmgR2hazrHMYqGEgyv0keuHUm072nO17dzaZr7DYOok0dUQy+3bw1zjh2g6P18rFpdJ0SApd3lfQKueBePks/tVtuSdapFGWDquiPo79A9ClriHepOHsad+/WkEJeE/n51qk2JgPQQZ7ewbbr6lvGNzD/JEQ9Nk3D0FHJ+T1RZXQ9xjOhm7/NaFQ0+aAYf71e4RStoOHQawlQNpDiroGo6aCZGHr+CpMLBdr4Be2C35Ff1Z8qBeLnoWTyoZCCfli4MboIrxng/Uc7bj1gYrowyR6qymDh19eM1S62ANtqEc8UmJF1S0PB6ZFgxdfIcmHLzdylBfF8edIHMCw6w2uXsl2QHXYUMteqkW1nQxVaZnAxvWTD/WYv/MNitKfzBW0P6gYzZD1Ks+mkOBbQwO78Tn5qhb9nCxEA0gGQ0NAOBIB1gEHhVo8hBH/zfUf1GVRGKuc+YOHTCSTQxXxjjExKBYKoZyKCIV9slcqKUAf4TjaHHlbvfN1W7sV9I18Lh6UQd3TtOYvj6uscN432BiBTuhGOokDiJ+nw/0R3cu68SpOtCGadXgRJFYw1iF3IIRzkarMOa9ZVrSSaTyS7TNaHiBWqn4uubwRfw4J64PrGT472Q+VzcR4GjKU3q0wkcE4zvDhBIlmhD6Hbg5Hcim3Ghapb1o5WbWYI4IWgayUlmWY6G521MKVc8DnoA6p8+LV+YJLNG1nuOT1b/1Q4cC9nZVi5ZAZLcawx844oVFl32JPbIRGzzSeLWOd+GI3lLSQFY+zCEbPrhNcAuvJWSlMDH6Q0fxjQJp8FWUjLAfDPrMj+CBcJda/5ETjmrRC4XH8JzbFVPRV63lStWbgjBJwV1cSlTTJorsovRtPjeXlcC0z/2f2XrG9U6dLiKME X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c51daf1-b734-4483-ba8a-08da25a36d1a 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:35:06.8715 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 18/32] avformat/fitsenc: Simplify writing header padding 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: qDTISxcE3hbh Signed-off-by: Andreas Rheinhardt --- libavformat/fitsenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/fitsenc.c b/libavformat/fitsenc.c index 5cf34ef067..37ee10bb13 100644 --- a/libavformat/fitsenc.c +++ b/libavformat/fitsenc.c @@ -24,6 +24,7 @@ * FITS muxer. */ +#include "avio_internal.h" #include "internal.h" typedef struct FITSContext { @@ -177,11 +178,7 @@ static int write_image_header(AVFormatContext *s) lines_written++; lines_left = ((lines_written + 35) / 36) * 36 - lines_written; - memset(buffer, ' ', 80); - while (lines_left > 0) { - avio_write(s->pb, buffer, sizeof(buffer)); - lines_left--; - } + ffio_fill(s->pb, ' ', sizeof(buffer) * lines_left); return 0; } From patchwork Sun Apr 24 03:34:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220120pzh; Sat, 23 Apr 2022 20:37:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZeUEVEIgebLhooDAIdGGEY0uynm/QIYL9ot7eIfTWyK9dn1p4OoZ9WZAdvCPHTDxNiey3 X-Received: by 2002:a17:906:a08b:b0:6b9:2e20:f139 with SMTP id q11-20020a170906a08b00b006b92e20f139mr11148853ejy.463.1650771446061; Sat, 23 Apr 2022 20:37:26 -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 v13-20020a1709061dcd00b006efc916692esi9898715ejh.907.2022.04.23.20.37.25; Sat, 23 Apr 2022 20:37:26 -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=ZVX0zEvV; 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 B5E1168B44A; Sun, 24 Apr 2022 06:35:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074064.outbound.protection.outlook.com [40.92.74.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB0CB68B2F2 for ; Sun, 24 Apr 2022 06:35:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gfFtIrY638HnBo0xnUkpvnm7ig9882S5x3+Xu+wfTpbFJeZmuZlW1fBQN2upWGVK5rsVfuwdrwOuS8fEGcplRiscJihNrI/PVrS3TZ/T9zYgNj7dpzzCnJJqSfOAVAU2IL50hVyKDoexwq+DeUWUlVWIgtHF1g2Ydnp+r5Dzn52m2b7AetyWM+ZJDp4IjYqdPvBAsrZb8FWyBt/BX1te1YA1HQo1+Ci4SWl199aXVJA0fL8a79KWqeROh+HFQZ72NEfmfrIkvbax+Pr3KNGnniPqTkjKTF/NrDMS2jjRCXAjrQQ4LeSl8xR+nIvMmTQ7i/cZvvprMHbZ7Cp9rgkGlw== 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=3lzINvaevxfhuzFKKFTBR/7EELghm2S/qmN1r7D3IHc=; b=JWWKH15XK1slx/AaCTduxvTEMoJ6ntYwuaAZvs+KzpNupTG/O4ecyPk9TX/WMpDjfDxkpG0Xtb5CE+UC6alRDJ/Tu12k106x8NpZmzZLT+vZoMzZ7Sz4phaL5trtfHhbqlzQ6FLqHuX84gKjj7pQYu+xJa8RX+sS//UkuGJev5y/XyElDd3FRlxVa4XxkeLrhpg5Kk7srhhicViCr4wxDKQpkIc8mvKfdF4PW4xXx4PFPh3w5wMPyqjkJF4dAbSSkiCPmzboUYtJ8bQOadV7B1613BFty7OzjHgTMaAQC6y1h+tIwNFYFKcKJZ1Cpf8Nwrrw3Q6EsMIqPXhsHNp7Eg== 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=3lzINvaevxfhuzFKKFTBR/7EELghm2S/qmN1r7D3IHc=; b=ZVX0zEvVtnzHH77IoODySuA+Z38u/yyXb8ThX8idhdUGYgNVT3TBaW252dEPI3pdr710N5S23uxSrQ5ImzxV9qeFf3uHIGxd4D/iEBkgEeuT1+4uwYo2SiwlEF9QIy21iSu1YjY6WGmPjUwmcrOp6sSOUy6rIN8EC6odoJSWrTnkq7Bi6+vjhuuMg+KmmMqZfIB2TZE65XwQACNQKerCYzaU8f8ltBj5ZJJlcpI7zlWPHrOabs9QPUHM3n74mVFto/Noxfk9IJZUukjQ+Gqe/T9D9fkLpdlbXtbBQQ1/PjGcUeFBAZFUYT+6plubboSBYS61s6XYVU11D2ZDVb1ZDQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:11 +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:35:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:04 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [V8ct4LUoF1878s4mNvSZ2xXvCVaTS3l+] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1d5cfb2-1732-4353-e544-08da25a37002 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXfG5cBYvl1QIL2RuxMjL8vjSghFWxGdQ9LySMxPkVHvf5zKpampFGtJWB1Dz2tkOTYbDDUloQamS/Bp99+9NYv97j+lusBpn98my0+hm9T9nU1gaCNfqUnsBGbDHm+imWmpCWYxGmrTvOUmKFzmPjr/ef6zzKvK3AOh/2WNY2sJ/Dr+fJQ9UnEgMCVvyZ1Kgj0i/43G0JiaZNu95gsCXh2vMnwaBu48baF4nen3oVJaP5GPD4YC0w4p7K8oL148xfbjGS0mgXuB9Xgt/R0sEa8EMuiIVBCY+W9RBSAuusFvrrv5QGx0G5ulRpb6BwQ1I8oIac0kOSxs03NQRanQNDbhlv7IsJOwIUD9sXMJ5bubo7NFumN6DAd+z4DLdRmNfQfhKLHP33MAl34Nz6P4vyGpYazTzhzGsZjKaHiBdpoPuHs0mZsXtugoXZQRXVmG+CM/ueJxLR9onsy4fG9HO+F6EhvLHmPHxpDx4/fQrdXSXqc7YV9DFgaKsxzsQYwwV162xOgbxre+dZdhEZnVEVpMWwj64DAIjeEM0ulU1mx7X/mldkcnsr4Op8zUFSJuzKWU4HEEY4X3Lr0OAyupCO3i/OQRYWh/W0I6K4anDyONSm9BjNAm0moS7nDH6kF6+rj8btKwyP04Cdpi8nLOHPhx2chjpJSxFJMqOh/ukCEsYCRgNaafinDVw== X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EahUnKDGZhvIOOueolamm25x+vugQPwDxuyq44xRTe3GIwxNlO/c5LoJsH5R44Vvjb6YaKZN+9XdN21WKRVMh64G03ngQbXx/SumCbjXjMtc50GdnK1XHoSI+rgXK7yx1yFEjqB5gbQ2x2Vxq0uxbzNvYoure9x5oqGGPfkF/WJozSZrWVksnen7Di/Y5NDFtrYNaglKOIZSexI4Cv8kQrtdYintIRKNE8BTQUi96vbsk4slj4na+CHtnCagNDoaSV6+KM7GCaSz7Xf8ozAgYD7S5se00Rp3kPCpt8mo+adXl/sEyjTwDKJL41znzXYZeAc/r4TQHTqW4qeEitjkohWZSuYlKQzC0UNmFlwUtISFq+TA7e05yFWV4+/HmtoEutMhzYPns55APHar+Lv8+oFG+ajZbQAEkC2qb/xY02YcYWTaxDUEqIYWGn8ao9JuXAgtMXjUbWKQrBhPEvsWxTg8WIoi7StLgfBvXHzB+hocG/8ii6SWq1J8kj9aCTuclcHr2akn+RT4+TpljOSfJwShyGadTKAWyCarSiziUzm09nj6zASw4j+lNn4gmRgdRZzyv9+LhGIF0FC+HTBW9w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mMZsUP9sG/+S6xwpUu8AIcmmlcYh2WpzX95gzNfZNVLBKFQ+YLHL6aQanDeMlVbR6EDCUfEavk2KL3Q0T+1uepAolk4hBLlS4j92FKSrLyFb0sGRHeJvG5r50+a+nr19Qfbw/EHMaNyOXmwjA4MYEANCHtKwQmrXra0xCZLo1y0DXZh+GJ2ZU7ZV0nRcQOeCmauZEVufgHcz+fUL/TnE45vrFpSkY/Qkod3MbSvZ7506Mdc4pigo4sdg6ayB2xVoCbtRF+p3KYgVvaSvaNURTcfwdBDK/8iPRcviFFnyN5fIUHr26GnlTZ4MmfwMA+FCka2SlBDC/Y4JV+RvY9HW0PfkqyrcH7e/Xz3ZQa2ddoLde7YkXHRD/cWf44KReAfvTzr/4aSNeK/AcZgRm0rTTjHpIhDXQG4fsuSO7bIEEHPQ+THT0dKdchtYnfJGLbV2427pZiqg92jdQNPopBFG4kLuBx+Qf+aq4cFHUD0g4fzpxC7t5iykaFmUTA+VeDTY+nqxEtojHLKw75NepyrFMPGy0xUNCvApN4NQvrsWurAV7FN9DMOIRlzqexWjI+fmU4YgylOGsX6Jmdc9QleYjdL+JqRBOpcupVSC4gXvSMQE2QD5JTpz0ES4E2wpYw3WBltAoBaYr5N/6d2xB5rz3WWWVKeGTgyyJ/JD+0LoL0TqTekR6GFx7XY+YsRscACgk3wrYbG2CTH8V7PBjjXnNcMBro0DPvv8ZaP9QPjFbdQYdSmIpHznUGkTMr2dbiu7IiZN7ZFNTwZe3bAprfXrAZJRzA1UKn4xPNZwFcO3qZ9u2JVwrMurA0EbF8UTaS2Mv3tgFXrYAaiEMnevAfuB1qPHQrcjiEA8l57RBwPd+C3gY5KJ6F5eNtkg0vFJC6/fZk4dAcKB71xaG0sNlyvKIu3m2IRUOe8KhwZrsNbvsxSBk5kmpLRjFO2UkYV4ulJ6yV3tb4rnwLRPICDVxiwJB3uHxt3LQ6XQKyKWUfiG9jA9hwE19LjXEKiYps55DJ4Yi5eXESjW38HRgtuqzgkT6k/kfvIzfo/dbsWqary9mASKHW8uFF4eIDg19XXi20+HGZDQ4qml2h6vYUeGBqttR7rr10OWkfXiGK2MdVSQaoBcMMUeL4e21ca+NeVvyGt1z5ACBpeab3ZQadWhUc8nXlNxY1vqNG7Utd/0fbxOFcwdVnOGCqnE9RmT3efhAbUyAQnKOIleksKgRTAoNvFgm/k+nLFRkgaAVTpUje9+aOhM0SOlfsZ9Ji0S+J1i1UvF4eN5m1uU6kTGzlW6lLM6B3LsMB/bkoao04Jvd2UeQvNuKpHF/16BnWZZ9rgth8Vil1vhwXv0/iAtUa0iX3kqp3+KZcVmPb/GidzlhxiI67s+FWEvHCo+Gq9GpANASMqblWxS3mwZw+EcLS5G5rZqllRGxPPwidLVAMqzIeFBNMk1MDyccmoeCvgdUH2MLWt3 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1d5cfb2-1732-4353-e544-08da25a37002 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:35:11.8137 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 19/32] fate/speedhq: Fix test requirements 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: Kj4nc4vchODR Signed-off-by: Andreas Rheinhardt --- tests/fate/speedhq.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/speedhq.mak b/tests/fate/speedhq.mak index 32405b710f..199ee160ea 100644 --- a/tests/fate/speedhq.mak +++ b/tests/fate/speedhq.mak @@ -4,5 +4,5 @@ FATE_SPEEDHQ = fate-speedhq-422 \ fate-speedhq-422: CMD = framecrc -flags +bitexact -f rawvideo -c:v speedhq -tag:v SHQ2 -video_size 112x64 -i $(TARGET_SAMPLES)/speedhq/progressive.shq2 -pix_fmt yuv422p fate-speedhq-422-singlefield: CMD = framecrc -flags +bitexact -f rawvideo -c:v speedhq -tag:v SHQ2 -video_size 112x32 -i $(TARGET_SAMPLES)/speedhq/singlefield.shq2 -pix_fmt yuv422p -FATE_SAMPLES_FFMPEG-$(call DEMDEC, RAWVIDEO, SPEEDHQ) += $(FATE_SPEEDHQ) +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, RAWVIDEO, SPEEDHQ) += $(FATE_SPEEDHQ) fate-speedhq: $(FATE_SPEEDHQ) From patchwork Sun Apr 24 03:34:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220156pzh; Sat, 23 Apr 2022 20:37:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiaBV7Vf91l9Wrt21dz3xOTGKNVrWL+eyR3OX7NpDOj+6HinOQmqdcva045iWQANboX8QM X-Received: by 2002:a17:907:9708:b0:6e8:d95e:273b with SMTP id jg8-20020a170907970800b006e8d95e273bmr10673280ejc.421.1650771456731; Sat, 23 Apr 2022 20:37: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 z24-20020a17090665d800b006e895dec42asi9940731ejn.198.2022.04.23.20.37.36; Sat, 23 Apr 2022 20:37: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=C8saXpOW; 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 BF99768B47C; Sun, 24 Apr 2022 06:35:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074064.outbound.protection.outlook.com [40.92.74.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E777068B2F2 for ; Sun, 24 Apr 2022 06:35:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ekYeTD7tx5Ideozr+Bq5QfXVQyI3z/rUSPFY5k36fiVRPjGhxiTbx1ut1qyR4+/La3Vwn/Xpx3xAlNDFdQWh4dI+ATxt9Qd9wzWzh7LsfmLmwub4dPM//Xpqweo61ahBT8X3tlN11v3bctlLQb5rZ1sH+Lcpw6Xfr6wv7LThKqtk8OYpqxlZXuXmQR1Z4xCh+n1HFVUG8OkU5VYt6gk8b2LbnNSx1o9Ka4AclwXxfIpOXQ0CiX7fccdMlcYkBYS1EvVfh5+y1Bre4ubT9DD58pGNUCv/HSMly21P8ThUKIIUcZXHdyMJoc5vkY0l7vYvJqri9bUchLcoblkHzZsNsQ== 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=Xf4aYvfvfFCmYMrBmoXG1xZwdJ4Q8GmSTXBr26hB1mQ=; b=PUnlL9iQ6rqSBoGTGpdjL6WMqrLFsBfgSqZULkIfGXVTS+oPzRhNXCHyJufmo0NQZwRyEZhPEH2tHJY7cXHBFvEkotYqcSQvdVe9jTTpPPZ+ejAeFgsvr1O8dmHxOqgayPqyqoxtBnr5s6dy5ZVEtU+pXDMbl5K/+UIfctZJHD8WLzHdKkX0zzVacXY7vmGSh1e29pUzb7eMOq2kC/rOynQkCOUs7PwG2q07TJ/bDvfzdlQ9tScTyCJoUOged0cNPOpOwtdKNvs2louC+RejSHHAWgeF+Ukzg3t8qFHrHlZUDdxIjcPi0SVFyJnlsyoTKPneeJ3nyRHPr0ZBgBYqcA== 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=Xf4aYvfvfFCmYMrBmoXG1xZwdJ4Q8GmSTXBr26hB1mQ=; b=C8saXpOWgVRgcxNWqAZFgjY3RstuIFXPLO4KyBoWNQ4yxD6N9GXN1fVX/VZybdEwShjX52QtTwZEWFMUt4Nkg7u/J1mgq87cuopV23b/Q/8gt7M+F0nA+5hC4GcBJWcFNYmxfFeRBtRHRvt+GZ1dAt9wsOWp3/wjWUsmY/hJhYjVuSkfeDgtr67CC0x19ZOhE4MGDExvIbR9QVK3ZGme6EvRIVQt/ZWMkGkwcKBr67vtVgpj7AReR5meIllag2DKQIPrZ1hg5IN+UyZDrKkpoZkUZuiQiKayUy/PsGlD8+6alvBUzsGOwyY2Ky+kd1+njHHv5ODXlxHnO2uAm3UrKw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:13 +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:35:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:05 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [6JFTYOdhbJFVMZZ0A4imkhUSxnbARohS] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1ac4cb6-4129-4ef5-9690-08da25a370ff X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsD4rNWXL7bI8FSMaAYlfs4iVjzvPqWeUM1gl131epprLGCvlVa+NDPL9u8lMdqVJS76JT7bZRtQ72nlYJtuJl5z6Z9ny/yzFLhCOpFFg+Gul4ZP3iekmtpvG0E6M9AUYaYWQcSEs8gGDeZyiJYPqG/izN1bF9ID2q0N4Dwuetx5sXlAJKU3ykwTcn+GWzttxcyfnCQBjoILZMk8vgurhHc/mT+bjPC+0nwZmd8SWEFVo5oBF/H56JPhE5eaaa6fbrgAxOiRwwWZuIiueIvXQrCZK++8/zo0IVdSst+v3UApe7xUj+w4v9+7nUosP2iRnGTp/bJygQibOYdNyPrXyWG7heEUlda2+ri0OhbBLAvs711/pm3qPfaivsJqi8QsP7c19T6L/dD3aMj4tq3wO63+uis+AcbbE/N5s+QgS6P1SYBPH0xAlKShzUfSXLT7CpbSxVlYRR6qHr6KubRV1IB8C7b7SyxHGBZjESbYF1b7gSprXPgdx7/SYiLQKsHx28jhU2APbFULc0QrMfzrWih4N8DCVbTmhKHDLjumROdhMb3EndUsUAIf/8oVEtUVn4CLIiXsWUINaIr2y9ak2ySkZBz4T5fV1YEyKxFonnJwVaxq4zQ33Mb+edJ/p1ZBGcpqnc+1uSKZtMUdeaTZCTLLWqDcY81z483SllHjlhuyYRYs5Bqw43D5AoQJ5o2BVT3d7SHgmbAPn/js/BswBRECAdEHPHXGPvF5YCGfer5opsfD7p5NmmiJS/yRnFPZ2GSJy6flvIZsO+q0onKwajp X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MQuQbdW93nZLc68dmt25gxucS48Co/wOJeoJZ8/a+7wIJ6qJotn4gYRe1yOSHFNyzph5rrw1pDvoSS9fXnrZ/xH0LyVnTbdkBm3OtACQwxsmCQHIVnsuPMxGeGwURuNRgPu7xFckzE1GsN1/4oPX8fil3d1Oiw0eLnDcgLJm0P4eCBGXhNwY97rBDxMLrw+UnUMIinr2dcrb5/N0i0eQlFyuprxFdfiP55ZoHWjwq1a0+SNvA7gOUFcT4inydfujGtv2Cqn9P2tg2610g13rgrdlGV9l58wf1UCl+le6NcdDchwEG1jizmUcyOAXPPDrzTRe4vXxvLgTzMiEEQG3hj78mI9o81R08wo5Dn6mD9cYDPUMDPdILsEA7rWH4ln8agcx+/z/Kag78k+5TmCd1q3e69MyP/5qIXZDVJwKJhm80roK/XIkVjeaWry2ObargOBXp+KeO+lEU6Tu9Q9C4F25iX577rLAj3DIho3SEW7i0NNvqeTXDfGqojwtLAkrgO3j8RNuh8AmPUZ9RIQwo6+gCVd+IBRMEVE5PVtYbo6Yh+j6pwIDTSa+w77UEdZ/rkw6zoLd4es8xo2RxZKBPA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jad+qXb5ywx9U1lgIdmKWdIglIShFfnG+TIjEyUZSd/uRwP4/c9EmnChTfPL9Hd8she4CBsnhlA0blWtskX/6TpQIVuvaLtnzNGPrr7KNb+PATob/rBIiw+81y6YplkNU3JMoBqTKcKrvnKa+fXQgNuBtaCZe7omcbKu7H9nLSsEW9jT8VWFXyrIUQLxhobQYM/jonmBOIb82JrDBzBJ+Q3Z3/ByDJlH75aM38YMLbzhk0q1PXggNqfJ4ry3UYhUqV57Dzi8x52aPIULtGfSk83mzJ/zsHzceXHwXYN3rnndzGh4tPvyhaV7i1rwXK5uaTH8yemU8fl8ziJeQkHlkijCLWJ49gkpZf+s81YG/f7XMrtcPkjJOPcEpwpSVOz0JT4PjpYP2avQI7OQ4vJ5x0LFIznuLcbyH3gOtCrdQSZcCNo5Cyvh+Fl0B6WYxz9r5cqeHHxGNEuhC+x2hMnxcFxGaaUhYAoehRC7q09iWwt0Of3/+gmQpu9pFuf1isgs4DGoBcPt4JA7akAhOwkq17t620QFdugR909fy1xo1O0+p2eTd3C8wuPjXZCTSbyGw4oHjdh0qnaETyHIfq8dg2xn8LFsyM4UuoupBAgD2pxF5Bw2qHMkazZc6b16tToydbgNXcXuL/yTgSulLBzUeyyo3BWTRrzbVzOVb8LI3XApWSXcf4upDLahI0BM2HG+A6EH7zGOMKv40Yel0HatCc5m4xiXyU4lRdkMxfY3RlyNqXp0wVEGnT3SeGg6u6oXRWd1n7Y3E6beWp6zgtdPeoUJ0emETrHvBBWesmNV9sN1HcWMsxu5vVXISxiRS+/FMTb2LkyEIKzZs/mE7gBbapHMfuPk7lRh1GPP/gUfwFLO9IixCo4/obY6aN/y51EcD46q1AxF1ZiSKP/zfeUt81a9wSDmlyNYllPNFrCjkz/rjmPUJN6WYQmFn/PPp3kgNow/EVPgbkPT3/AibN48k7onGQFfbN/2NXOpsQ4ivPUAovXPlOufv4fF+SEXBdBTCbQLIvz7Cb6DTCPqoeXelaGLA7z3lKk0dEc5LzUbXMBCgUC3gQfsO+W7NjiqxcLKKp+RhzBTBo7RJ9hduvEYcOSvTyhmwlf1r/a4Y0k1i5lkfCqeZQdS03wrQh1PbNu3DBbSv6NgXrniO14t3OeRzvvU+p5i5cx/UMKDoZmCEB6Oq00LSwOoKJm+JXv0yKqWoqF1q4vRgIAhrhJkPB5o4KjmRc6Obj8Aj+Onp78w9fWjKyr+u4mVSfWJu0gqmpF/nhwBJ2c62Uw2rr/e/7r7TiTLkNvLp6aB7EHIXef2KE34c0T5LB96VXeWMO+WTcspbMG1LX/JMAreYgAwpwEDWR686ZCWCz9JTS7gzvK/xgYiso8lCEPUgGRszxvbmdgF0YZRRQTAAKPdEND4w7Nqtn5nCrb9LyBJYLseavul7lQJqhgw94eyGde8bLt+4OSJ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1ac4cb6-4129-4ef5-9690-08da25a370ff 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:35:13.4229 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 20/32] tests/fate-run: Remove intermediate lavf_container_fate files 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: BfNaGmyiIYyr They are not used lateron. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 8c27210ac0..a96ff049b0 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -340,6 +340,7 @@ lavf_container_fate() t="${test#lavf-fate-}" outdir="tests/data/lavf-fate" file=${outdir}/lavf.$t + cleanfiles="$cleanfiles $file" input="${target_samples}/$1" do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $3 From patchwork Sun Apr 24 03:34:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35412 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220200pzh; Sat, 23 Apr 2022 20:37:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuV0HPzT6Dy1BDGfrfyQuErO+odu1rXSm5hm7p6bngBQfkLM/0E+Kpa4ZSh+HJxmXX9O8J X-Received: by 2002:a17:907:1b1f:b0:6f0:21ec:6051 with SMTP id mp31-20020a1709071b1f00b006f021ec6051mr10307544ejc.533.1650771467266; Sat, 23 Apr 2022 20:37:47 -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 ca22-20020aa7cd76000000b0041d716cac8esi9346099edb.557.2022.04.23.20.37.46; Sat, 23 Apr 2022 20:37:47 -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=QYGJ554R; 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 9B27568B487; Sun, 24 Apr 2022 06:35:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074065.outbound.protection.outlook.com [40.92.74.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 630F768B43A for ; Sun, 24 Apr 2022 06:35:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PeLwW0mFMtOZev2CX+mcyiUxZr2kVpoJQi0ETUXwWjn7WC+Nn1JgBNlUwUWE/R+ogDb/YElhS0eqVrw5YDmNgRcmOLfBj1ppRK5GV3cO2jRB8zTqQNxs/w3Pvi4dE7BbPj+ItAAuB91/XfExkUaFkoPiGP5dycI3sVVdy3Rlq/OSpI5jKzc0N/yEHbrHkQJbdTqLW8YW13iQPitk5iMSXgq0Ioduexbe4tcMdsUI6HHbIKWzDkNUNl9Yan21oOZu/vB5QGfIkPCxkbbhI5Bk/57ppTEMLuZIyHNuVbgk2MihFaMW7OLepLUGDGeHp24ek9CPLitDMW6DqswfiV8CLQ== 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=oeQe5EU4fh5M2IYHa8FUJxpVRPvu3A+4Nx7RFDJ0v5A=; b=UzrxbHn6M2Tjmm2XC3LhSWwhBH2iM1Cn+KsmBfFtFYibuVGqVu62QshHq+HESrnI5H993eHXXpiKsydDOE7I+jNtZFMZ4bQ5Opr/rOPPFJJsQhffMGfIPwTskHsewPT6ezW7gHcs7nGvmCrQx0ZzJjtZqQrx4hFaEgDGvpORtkW6I6hDTPUykoX0nkRlTOYQ3bhNVHswn+aOHE/vtH3s+p4GtOfKs0ild9mVmo3URoKFZbyxa+DhhiTVaXGKmQIeDSu4Rvieyfqr6Q1/mbIgfr5rnozKP3Z1vUQHshuE5b8/WHnH59oUBhJyi+lw1mGpMqckQOg3LiXnhB+6qriuOA== 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=oeQe5EU4fh5M2IYHa8FUJxpVRPvu3A+4Nx7RFDJ0v5A=; b=QYGJ554R9c1cmEYlHiB3ngUeSjtoQle6LKN17ztJqI8MkP8EFYD3yiZT+VvGaFD6n//H6Y9tWH9dDY0XTTOzA3hAooW1tpS2+PjUODejU8Z3LKXvrxeSwmsIH5fN9OznByNxaVU6iUB6in3dpCIidbOboZBkwrpf/h3CG4VWgF2dnO5f8NN3ESf+0R3dCCxc+WKPArZZVvemlHgGONQoRjwGfU6VN+xLivd9JD3eHTfdKfZkeLdKGQFyEPMIO7xnViBEcBXBGb2U2PQVrOCuvkgZMCBWq0wQJnMLylKZLOHdm108sYytkUFpIUgAIgHdoN9ImBlY75Y/mvL4VFy0Jg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:20 +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:35:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:06 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [PNAy/Yoa+pOm/Hb2TjZ3KwzoP973x/sV] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0520c609-a6f6-4c9c-9df5-08da25a37520 X-MS-Exchange-SLBlob-MailProps: sTyj/kSftossciOsF9M7BsaQ2E4IflqN4pFh8AgsBbqa5pgh6JR5v1NoH4Im0hpV685bNqBlR2Nc4znLO5uu7KiwCt89EpPzf363Y8boX7ASkPkNucinNQ5GKGBfaoEJEjrnJ+kx6UxnHaQJ0HrDp3pK/Y/9Q1Pwflmv3t2Ohs8Xs1FmESmkNJfRZ6AvWLSpBYHQ16M92tJYj+TFUjEa6UMN99qiTAdXHWozSuCRL1UGDCLJ7uYwos5X2kK6yRybaQw+n1gdj10RVzsR4BNOZI5SM7nZ8CUzE9FtZJlcpomF4vBNm1OJP1jS+wQngvX1pnrWajjpfzPjj7hsvOwOghq9HNTykrbDTVJEsEu1Ayvv1sFjwU1wKD+usOJLyL+RgxG9O7EZvBT/0ufHz3Dt1CaQuh575kHD7Nrm5zuw3en75qFitypC2MJuBwOLSbN9mUOlA63AKZFS5gfq+h6jnNQjz9GcSLI+GY6G3qORF/RhEuyyB8meHsmSFdjx7CSdxcopPF5G9SKGzPagldfsFw1aNutti7049XdAUc4n3D20WF/T2xhoKN3WavY//eHF65R08sw2yh6+qDUqCzxo0QVq4IPK0KcEzlA6pSZHdCsO14VQtUxJPgqaRmHNO9K5WeSqigxT9ahsAzw6igMXqPk+j2YnmRsZAOBmmEKGsePEj6x5o6+FkN9kwwQ2nIDMZUV0azLFQtIshMQi/KjJrHeygABwR/cUDe9H5HArKbXDUOXe4qaUycEaW8igpckraRedtd1J0WiKbnudeuJEtxpZLiB5jCl9kxTjrFSWHskp1rqdttXvidmKxDazHT8Pj9I4LCBhg1ro/WhRONJW6Q== X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4+Ty73EDnaidV0dnGr77iHRm6Ame+HnGvW7LZpNpfnMErFSvIG+udajDVxslKCnfTkt9+hdlz/1BDjHnfSqdpc0B3DaeBizH6OmWW2kGwoZxsfFXwk5+ADOyEYxOSIAwNwPRGPBIXvuIeAivmdN24z9eyLMwNSLsdn2fm2s+A1ap1rvfouuIy6Fvn4BmvSWrPQyM+4uTrZuJCDpT5YCAlc/vxiR6ZEKxNfBna3gOK+kAcT2fcg3pUxQM8TRCqbUdJnkqpSTA+N2aIrettBBw7KW4kZHjUmxev/jGxqjdTqAXR4cMdQihgpLYX5xAC5VuW0JniGdltBFdRPrBjfzjNY2GYLbsUrb4JBC4Z4qAPxcSjt0ymIRbJ//Gtl9rw31m2B2Y8XthcVwKjodSEFMzH7hLP4QmVYuaU45HpmunKgopT4EmS9atWjoHigz021XxoUnJG3/LXFg054DRGdcy/6bqaqkpiejuyWsKp5Md9cl14P0aOJ9ogLzHHLiB59mUh+/AjFAW4BZgeMG+jW6l0gcN8s69k3rhl3LEOQ0EXM3ggdmmKJ/i/K1Oy+6p1OO8Idk+0pnWH1iOOtwLIjICTQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mgphSV0cNEv4AmghqPLVfhomCaFP+Nq/grVKf4rSuFHanAsYZTLQxOekR95xmhXDa7+pIjpr7zMiCEeDq0h4lQ/7nsFxb3KjBDphicWdIrIHxrPsLcxYqbcYhYaT76OeLBk/oGLFqYjaSNiRnxt+xA35b28dBtPYb0FhU5trqjQdfMLWkxdJ26UUyUpvod8DwujVdWru6F2BZUNj9uVbhUYMYNT/+q2KCRvZhKgdilrq/BPyTZZ6VRkQOmf/+CFgc6dwME/gxHdd+6lIdgcEzDS6xEhU6NEDdKJgXO2kBOWgskZvUDmbWRUhN8fCHdLPIBku/crwMrHOii9Ni3WZq4GBEMBGVAlN9k+3v2pARhpimsb8FQY+Fg2Xcx/CwOcHhDgc76XKiTdnkf0fYPsbZ4yoDJeGWJ1WjdwDEvk+f+5c3CGILh0Np6lRhJxAnymstKmS1GaqulLN1r8mW+mu61wQe0sJ5zFYBGDqul2aLCr2pK885lY2BKmEzzXBH7LrUxZDS4SpNspeJTbs+btAG2ecpH3li0l5C5Ya/38rw+s+PeAWotNlnJwQISmbiCBEro4xI5QOPo6zL4t1gOkCSf6FK22XZ7dk5IzyhTULLu7GgbFpBpKuxDFu8wZY68QflXfRlkrjp/2DqZQYYKYp8kQLSH+DwgGnaRch/GQ6FBRb67c0ZQhP9ZyJGUwXvnKHlkBNtuqiDMj7aSdyjxO79Ms6LbzCV9Rs4Fbt0xSKLFNjv7MmmPcDDjRfUNVKZZh9duqpYNuDfUYXBCmaQFxXtvX8vPxWCJ6SNmm/mfHxbgLf57OS2jlSaBUDylqCbP5/DnmE3LekHuBrz5pT8M0x/ro/drJ6lo746IpH/uoQRHehoIy6IIjKeduYypQH3Os69+reJP58jOyikPiybJ85AojH4X4TAqP3LJPBDy2P8ltt0kdbKtklkoWPoaOagqoxT+RgZun/I/OhNWAXO6av2b3B3kgnEPwr2KPOwpZca2JVnc+Te9/J7gC67d5NR5hbTLBFkmONZmNVuks2mXQEgG1ek8PlfMp3YsiHyonYUGoj3hIQp1AT0se4VTBaBovPxVh+b5Wnoa3/EFUDIqjKLSmPxnIv+iiFLOO+zbsRv7WcuCCwPZNPItp5n/Yd9PIByQTK7gX/pVPCGW7SQGJ4J7kz3mNuCwPFnFqsaEM1vGVrGST2carRmHIJUf5yL5TLX+NeMcRJ/+Z72aOZ5hLuOL4TRkwQn57S4nRc9zTTJsEfPjeuGsmwY3dEDiD0xtmis3K/HbGbrR0/0IehbqYLcHGRIwJd5clwJ6BOb0fE5empHcE8HQEOTI6Kb8i4CaEMREMbQUSrLqRIHzdawr45aPnHr0TdWOWd8qt3efGZa8+ppIJ/RlahqjJEa1Nte971hCsJavARD+ThS3HCNmcH/mgZYX3RWdoM9OT9agGHldfPvs6g7XuCHd7ZUCLmRJQ6 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0520c609-a6f6-4c9c-9df5-08da25a37520 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:35:20.3359 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 21/32] fate/seek: Avoid list of source files 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: 74rWrmpx6k9p The output files of the lavf tests are highly regular, allowing to use rules for the src files instead of a list. Signed-off-by: Andreas Rheinhardt --- The list of vsynth and acodec src file names could be removed if the tests were to be renamed/modified to allow to infer said filename from the name of the test. tests/fate/seek.mak | 157 ++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 85 deletions(-) diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index 5efec32702..b4e9246cc3 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -160,91 +160,78 @@ fate-seek-vsynth_lena-yuv: SRC = fate/vsynth_lena-yuv.avi FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%) -# files from fate-lavf - -FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16BE, AIFF) += aiff -FATE_SEEK_LAVF-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al -FATE_SEEK_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf -FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16BE, AU) += au -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi -FATE_SEEK_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp -FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv -FATE_SEEK_LAVF-$(call ENCDEC, FLV, FLV) += flv -FATE_SEEK_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf -FATE_SEEK_LAVF-$(call ENCDEC, MJPEG, IMAGE2) += jpg -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv -FATE_SEEK_LAVF-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg -FATE_SEEK_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 -FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dv25 -FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcpro50 -FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom -FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut -FATE_SEEK_LAVF-$(call ENCDEC, FLAC, OGG) += ogg -FATE_SEEK_LAVF-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe -FATE_SEEK_LAVF-$(call ENCDEC, PCX, IMAGE2) += pcx -FATE_SEEK_LAVF-$(call ENCDEC, PGM, IMAGE2) += pgm -FATE_SEEK_LAVF-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe -FATE_SEEK_LAVF-$(call ENCDEC, PPM, IMAGE2) += ppm -FATE_SEEK_LAVF-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe -FATE_SEEK_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm -FATE_SEEK_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi -FATE_SEEK_LAVF-$(call ENCDEC, FLV, SWF) += swf -FATE_SEEK_LAVF-$(call ENCDEC, TARGA, IMAGE2) += tga -FATE_SEEK_LAVF-$(call ENCDEC, TIFF, IMAGE2) += tiff -FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts -FATE_SEEK_LAVF-$(call ENCDEC, PCM_U8, VOC) += voc -FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16LE, WAV) += wav -FATE_SEEK_LAVF-$(call ENCDEC, MP2, WTV) += wtv -FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m - -fate-seek-lavf-aiff: SRC = lavf/lavf.aiff -fate-seek-lavf-al: SRC = lavf/lavf.al -fate-seek-lavf-asf: SRC = lavf/lavf.asf -fate-seek-lavf-au: SRC = lavf/lavf.au -fate-seek-lavf-avi: SRC = lavf/lavf.avi -fate-seek-lavf-bmp: SRC = images/bmp/%02d.bmp -fate-seek-lavf-dv: SRC = lavf/lavf.dv -fate-seek-lavf-flv: SRC = lavf/lavf.flv -fate-seek-lavf-gif: SRC = lavf/lavf.gif -fate-seek-lavf-gxf: SRC = lavf/lavf.gxf -fate-seek-lavf-jpg: SRC = images/jpg/%02d.jpg -fate-seek-lavf-mkv: SRC = lavf/lavf.mkv -fate-seek-lavf-mmf: SRC = lavf/lavf.mmf -fate-seek-lavf-mov: SRC = lavf/lavf.mov -fate-seek-lavf-mpg: SRC = lavf/lavf.mpg -fate-seek-lavf-ul: SRC = lavf/lavf.ul -fate-seek-lavf-mxf: SRC = lavf/lavf.mxf -fate-seek-lavf-mxf_d10: SRC = lavf/lavf.mxf_d10 -fate-seek-lavf-mxf_dv25: SRC = lavf/lavf.mxf_dv25 -fate-seek-lavf-mxf_dvcpro50: SRC = lavf/lavf.mxf_dvcpro50 -fate-seek-lavf-mxf_opatom: SRC = lavf/lavf.mxf_opatom -fate-seek-lavf-mxf_opatom_audio: SRC = lavf/lavf.mxf_opatom_audio -fate-seek-lavf-nut: SRC = lavf/lavf.nut -fate-seek-lavf-ogg: SRC = lavf/lavf.ogg -fate-seek-lavf-pbmpipe: SRC = lavf/pbmpipe.pbm -fate-seek-lavf-pcx: SRC = images/pcx/%02d.pcx -fate-seek-lavf-pgm: SRC = images/pgm/%02d.pgm -fate-seek-lavf-pgmpipe: SRC = lavf/pgmpipe.pgm -fate-seek-lavf-ppm: SRC = images/ppm/%02d.ppm -fate-seek-lavf-ppmpipe: SRC = lavf/ppmpipe.ppm -fate-seek-lavf-rm: SRC = lavf/lavf.rm -fate-seek-lavf-sgi: SRC = images/sgi/%02d.sgi -fate-seek-lavf-swf: SRC = lavf/lavf.swf -fate-seek-lavf-tga: SRC = images/tga/%02d.tga -fate-seek-lavf-tiff: SRC = images/tiff/%02d.tiff -fate-seek-lavf-ts: SRC = lavf/lavf.ts -fate-seek-lavf-voc: SRC = lavf/lavf.voc -fate-seek-lavf-wav: SRC = lavf/lavf.wav -fate-seek-lavf-wtv: SRC = lavf/lavf.wtv -fate-seek-lavf-y4m: SRC = lavf/lavf.y4m - -FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%) +# files from fate-lavf-audio + +FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AIFF) += aiff +FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al +FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AU) += au +FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf +FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul +FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, FLAC, OGG) += ogg +FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_U8, VOC) += voc +FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, WAV) += wav + +FATE_SEEK_LAVF_AUDIO := $(FATE_SEEK_LAVF_AUDIO-yes:%=fate-seek-lavf-%) +FATE_SEEK += $(FATE_SEEK_LAVF_AUDIO) + +# files from fate-lavf-container + +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, AVI) += avi +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, FLV, FLV) += flv +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dv25 +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcpro50 +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, NUT) += nut +FATE_SEEK_LAVF_CONTAINER-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, FLV, SWF) += swf +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts +FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, MP2, WTV) += wtv + +FATE_SEEK_LAVF_CONTAINER := $(FATE_SEEK_LAVF_CONTAINER-yes:%=fate-seek-lavf-%) +FATE_SEEK += $(FATE_SEEK_LAVF_CONTAINER) + +# files from fate-lavf-video + +FATE_SEEK_LAVF_VIDEO-$(call ENCDEC, GIF, IMAGE2) += gif +FATE_SEEK_LAVF_VIDEO-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m + +FATE_SEEK_LAVF_VIDEO := $(FATE_SEEK_LAVF_VIDEO-yes:%=fate-seek-lavf-%) +FATE_SEEK += $(FATE_SEEK_LAVF_VIDEO) +$(FATE_SEEK_LAVF_AUDIO) $(FATE_SEEK_LAVF_CONTAINER) $(FATE_SEEK_LAVF_VIDEO): SRC = lavf/lavf.$(@:fate-seek-lavf-%=%) + +# files from fate-lavf-image + +FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, BMP, IMAGE2) += bmp +FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, MJPEG, IMAGE2) += jpg +FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PCX, IMAGE2) += pcx +FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PGM, IMAGE2) += pgm +FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PPM, IMAGE2) += ppm +FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, SGI, IMAGE2) += sgi +FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, TARGA, IMAGE2) += tga +FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, TIFF, IMAGE2) += tiff + +FATE_SEEK_LAVF_IMAGE := $(FATE_SEEK_LAVF_IMAGE-yes:%=fate-seek-lavf-%) +$(FATE_SEEK_LAVF_IMAGE): SRC = images/$(@:fate-seek-lavf-%=%)/%02d.$(@:fate-seek-lavf-%=%) +FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE) + +#files from fate-lavf-image2pipe + +FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe +FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe +FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe + +FATE_SEEK_LAVF_IMAGE2PIPE := $(FATE_SEEK_LAVF_IMAGE2PIPE-yes:%=fate-seek-lavf-%) +$(FATE_SEEK_LAVF_IMAGE2PIPE): SRC = lavf/$(@:fate-seek-lavf-%pipe=%)pipe.$(@:fate-seek-lavf-%pipe=%) +FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE2PIPE) # extra files From patchwork Sun Apr 24 03:34:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220242pzh; Sat, 23 Apr 2022 20:37:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLtIavy+PSdoWUauRkIdYnARAUvtb8vHHjyu2Idg7wEH4A8pSrlWxt55vu8SGLl2rdupg/ X-Received: by 2002:a17:906:c14a:b0:6e8:76d0:e0eb with SMTP id dp10-20020a170906c14a00b006e876d0e0ebmr10386196ejc.412.1650771479602; Sat, 23 Apr 2022 20:37:59 -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 x23-20020a170906805700b006f37c73010esi1955504ejw.209.2022.04.23.20.37.58; Sat, 23 Apr 2022 20:37:59 -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=Zs48sfjP; 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 9056468B2CC; Sun, 24 Apr 2022 06:35:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074092.outbound.protection.outlook.com [40.92.74.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9C5868B445 for ; Sun, 24 Apr 2022 06:35:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=STh+eCARibbLlImwcfXpZBg0OCLzhBoQDY2ywPkwcDQw5LuAjqGNPbQGfY3FGAsycG7ZTlP47jJIVbLQUGZY+82N8b2eqWGWJeojJjDneIx45a5oEKUOrgXJ7E2lM0DQiAAQo0BFRh40c8TtD0WeoeWPSIkR+oOChh2p/TjRSgqmtSpxIkVjMWF7b22cKku9647gfaPRL2EJ2f8xjxtTjSJuTcn0OJ1Otwr/C8Y8awjrHmO/GStIxm1N4k2wl608tF8ZGK31xnVw5ROASD1fHgmnkg3zmQwGkPoipdL1nbN/K5cfWrE31wnWHP+mAKsQzEUe2VX8+rmql8Kt3HGZkw== 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=VGEAbUTB6BGYMBNwaxttJh5YWPYibQjhG1aEPa2a57Q=; b=M4Ca87QdsEG0knXogIj4etHUFBfVbyv4lRnzKf8Br140TTM0STdIs5+yC5zyROn9AEWC0wytvbgn4GKDEmckYbNpNS2e5eENje4OGU2/QC6S87comia88XBfHf9Z1m1WdAtrmBmcbs74cdLxlQowy0pMghmDgwU0cV2x/TFrIYN2odfIMZyII5nVBLim7KZnmpiLgQ4qTQ0MPDlkrwNfrpsYKh5BIOuSgvHh4ymjtm7koEXb1Ht2ilR7xMbx5YiYph9IxJXRkC7/3tHo78qwsKYwzpFvNbn8Wgpu0zSMJD+Gb6Flq8KyALcsNjDyh6Kiyt1Lnb8D2s+/lztmSXWBMg== 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=VGEAbUTB6BGYMBNwaxttJh5YWPYibQjhG1aEPa2a57Q=; b=Zs48sfjP6iNL+lnd+HO+DkKxxHTUbpUsMaz/zIDw4b+So1+b+BASOkotlProPC7LnRDMMjqZjU9DiAkqsZNSkEaEWWZV5vEQfySfQKejVZeDIOx9JXhUDvPNyl1+QbsUL/0FQtV9PtkpsZzgpgYnfSRXSVhbHOxim//+ySZ3lxmBQCq1XqXYyLRjUurqIzymJDQZYIjhPu3ABH6MemvBZu5GG5fEwroQIzx6qtCU6AKFvDlyJkniDcDRunzNBr70zlEP9WNjjqylC1cVw9SXZNff3nMh4BQULQQNXKZuNWiPoaDbKdEELKnFcWSmVCp6xY/f0nKdtrrXYssvtBnE/g== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:21 +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:35:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:07 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [BYsFpworgPGanodc1ZGkmJSz+lwlTr3b] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 15856c50-32b2-49fb-b435-08da25a375df X-MS-Exchange-SLBlob-MailProps: GjjEsbJCp86fDEzVeffD4t5EU7xgsxXWK5KUjZmwoFqBV0bgCty168r2oqzlc/wfWEteP6XWWZnreSobUvfO7ix2Jlwnph27G3UMSC3vkTICXROiyJDIpibYa8e2M+pV4BngUX1ZAoEb5zo2/9gtG0lVhkB36x9XZJhcUqlRSfmblLvx+8LUh9EK2CeXDyna02kL0VO+9BG7V3B37sn3ICLQOtAVoa/KrWT918ydK8jz+TG0+RgzvhvT0P/08POzJaPJNN9RVbSWypPi/t04JAiQfhWfhg85POGTD8ByVsPk36zgr5IFzn4LOZyMBr4nnB00KYDzYt9n5mtTHAUEe5MrVoXn2TX+PRwsiSIZSupozgZbZyshPW53U19vCipfKGrVBBjufcmNSM1BsflPpBr0v6GMnCRt/KWxufc5Xnom17toTjgGzz6wwjRqHMdoEei4BueWvGaCKQRc8+mzWAWW93NQ/l38p3Js2nlJ/g3oBceVgHgwN03zVwa9TFvi9gsruPwuP8VyYNuOhtBcWJ9/x60ec06ZvEkYKyM0RWZCa/n2UmlO3XOae9gCUAU27U2r6oaNx8P9v3Czok3qrZAvaFA0VUnY8cntW61UmR9pmOj44gMn7z84GcrLYCaMQCmGvVwJ3IXGoczktRAb8bW/9Io59QV7SkwF4/T4GfBPdfa+YGgPiWwbAuZBYtEdHncIjy5WAYaY8Tc7I9+Ixx7AHpPa52cT5gqrps8e6DbkwM47E540OHBcUbIXMqPphEzLl1Pck8KaNUT65Nq3RcnfN6gIBAeBG5cbSuHo6Ycv6KqaEfSOWW+Z2gUZliQP1HzgnBGJ4amHu9bRD3WAE1V2glTqezFDW+8OfUYYibp7NTHLRI0GVA== X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xTIepU3gtduz2w4Rzkgpu61GN1QYT2YwSflaMdZN6PupcRFjS8u1TKFBmbcdCPWz6XN+NRLXi8VONi7X2OaXFRl+3/0Zy9Mf/zv2asRjrSTNGiJ83fI7xzF6eH84WjGB4dzLNHAZz7x87iTwHCkl+a9oGDAa05WktKB+R3lt9FJdn2baE8Cj1S57r3qztBmNAHvhfrmAOBy9QrYYZnU876lYx7OsDKgxUT+w5tNWyti8EUMKy3NV1dQ808VwYwh/M4iQI2fPr0yFwcimcLrNt7UeA8Y7J+/V/cvtL9GJs3RknmGfnGmpbyYCJSRqEeVjuvIwL90AYI5r1OQ0n7wOfuEeyQglGs225ODYct5GzpUGuvZxH6OhO+lVOstGVdqHKvvgUfCrz9WIfrR2lA0+SvTyPSAjOp6s0jWfGUZA+5blmInbAXVOq+3Xt4vRB+RemwEJdFMkqbw1+R1BhU03eXntPPpugZwFcGc7VLHM1/ZtsR5rAth5DzCzxK/LehbIm/sWos4t9WEpCvs5MSdZs45lROHa/7mDhWqsKV1mkYfjE1MtjiqdBoDuMUoxGTmoh/kuEJ/vljf5jzXDRs6YrA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n4V97t+PJNHl3Bs+pglpFawW7NlNRS24mkNgEm8B5BK53wbsxIBhm3zyC05ySMpD/ZolG4KK3SlOfgiiX/0dqh3fvFY1cfre/R+p6nk7URExQJQhJF/qFmKZV6hxvVjKi9+ZU6H1EXyem2755ebe6qoLicQkNiJi7NWV4aXAPGtpuC3DyF8UGAiuBsbQ9CMAzOzLfFs3AaQdw8Ffs+MKcbLkkDSvpfjEawLxxXAZcJ033wMnrxYBbXYjoLxivIvqUAmuXXGONNg0fnIutTLtcQcD+17um9jPyHR5XWtJhtOFk8IfqaQXtvuAwEiwzCLQhXhUBiRHGtfObuv+EYV3uVe/KEBKll6ZFPkObqa4dj3gFffkK1OZFpGUM+HbUdtJ+ZlSqTrQq6O8HF0GWpMjAkwnW5d069BNW6QNm7rODzVvRPyUHklbqEjRTa6j5LNWwAfbvoBOYfEji+JwubRxbC/6WftUqtWpQGPSDdS+1FSLLybOZsuKpBnIFM/nurdZke4te2CWK5PueDalXXPkhkGDt+32g246gAbVgm5KDCL8WlXXktQX2a6193EmRM1gtsGnzkVVu3T0SyaRWypXQ8AEST2fo3ZF1M0YPzXYwnh8CpcmPgBvzLrThvfdC8khxw5WCzzGfNmXsZ5yXt2dSL6PF0Z61MDulcqGZA+mKhAg+3Q0S/l0+Zo1dyOi/2x3fapZk6VAvWB/PHRhE0OmmJA4PQCXNxILlYoG7AgjpSEzn6lyD1MazRe91sk4cQGfWjl1QDN3k2oEX6yIfCNVXkrAfPhapCWuVnLF7G4nDu97ypPWs6j3PK3NdFlVON71u9Ld5YhKtDUbD6xjSR1AULSeibwjppYyiFj+HOZGiPG3sYpyfnQNzGBkMZqmaVqOn0e51ukDdH2Paxr9Y2kqdqlfjWy3wJPeG/F3ryTa4JsW9M+hjRJ+23RHghOsx61OrqChB9xBZJyn5Tz8iFBJmr0nN8+1A4KmySxfVSSQnZUSceP9NJoblXe1ryRz7XuZnn4NBoBa+6wrId0myTnJVi7mlRhx/sCW0/q1UzKwp/R6JontnppwHbvlhgsqkhwwaIVR4kgMMaVifBz8AmDeupb7WlCZesVqJ+qBPo1bMdGQ9Tq/4DFRFztK/D3fL76FKdVo6WDq9xdIw7Xu4ck1NosRUYhPnF5Gnngu5Cb3GWQlh11ydCiE9BNWlABjrASStAHYuFinhh0HmVsDqY1uIi5NUVLfPITMlIJE8B79Wdh27N8vJY2m8UGS/cUTECpCnYC/wdUNKtBcWQPQkGgGIVqWFIwqk65iBf0uxSiPSeU7JohLfhko0+gh8Da80ff5/QqIZTPNGPSR9lbnYTCkaUNoMTbymE886B4uBA17dnZuJrOBIlDEt1ThOI2vGCMVBmJk0v9iju4Lqt0Agf/3uV3nyu5HXLlvRs+xWdu3RX63zx7hmmgMxkbBhE+D7Zog X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15856c50-32b2-49fb-b435-08da25a375df 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:35:21.5713 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 22/32] fate/seek: Don't duplicate test requirements 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: sQs57k+SZZ2r Most of the tests in seek.mak use files created by other tests as input. Therefore these tests have the other tests as prerequisite and duplicate their CONFIG-requirements. This duplication is of course bad as usual, so stop it by using the corresponding variable that contains the non-seek-tests that are enabled to filter out all the seek-tests without a corresponding enabled non-seek test. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 + tests/fate/seek.mak | 189 ++++++++++++++++---------------------------- 2 files changed, 68 insertions(+), 122 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 1c9e3594c0..e02eb57035 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -120,6 +120,7 @@ include $(SRC_PATH)/tests/fate/lavf-container.mak include $(SRC_PATH)/tests/fate/lavf-image.mak include $(SRC_PATH)/tests/fate/lavf-image2pipe.mak include $(SRC_PATH)/tests/fate/lavf-video.mak +# Must be included after acodec.mak, vcodec.mak and lavf-*.mak include $(SRC_PATH)/tests/fate/seek.mak include $(SRC_PATH)/tests/fate/aac.mak diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index b4e9246cc3..fc1ef50e49 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -1,32 +1,16 @@ # files from fate-acodec -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += adpcm-ima_qt \ - adpcm-ima_qt-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += adpcm-ima_wav \ - adpcm-ima_wav-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_MS, WAV) += adpcm-ms \ - adpcm-ms-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_SWF, FLV) += adpcm-swf \ - adpcm-swf-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_YAMAHA, WAV) += adpcm-yamaha \ - adpcm-yamaha-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ALAC, MOV) += alac -FATE_SEEK_ACODEC-$(call ENCDEC, FLAC, FLAC) += flac -FATE_SEEK_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += mp2 -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_ALAW, WAV) += pcm-alaw -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_MULAW, WAV) += pcm-mulaw -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S8, MOV) += pcm-s8 -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_U8, WAV) += pcm-u8 -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S16BE, MOV) += pcm-s16be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S16LE, WAV) += pcm-s16le -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S24BE, MOV) += pcm-s24be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S24LE, WAV) += pcm-s24le -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S32BE, MOV) += pcm-s32be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S32LE, WAV) += pcm-s32le -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F32BE, AU) += pcm-f32be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F32LE, WAV) += pcm-f32le -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F64BE, AU) += pcm-f64be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F64LE, WAV) += pcm-f64le +FATE_SEEK_ACODEC += adpcm-ima_qt adpcm-ima_qt-trellis \ + adpcm-ima_wav adpcm-ima_wav-trellis \ + adpcm-ms adpcm-ms-trellis \ + adpcm-swf adpcm-swf-trellis \ + adpcm-yamaha adpcm-yamaha-trellis \ + alac flac mp2 \ + pcm-alaw pcm-mulaw pcm-s8 pcm-u8 \ + pcm-s16be pcm-s16le pcm-s24be \ + pcm-s24le pcm-s32be pcm-s32le \ + pcm-f32be pcm-f32le pcm-f64be \ + pcm-f64le \ fate-seek-acodec-adpcm-ima_qt: SRC = fate/acodec-adpcm-ima_qt.aiff fate-seek-acodec-adpcm-ima_wav: SRC = fate/acodec-adpcm-ima_wav.wav @@ -56,57 +40,37 @@ fate-seek-acodec-pcm-s32le: SRC = fate/acodec-pcm-s32le.wav fate-seek-acodec-pcm-s8: SRC = fate/acodec-pcm-s8.mov fate-seek-acodec-pcm-u8: SRC = fate/acodec-pcm-u8.wav -FATE_SEEK += $(FATE_SEEK_ACODEC-yes:%=fate-seek-acodec-%) +FATE_SEEK_ACODEC := $(FATE_SEEK_ACODEC:%=fate-seek-acodec-%) +# The following disables every fate-seek-* test whose +# corresponding fate-* test has unmet requirements (or is disabled). +FATE_SEEK_ACODEC := $(filter $(subst fate-,fate-seek-,$(FATE_ACODEC)), $(FATE_SEEK_ACODEC)) +FATE_SEEK += $(FATE_SEEK_ACODEC) # files from fate-vsynth_lena -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV1, AVI) += asv1 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV2, AVI) += asv2 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p-rd -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv-411 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv-50 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FFV1, AVI) += ffv1 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FLASHSV, FLV) += flashsv -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FLV, FLV) += flv -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H261, AVI) += h261 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H263, AVI) += h263 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H263, AVI) += h263p -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, HUFFYUV, AVI) += huffyuv -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, JPEGLS, AVI) += jpegls -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG, AVI) += mjpeg - -FATE_SEEK_VSYNTH_LENA-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb - -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \ - mpeg1 \ - mpeg1b - -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) += \ - mpeg2-422 \ - mpeg2-idct-int \ - mpeg2-ilace \ - mpeg2-ivlc-qprd \ - mpeg2-thread \ - mpeg2-thread-ivlc - -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, MP4 MOV) += mpeg4 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, AVI) += $(FATE_MPEG4_AVI) -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V3, AVI) += msmpeg4 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO, AVI) += rgb -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ROQ, ROQ) += roqvideo -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV10, RM) += rv10 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV20, RM) += rv20 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW, AVI) += snow -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW, AVI) += snow-ll -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SVQ1, MOV) += svq1 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV1, AVI) += wmv1 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV2, AVI) += wmv2 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO, AVI) += yuv +FATE_SEEK_VSYNTH_LENA += asv1 asv2 \ + dnxhd-720p dnxhd-720p-rd \ + dnxhd-1080i dnxhd-4k-hr-lb \ + dv dv-411 dv-50 \ + ffv1 \ + flashsv \ + flv \ + h261 h263 h263p \ + huffyuv \ + jpegls ljpeg mjpeg \ + mpeg1 mpeg1b \ + mpeg2-422 mpeg2-idct-int \ + mpeg2-ilace mpeg2-ivlc-qprd \ + mpeg2-thread mpeg2-thread-ivlc \ + mpeg4 $(FATE_MPEG4_AVI) \ + msmpeg4 msmpeg4v2 \ + rgb \ + roqvideo \ + rv10 rv20 \ + snow snow-ll \ + svq1 \ + wmv1 wmv2 \ + yuv \ fate-seek-vsynth_lena-asv1: SRC = fate/vsynth_lena-asv1.avi fate-seek-vsynth_lena-asv2: SRC = fate/vsynth_lena-asv2.avi @@ -158,78 +122,59 @@ fate-seek-vsynth_lena-wmv1: SRC = fate/vsynth_lena-wmv1.avi fate-seek-vsynth_lena-wmv2: SRC = fate/vsynth_lena-wmv2.avi fate-seek-vsynth_lena-yuv: SRC = fate/vsynth_lena-yuv.avi -FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%) +FATE_SEEK_VSYNTH_LENA := $(FATE_SEEK_VSYNTH_LENA:%=fate-seek-vsynth_lena-%) +FATE_SEEK_VSYNTH_LENA := $(filter $(subst fate-,fate-seek-,$(FATE_VSYNTH_LENA)), $(FATE_SEEK_VSYNTH_LENA)) +FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA) # files from fate-lavf-audio -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AIFF) += aiff -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AU) += au -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, FLAC, OGG) += ogg -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_U8, VOC) += voc -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, WAV) += wav +FATE_SEEK_LAVF_AUDIO += aiff al au mmf ogg ul voc wav -FATE_SEEK_LAVF_AUDIO := $(FATE_SEEK_LAVF_AUDIO-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_AUDIO := $(FATE_SEEK_LAVF_AUDIO:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_AUDIO := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_AUDIO)), $(FATE_SEEK_LAVF_AUDIO)) FATE_SEEK += $(FATE_SEEK_LAVF_AUDIO) # files from fate-lavf-container -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, AVI) += avi -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, FLV, FLV) += flv -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dv25 -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcpro50 -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, NUT) += nut -FATE_SEEK_LAVF_CONTAINER-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, FLV, SWF) += swf -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, MP2, WTV) += wtv - -FATE_SEEK_LAVF_CONTAINER := $(FATE_SEEK_LAVF_CONTAINER-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_CONTAINER += asf avi dv flv gxf mkv mov mpg \ + mxf mxf_d10 mxf_dv25 mxf_dvcpro50 \ + mxf_opatom mxf_opatom_audio \ + nut swf ts wtv +# rm is special: fate-lavf-rm does not read the created file +# and therefore does not require the corresponding demuxer +# to be present, so we have to explicitly check for this here. +FATE_SEEK_LAVF_CONTAINER-$(CONFIG_RM_DEMUXER) += rm +FATE_SEEK_LAVF_CONTAINER += $(FATE_SEEK_LAVF_CONTAINER-yes) + +FATE_SEEK_LAVF_CONTAINER := $(FATE_SEEK_LAVF_CONTAINER:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_CONTAINER := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_CONTAINER)), $(FATE_SEEK_LAVF_CONTAINER)) FATE_SEEK += $(FATE_SEEK_LAVF_CONTAINER) # files from fate-lavf-video -FATE_SEEK_LAVF_VIDEO-$(call ENCDEC, GIF, IMAGE2) += gif -FATE_SEEK_LAVF_VIDEO-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m +FATE_SEEK_LAVF_VIDEO += gif y4m -FATE_SEEK_LAVF_VIDEO := $(FATE_SEEK_LAVF_VIDEO-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_VIDEO := $(FATE_SEEK_LAVF_VIDEO:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_VIDEO := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_VIDEO)), $(FATE_SEEK_LAVF_VIDEO)) FATE_SEEK += $(FATE_SEEK_LAVF_VIDEO) + $(FATE_SEEK_LAVF_AUDIO) $(FATE_SEEK_LAVF_CONTAINER) $(FATE_SEEK_LAVF_VIDEO): SRC = lavf/lavf.$(@:fate-seek-lavf-%=%) # files from fate-lavf-image -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, BMP, IMAGE2) += bmp -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, MJPEG, IMAGE2) += jpg -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PCX, IMAGE2) += pcx -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PGM, IMAGE2) += pgm -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PPM, IMAGE2) += ppm -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, SGI, IMAGE2) += sgi -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, TARGA, IMAGE2) += tga -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, TIFF, IMAGE2) += tiff +FATE_SEEK_LAVF_IMAGE += bmp jpg pcx pgm ppm sgi tga tiff -FATE_SEEK_LAVF_IMAGE := $(FATE_SEEK_LAVF_IMAGE-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_IMAGE := $(FATE_SEEK_LAVF_IMAGE:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_IMAGE := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_IMAGES)), $(FATE_SEEK_LAVF_IMAGE)) $(FATE_SEEK_LAVF_IMAGE): SRC = images/$(@:fate-seek-lavf-%=%)/%02d.$(@:fate-seek-lavf-%=%) FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE) #files from fate-lavf-image2pipe -FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe -FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe -FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe +FATE_SEEK_LAVF_IMAGE2PIPE += pbmpipe pgmpipe ppmpipe -FATE_SEEK_LAVF_IMAGE2PIPE := $(FATE_SEEK_LAVF_IMAGE2PIPE-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_IMAGE2PIPE := $(FATE_SEEK_LAVF_IMAGE2PIPE:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_IMAGE2PIPE := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_IMAGE2PIPE)), $(FATE_SEEK_LAVF_IMAGE2PIPE)) $(FATE_SEEK_LAVF_IMAGE2PIPE): SRC = lavf/$(@:fate-seek-lavf-%pipe=%)pipe.$(@:fate-seek-lavf-%pipe=%) FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE2PIPE) From patchwork Sun Apr 24 03:34:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35414 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220300pzh; Sat, 23 Apr 2022 20:38:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx90j2tqr6A9TBuv0YO8+APzrBnU6Kd9uko2dTmz4hMRGjEw73pRE4rHvvApsq9qDP6u0cO X-Received: by 2002:a05:6402:516:b0:425:c896:b1b8 with SMTP id m22-20020a056402051600b00425c896b1b8mr7348605edv.212.1650771489544; Sat, 23 Apr 2022 20:38:09 -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 z9-20020a170906434900b006e8cb75fd59si10321375ejm.723.2022.04.23.20.38.09; Sat, 23 Apr 2022 20:38:09 -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=mttJIsDy; 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 B2B6C68B490; Sun, 24 Apr 2022 06:35:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074090.outbound.protection.outlook.com [40.92.74.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC30D68B493 for ; Sun, 24 Apr 2022 06:35:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RZCxovIGS/bHmfrT9rP/VVXFyM/xkUMzh2t1LcJsJ5pu1pmDAlZvi8X0eh2eKA2IIyv4Mi4BIncCH+n9E8l5GFf0a9ubAdd82IgdcQoxGZ/plZtGxMKIQu4++07a/ctiLvUl1L5+0GrHV7YNX2MA4f9cZqrKIm8/l3u0TwEQYhptRte28PwsEG8eEyWxDZIkbP4a9y/Nae58XMMYFMriAWZJB21QUHPHywuTjJXeFgangbHZVmkNDsEDbcdtFE1gGbTV9Re7DYaeSVZo2YW5Jd1PETqyFmkhVbKK5JbBTyZ1PpOcEBtaRek5XSXAr7BVPzIJaobS9sGmnIhxIWKUEg== 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=8oive2Vir79Oh0kkFSkg50MohFIjlvECrV2ivVBSDSY=; b=oZP+W3fy72KH3IvfGWsl6twKnEaHF0bUvBy25GF6p0zGDI2jFEnuRNS8dzcjO1e7cRXB7zZ4h9HWKthp07r0q7ET4yzkJem0IkksLfSdUrsBXZb1JbKGKVsovYQ1u3pV334IfTFja/wt1jjXZ5NL7DzY6lGI8EdPXLnzX+4EnujqWHZfu5WtHV55ZBJrsbM2hBqkDljkAw9iC2lKaXFWmENdT0dskm/fwgKRiUB8kcIo4LJE1TWXTUcgARIRsBrGV6j5REBkzJk+/31NQiXVgTkuoB2oZouE8ikI+/64JQb0R4CvY1xWytQQxvDP3pBOoMayvjiRLcrpAD2E4Q8JWg== 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=8oive2Vir79Oh0kkFSkg50MohFIjlvECrV2ivVBSDSY=; b=mttJIsDyo8RM6YYAr7NSngaYm/lHdIO7CYOspOgDQTvm+lsBCpQvCZt1qUy2GTnT8GzZXbWKTNvs2b/c4H5d4OWOIx1leMyc2+R9MSsBTVNq9OyHtkIPp1L84nZmyCXyARN31feDo4shX0asEWgKwrYNSWbY7lyi9Z3ytaNJ2DdM4OxpD6TVZZZNLi2QozZyd8HSD0kzFzSOu8gU/wTx+lJcF9H4CYOmmL1Wn8c2OOU5Pm5zxJ0YvO3qlztkbJy9wKtT070/w2/bfkueZ5sLI2Vtt7d+JbSu/hZCvxXU7nUaazJSoO/jYSuJdpbzM3UIo1WWTmS2mcYCmlyIbmgWOg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:24 +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:35:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:08 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [hlwgkdLSNgnZhivs3q0CJTSeGnZGInMd] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-22-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 24ffe152-e962-4ba3-b783-08da25a377d6 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd+FHMe7F+Xmni76aaulW81hQbUy7jLk37YWvlOngxXBcSWcxYhzhx2guSNlwEp6rMDK+EvEIT3PObIWutRhcnzfLIOegkc4KLLEJPd4hPEjso1u7WirR2VUVc5ojAUB3V326ursxT7Lc2HWqCLQ5SAiqcBoszpECzKfgx9MQWFH98Ihv1PagXblV/C4PHO2FWADCP0QL9SgZYuRkZWlVA+ji+j0HaQRpHshNS1fVpkh7tmjdELsc5IZ8t+L7QMTcWEjYqdWJIMNCUUcDD0G0VM/CZDMX97sjt5iaEw/2fBB7QDcAaHueUPqh8zemru5RsvaELZT+aDGZSji0YvsK9/RQJUJezoDDigdWx2F0GdlIK5AslJVnC42ZgEqzohqTZo1/EBQSs6r97W+GrWgHDK+Fyrjo3JKmub5CRzbsiDteXZAkzXoWlKyzUsGGqi28sV1KBNuZVZu/TJoKIUvZ6DfYNP9PDgDuvMVKmN+opleqo/iR4aNfWfCEsXXTdaI1eOaHlFgXN4GTqoZevJ+0UxEbMjhnn/Yn+i7gVtuumI0YqOxdsToHVz3fkwtgunTO0+iCkIw1WouPfaovhadXZOvlOSrtjXAqVHbx2vve3SHCzdhLVxzeVsjgii5sRNpsUN4IvH2hwATS10gJJTxjMI+0lNjoisD2O3OPsm6Nu+Dj+c6ZpdPpjqvunNnsFZqX+2mCxZ13s/ei4kCQdeqAfxwZUmRh7pFhidIm9qnNGWrWkYIqCmyAAmW9S8KL+b9YvlbWr4m+hdDU1OsmjNP8hBhH6r3Nfgeqk9vJmyfLCi3OBIcg4MtK6Aa X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MimHFDxmhBKEGEMpBOWdATSp3OAzp67SXOoW679bkuTZF7exq+e5FH7hxlL9b0YpXUsdoyyZsm0c3vDfcBdBGXq9ZW6OiHu607Wniqcjwl//LVW21bHCByDGqUJq2kJrdHo8kxPjsqy58k6WB4wusU1oSdMY/BOTr4pMOJVGAiOc0VXS7WiMlxwVtF/VrXhF9YiWg2ma89XPj5n0iaIe1Xchiy92j1MeBGiTF7D6gL/9lsl6qUANoHDNEJ5L6+ETm6LJxJNcxUq6lN7/3ROXdRjD0vspg/ygRlPunPkBY9Z5rSl900SEK45zwb52ZIpU/V/CjyQWbdCQC0nBF5Btp4EnaWvgSrBSN0Z6NpE+vaqSavFP0Nt1XpvscqLDYL0oMOGBvhInVOAYLGeGAprfwxTXAqRi7aN60RXq8AOM7iln9C63Rv5qiCO8vkw1crJBUvdNdS8/gVrMafUjYNh2vqnHrMl0XWEzJ9XRivoyHNKkmYzPHhMIM5F5iuYl9lXNQoElmjMICaIZnmdx5U0tNaCfYj36WAnuMCohZFP5fVRjHgtTwBWaka/8c73vyrLrYAuj0HdFfYe/4aUtTurfww== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zSzItMaor8NN5DQIFkt/mOb1mB8ckLMDrSap5cGmeo2YqY2mxIQlPtA2/lB4PdNCUjf+dbiv7HkA47IzmyW/2iQSkN7TyO6kXFS4C3Yt46ESZ+1/46AZ/xRmrFVMPGPlE9CNmH0G4h0Hcg+4ghO6L6zQBPQK5ZT6hiKQSEGj6TfRvWxIiyB6dSH4yEEfcDoBs6PjDId8luDolKkdRIkVIzg5bmFeY2hMTQEC9OwcwKuNjq9vSNWknzOPr/0thfhBkY/G9vNars8pFS/ygvczZ3pG5c9Z/ACnrQEe5SBOaRAEWF6g0kpxpseDW2u4ZyhRj/zqsNZdi5SscJIURHqYfB071HOlnN6X6ULY909vf+UnQafuWyye5nfoTaQZKi+XStKTCTtALLzdLIp9HJg9gJPW3rSBBbqtCCa+2ghIs8pqufaevRFER1uv307AOClL0V31b2OKyf5bS9HvIgokd3LXd0nzMeB78WjnMAu644DpvAdmS9GQCpPf+yqlJruLcY6pviObXZ+6SDfQe87zkjC6G1hbk6VFcVnI39q5JpiwCW5hdPxyqQHU5zafai3ONLZcwUwBOvUB/HbzDLO88J9ROgfMuOTuntJY15Og5OxWIa4KJjmkU5SUlnWSySjHICCnRFwvWQ45MexInnYgEncnL0+lEn5FGl6royswUBKsgc6IhBT/gf/J2K9QWmnmyj8CcOCdC2LH0tWzM7vlWjrFAm688c6hmkcTnZUhLyLcE7RK0pziBsptrc3J7oP85H/+chCMyKDPTYOpUT1bjRm2RQYhG602ZTTQVAqpJyXW1z/6YsoE+T90ZfiXdvukj5nf6SMaWOvU7P6RZeJXU4/XrKJVp9QYj2s4Hmar3WnwAQh6EMOCPWXDYzvBN2ug6Vndd/kCbsYd9bQtRHs6Xihyq+3UiNQ7yQOm22y6HTwYbkXkmMWCaUJBRtb/A5ITCMZxLr1WF1hWzRlBObUDEckS0+Yu3OE3DGHGkON9ZHeiq2+kt8ZXYySWtN1SSO5F6ygNnSSL7t0hkLkS3fK+z1O6TaDQNlRZKRL/LJt1mseqS+GVw2IgqK4KAwbaFmvUdjFQpRylnp/DcBjjvB87xTX/jeI7nt3Q2LlxXhXpnvUpJc56rUEFupl9v4GMZ3bYLbsCReheOkHIiIgEOUweXIfrcSTRe9Xgqj6nwPD0r88rXXsVPQqUlk/2iGWvNQZ8RXGxuMA2dgjIWhwYwuHoJ9oToLEf6zcqtS+lm/WVNFYtlpVHfXSqnzdSYxP+YX1ZvaT+fU8gNPFxkViaegZdZhkBm8SlE/Hjm2yTI0MJLjovzz0g5re9SSM1sARAJNe9gc5asQcdyW3niAY+9sjf4v0YLNU9Xk8d03WhygZztOEige39OV/9cfVETs3mLqDARjcxSys+7VHs7BeaEv35Vq0mK+SeGfmfBTZwRxg/dwCwDqDOx21HkLy0zzC68XU3 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24ffe152-e962-4ba3-b783-08da25a377d6 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:35:24.8990 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 23/32] fate/vcodec: Don't add scale filter unnecessarily 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: 6kSOoCf4lRFf If one uses a -s command, a scale filter is inserted even when doing so is redundant. This patch stops doing so. This makes the tests that don't need libswscale actually succeed in case it is disabled (only 315 of 470 tests need it). Signed-off-by: Andreas Rheinhardt --- tests/fate/vcodec.mak | 82 ++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 47 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 2e6d16f1e7..667e3759a5 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -4,8 +4,9 @@ fate-vsynth_lena-%: SRC = tests/data/vsynth_lena.yuv fate-vsynth3-%: SRC = tests/data/vsynth3.yuv fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi -fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(KEEP_OVERRIDE)" "$(DECINOPTS)" -fate-vsynth3-%: CMD = enc_dec "rawvideo -s $(FATEW)x$(FATEH) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s $(FATEW)x$(FATEH) -pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "" "$(DECINOPTS)" +fate-vsynth%: DEFAULT_SIZE = -s 352x288 +fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH) +fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(KEEP_OVERRIDE)" "$(DECINOPTS)" fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) @@ -20,24 +21,10 @@ fate-vsynth%-asv2: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, CINEPAK, AVI) += cinepak fate-vsynth%-cinepak: ENCOPTS = -s sqcif -strip_number_adaptivity 1 -fate-vsynth%-cinepak: DECOPTS = -s sqcif FATE_VCODEC-$(call ENCDEC, CLJR, AVI) += cljr fate-vsynth%-cljr: ENCOPTS = -strict -1 -FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p \ - dnxhd-720p-rd \ - dnxhd-720p-10bit \ - dnxhd-720p-hr-lb \ - dnxhd-edge1-hr \ - dnxhd-edge2-hr \ - dnxhd-edge3-hr - -FATE_VCODEC-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb \ - dnxhd-2k-hr-hq \ - dnxhd-uhd-hr-sq - - FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \ vc2-422p vc2-422p10 vc2-422p12 \ vc2-444p vc2-444p10 vc2-444p12 \ @@ -59,112 +46,112 @@ fate-vsynth2-vc2-t%: ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 5 fate-vsynth_lena-vc2-t%: FMT = mov fate-vsynth_lena-vc2-t%: ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 5 -strict -1 -wavelet_type $(@:fate-vsynth_lena-vc2-t%=%) +FATE_VCODEC_DNXHD_DNXHD := dnxhd-720p \ + dnxhd-720p-rd \ + dnxhd-720p-10bit \ + dnxhd-720p-hr-lb \ + dnxhd-edge1-hr \ + dnxhd-edge2-hr \ + dnxhd-edge3-hr \ + $(if $(CONFIG_LARGE_TESTS), dnxhd-4k-hr-lb \ + dnxhd-2k-hr-hq \ + dnxhd-uhd-hr-sq) \ + +FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += $(FATE_VCODEC_DNXHD_DNXHD) + fate-vsynth%-dnxhd-720p: ENCOPTS = -s hd720 -b 90M \ -pix_fmt yuv422p -frames 5 -qmax 8 -fate-vsynth%-dnxhd-720p: FMT = dnxhd fate-vsynth%-dnxhd-720p-rd: ENCOPTS = -s hd720 -b 90M -threads 4 -mbd rd \ -pix_fmt yuv422p -frames 5 -qmax 8 -fate-vsynth%-dnxhd-720p-rd: FMT = dnxhd fate-vsynth%-dnxhd-720p-10bit: ENCOPTS = -s hd720 -b 90M \ -pix_fmt yuv422p10 -frames 5 -qmax 8 -fate-vsynth%-dnxhd-720p-10bit: FMT = dnxhd fate-vsynth%-dnxhd-720p-hr-lb: ENCOPTS = -s hd720 -profile:v dnxhr_lb \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-720p-hr-lb: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-720p-hr-lb: FMT = dnxhd fate-vsynth%-dnxhd-4k-hr-lb: ENCOPTS = -s 4k -profile:v dnxhr_lb \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-4k-hr-lb: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-4k-hr-lb: FMT = dnxhd fate-vsynth%-dnxhd-uhd-hr-sq: ENCOPTS = -s uhd2160 -profile:v dnxhr_sq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-uhd-hr-sq: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-uhd-hr-sq: FMT = dnxhd fate-vsynth%-dnxhd-2k-hr-hq: ENCOPTS = -s 2k -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-2k-hr-hq: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-2k-hr-hq: FMT = dnxhd fate-vsynth%-dnxhd-edge1-hr: ENCOPTS = -s 264x128 -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-edge1-hr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-edge1-hr: FMT = dnxhd fate-vsynth%-dnxhd-edge2-hr: ENCOPTS = -s 271x135 -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-edge2-hr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-edge2-hr: FMT = dnxhd fate-vsynth%-dnxhd-edge3-hr: ENCOPTS = -s 257x121 -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-edge3-hr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-edge3-hr: FMT = dnxhd -FATE_VCODEC-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i dnxhd-1080i-10bit dnxhd-1080i-colr \ - dnxhd-hr-lb-mov dnxhd-hr-sq-mov dnxhd-hr-hq-mov +$(FATE_VCODEC_DNXHD_DNXHD:%=fate-vsynth\%-%): FMT = dnxhd +$(FATE_VCODEC_DNXHD_DNXHD:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) + +FATE_VCODEC_DNXHD_MOV := dnxhd-1080i dnxhd-1080i-10bit dnxhd-1080i-colr \ + dnxhd-hr-lb-mov dnxhd-hr-sq-mov dnxhd-hr-hq-mov \ + +FATE_VCODEC-$(call ENCDEC, DNXHD, MOV) += $(FATE_VCODEC_DNXHD_MOV) fate-vsynth%-dnxhd-1080i: ENCOPTS = -s hd1080 -b 120M -flags +ildct \ -pix_fmt yuv422p -frames 5 -qmax 8 -fate-vsynth%-dnxhd-1080i: FMT = mov fate-vsynth%-dnxhd-1080i-10bit: ENCOPTS = -s hd1080 -b 185M -flags +ildct \ -pix_fmt yuv422p10 -frames 5 -qmax 8 fate-vsynth%-dnxhd-1080i-10bit: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-1080i-10bit: FMT = mov fate-vsynth%-dnxhd-1080i-colr: ENCOPTS = -s hd1080 -b 120M -flags +ildct -movflags write_colr \ -pix_fmt yuv422p -frames 5 -qmax 8 fate-vsynth%-dnxhd-1080i-colr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-1080i-colr: FMT = mov fate-vsynth%-dnxhd-hr-lb-mov: ENCOPTS = -s uhd2160 -profile:v dnxhr_lb \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-hr-lb-mov: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-hr-lb-mov: FMT = mov fate-vsynth%-dnxhd-hr-sq-mov: ENCOPTS = -s 2kscope -profile:v dnxhr_sq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-hr-sq-mov: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-hr-sq-mov: FMT = mov fate-vsynth%-dnxhd-hr-hq-mov: ENCOPTS = -s 2kflat -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-hr-hq-mov: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-hr-hq-mov: FMT = mov -FATE_VCODEC-$(call ENCDEC, DVVIDEO, DV) += dv dv-411 dv-50 dv-hd dv-fhd -fate-vsynth%-dv: CODEC = dvvideo +$(FATE_VCODEC_DNXHD_MOV:%=fate-vsynth\%-%): FMT = mov +$(FATE_VCODEC_DNXHD_MOV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) + +FATE_VCODEC_DV := dv dv-411 dv-50 dv-hd dv-fhd +FATE_VCODEC-$(call ENCDEC, DVVIDEO, DV) += $(FATE_VCODEC_DV) fate-vsynth%-dv: ENCOPTS = -dct int -s pal -fate-vsynth%-dv: FMT = dv -fate-vsynth%-dv-411: CODEC = dvvideo fate-vsynth%-dv-411: ENCOPTS = -dct int -s pal -pix_fmt yuv411p \ -sws_flags area fate-vsynth%-dv-411: DECOPTS = -sws_flags area -fate-vsynth%-dv-411: FMT = dv -fate-vsynth%-dv-50: CODEC = dvvideo fate-vsynth%-dv-50: ENCOPTS = -dct int -s pal -pix_fmt yuv422p \ -sws_flags neighbor fate-vsynth%-dv-50: DECOPTS = -sws_flags neighbor -fate-vsynth%-dv-50: FMT = dv -fate-vsynth%-dv-fhd: CODEC = dvvideo fate-vsynth%-dv-fhd: ENCOPTS = -dct int -s 1440x1080 -pix_fmt yuv422p \ -sws_flags neighbor fate-vsynth%-dv-fhd: DECOPTS = -sws_flags neighbor -fate-vsynth%-dv-fhd: FMT = dv -fate-vsynth%-dv-hd: CODEC = dvvideo fate-vsynth%-dv-hd: ENCOPTS = -dct int -s 960x720 -pix_fmt yuv422p \ -sws_flags neighbor fate-vsynth%-dv-hd: DECOPTS = -sws_flags neighbor -fate-vsynth%-dv-hd: FMT = dv + +$(FATE_VCODEC_DV:%=fate-vsynth\%-%): CODEC = dvvideo +$(FATE_VCODEC_DV:%=fate-vsynth\%-%): FMT = dv +$(FATE_VCODEC_DV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1-v0 \ ffv1-v3-yuv420p ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ @@ -416,6 +403,7 @@ fate-vsynth%-snow: ENCOPTS = -qscale 2 -flags +qpel \ fate-vsynth%-snow-hpel: ENCOPTS = -qscale 2 \ -motion_est iter -dia_size 2 \ -cmp 12 -subcmp 12 -s 128x64 +fate-vsynth%-snow fate-vsynth%-snow-hpel: DECOPTS = $(DEFAULT_SIZE) fate-vsynth%-snow-ll: ENCOPTS = -qscale .001 -pred 1 \ -flags +mv4+qpel @@ -437,7 +425,7 @@ fate-vsynth%-v408: DECOPTS = -sws_flags neighbor+bitexact FATE_VCODEC-$(call ENCDEC, AVUI, MOV) += avui fate-vsynth%-avui: ENCOPTS = -s pal -strict experimental -sws_flags neighbor+bitexact -fate-vsynth%-avui: DECOPTS = -sws_flags neighbor+bitexact +fate-vsynth%-avui: DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE) fate-vsynth%-avui: FMT = mov FATE_VCODEC-$(call ENCDEC, WMV1, AVI) += wmv1 @@ -451,7 +439,7 @@ fate-vsynth%-yuv: CODEC = rawvideo FATE_VCODEC-$(call ENCDEC, XFACE, NUT) += xface fate-vsynth%-xface: ENCOPTS = -s 48x48 -sws_flags neighbor+bitexact -fate-vsynth%-xface: DECOPTS = -sws_flags neighbor+bitexact +fate-vsynth%-xface: DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE) fate-vsynth%-xface: FMT = nut FATE_VCODEC-$(call ENCDEC, YUV4, AVI) += yuv4 From patchwork Sun Apr 24 03:34:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220346pzh; Sat, 23 Apr 2022 20:38:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAt67z2MG+i6yfiu5jR9jgg2vfw5E4LfulA5GMe54MhYvJQUcRL6GpmhiJ65NjPpnXilCg X-Received: by 2002:aa7:cd87:0:b0:41d:90a8:2670 with SMTP id x7-20020aa7cd87000000b0041d90a82670mr12523660edv.404.1650771500170; Sat, 23 Apr 2022 20:38:20 -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 we23-20020a170907235700b006dfa8b9bc20si8991341ejb.894.2022.04.23.20.38.19; Sat, 23 Apr 2022 20:38:20 -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=sfXmEKta; 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 C93E168B498; Sun, 24 Apr 2022 06:35:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074090.outbound.protection.outlook.com [40.92.74.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3148868B493 for ; Sun, 24 Apr 2022 06:35:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lhKhJiR9/IoJXLbCfKBAqOrEWnSCK1F4iv40k/QEmovuAfEZ5tNODPEqT3YbVmVOnOukR1WDOuwZHs1VFRl2eMZdlEVERnOyLYEJUEm3ZGhu884ShEfbFLTiJRNC57uET381pCttgs38kCKaoWvvIqmEvwmiuBGxtGj0GockieFMxDFhXNYbHlPBS9ecSPPRh0jv+v3jhYSvKLqi4XaiP96/BLgFOmHaHA8rBlDVINhDIXnG+1GS3TOyuge0/C4x4iScWd3JTmqMxxbX1k+/n9URDHv5+k258hKbg1fWTU6+Bc9PchZlJZkLEV8KNUBroUd6OAN3rthrCOCLumevcg== 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=aU6x/yootn2bwLoAM4HdgV+hC3cIH6RZ2s/rEFtpT5k=; b=Y6KqSvnv1Y8mzrBErkyxsxDRxDT5nrCN9XpKUEVOvVMPNA9luOtzhZRH5qhZzGdGD4B/TI5DWOwQaKN6q+ZRX5kQ6AF2foDkA9TCOnehURvn19U0Gz5N+3UH6gBhJz9n+ijZV63KGisASEnRgEJceFJOnAwrmf4da1C2+tpi9LSNVNQWlUNdQeQAC1Qnkj21hUFxSofjNozvyYsE08VHbpLb9LaJzYCK3YdTQksMuzun+AnszMhSTJYLgC2GKr78qjG7+dB8KfdHZ9XcuIyw53tobTY0BZ4lqTW5hKSq2Dy6NPG5RpkXH0QKIjBLfrAsjkn55D1EyDDK6BEwsuijHg== 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=aU6x/yootn2bwLoAM4HdgV+hC3cIH6RZ2s/rEFtpT5k=; b=sfXmEKtaCcuy2Dj2BODTF3R3lJFWQNyZM7bg2tekXwpPnFE49f2RJVkjXrQrETHANXPDimKTkGhhgnMC1q4JnLKWuPrgFzOwt6SGldDLKXkM6njl/+Cw6jVfyWAyFy0fAinuTEep2bkucyJhw7QZKwp3NR0aiWQkUyRA7HKTkzZbPJ/yxO4XgTRUMo7PTBF18LWHo02xIqJKeXg8kCfSeE4jDtcGoUrAbfrHmmplCqM89HjGUZU1KAcwNSnwSYzjetB+ryrDygtt/nTY65xYIjnCB0KoWHqAnJHk5IJZ3MRcyDeY/k0u9ukmzmpLEwr2DisODEJ5wIZp/WqGXeUMuw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:26 +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:35:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:09 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [g9vLx3ZbZVERscqRlCz1CwirrIMN4Dxi] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 935887b3-8d3c-4a8d-af6e-08da25a3788e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDF9QO2SHPVMoCJGrmSWTtNPqP10QR9Xw6Wp3BJ5rp7XicNSP/7h10FgxuV/JKSUHD5hO0c19+KTDqA8m5p4zvWFxg+Q4/iOJvkdvITDfEcHjAMwT8NlGmzgGYT+SqbBeF+40epAM5MMnQF3doUmd9d9R4pWvVPE8tgMLnfSaAsTil0TBikWNd56oDET9UyU2Ul9dY2erLi8v2UJ1Plukq6qC96dAmFgExKxFf/6i/SW5a1iOl98Ugpd4QH2E3DskZIE4XWQhnrD/cYsZ51/45FybrMC/UWtn1Gou84A3y3YaaqDp1F3jRvPjyL+vQ9Yrpb1R1oTcE8WO8lK3rWfn8ggeVOyMQVtaju7ukCrf6qEFjnk7DcIOjRTHK31hNWLca1G43GX/9IVauTQZ9OiXGODOlx0XhCl6YR062Buu7E3ogrRWqI3jEfkVci2VK1Ype2Wn0+DPSItI3KHrctwRlywx8P/ARvknzHRZx2z0U+mtTjiXNNNQ7fuheYp1dnIxR90VUMw/OdiR+5ysQxtce81Wd/OY8xJO2BMP7epmpKa0gc33nuGgGV+ozEmZ8wFGYmmRw7Ufz6LddPvVb3BlTjQJEOmf0USjuDN2F/b2dnS15hNeTHZmUA6esJAbRlEyh0/oZ29E8GK9ehxYnh2nGh6yzoSz7x/OoK2X3/2/1RvA5pMmUD31X/t7rbM6a19oQQCYDl6vqYXGjjRulTKcekDhfXeIZM4U44eqylPGnoBU= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gtLb06LVOGRyB/FHatG8U8LO8gRAYbO1kdcUG/0dpVQubHi3TARCOl8s7ZhNF0RqOCE6KOm3wSy191u0qkoFTS6nhXOi94e2Lxczjjlz+YaAoi2M7DiLZpKR0U99Ui+hm90/Gs47IAn2KEn2Ry+dx1Oi828+EbtdQAzD3bZl5OwWnAfH6lPvpxyqlOK1HAawLK9HIio0SeY1UDqvx4HYzDUhWxT3vbBkz1VClK7ZSR+vBPNGS1e1/gOf+pRiTUcGGqOADuguB0RyWBodCqA9MoF2oNWABhCR5JxHhXmQcyfUUtSKYo4pCpg1tbi1OFNQl4ZeNRRgDPyJwDjbhVwALLKY/CgxQLZBk2A1GJLqIXSHbyrjpMf628hoWPIhWvVWAUtGEUmMa0JAzDifU6hxgRFQf9m3AFm/7z7cPnJC0eeVlRP6/VgldtcBZf1aePbtQS/IEB+Q5MExo9zWYMkKIX45OSDMY1YyW3PUKLsBzKnsxsvbeFnZeNmaYNgEsKAsLWGQHAvJgvIFdvFLfoxLqgDX0LUX25bKVCFu9W9hj5UHNtK7DX31yYbRKvWep4aRJYkFGgzfFFep942mu91HxA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5HEICShTZ7B4ouJgxxfzNFqbpoW1NoSWHMO1iflOaHEv5tpGRjn0wkKvlXs68g43QNVZsjpmSp9hwcH40NgoyVMZ5kGmLuKwj/sRnkEtvcV+cUEtwI6F3zbzqjJiHRQwXgbsZoGdlsqaCtyH3+Q5ZwV6w6UKoZ7Bz/gwL8TlyGsbKvceE4wox4tpB+dfvu+bKHcOyA8ZJ6kbLQYl6tVWt5okI/lg2qRzFvnJNSET/rlvTa7Ru4TueS3JzxQfkFUVs3mQrnKnOI0i4gJ43edR5NTWsBPvFUKD1qNdRQw6EaiwhNgMcCPvbYq1tfDeNZzAGDOFGH7pd6qGrqcgbrIsvBl62nU6g3o0VUyon0SAPXz07EqSVa7o48D7vfgHDvDC7p4Zt9UhS7wn6dStvreY42Hsqp5G2Kh+dbh7Cq7/Dc7gWwWvsrVZRaHjI2c4DUIbmsKGNGDIFw+C3wbe5ITXLx2SYG7z8AHxJzhlxk+g1bDyD3AtsDuMEOaLVu/EkR6zRu2b6SpRF3lzQ/Rf89Wr4pE5LnTO0DKyBXtpRUr7ZQJKOZlT5NW9hcU7qzo2pNtSHKTTSmKbn9DENRB5pN0ytVAE3Ldwkh9TbASDtExdW9e1nbeYQGALgneI8NcHhxxbJpR3r7bDcOGQNl8X9UP+f94cXOilcwg7PZvOgCsSyRpOYOyvP0aFGVElkuM6kwMSWe5+C6ws/gQWEabJ/2Xy/Dun1HPCH+koYvuhF9OSpnMFetEvzksUbZOAeX0f+S1Xyi2u5zneqY1ILJjD8wMXGTPoCPXT6cIg2/T8uY9HHTrvp0JnO8DG749abj7EnwuIRMX15h1SKGSX7Ry5Qsa/ejM1LopC2fApXwCGHAN4PhyqEeU0qfFDjaiHeZWHYQl4i2JcJ0Lp7UOaqejIiNoPOzQLsv/ANZ28QipgBb4vDzK9unXaTWRQlORft/zW12fyqMDkfq1l6ssEPDqsBXIMOCvkUHBfjqkqM5pHogxBt+lGl1WSRZz43wodj+HWyGLbkPlxKKyQTaXJIu7XxOyP1UoMzQ6By9zxB30YTQUex+xQPY37QthdRK4a89pVNkeaC624ULpk3a0igPTfV4kA8h57odywqJIuRL/r9GEW3jo1O6f2boiuUe2gdtLBoScSefOfdcnnXjF8LeBgzwiK/F8VAPXsQkCn3KvxLB+L5NPuyguD5w1ce+NZkLnbm3/VL/sevuLt72HcYXuYpfEYBYAjGA0bWBgXeBz3FMH2k99QYt9I/t3ysXFjpzb3HLpW/IVvpWo5xGkT+XrpxvHfzM7wvU3nsA/9NhYJpvXMZ0mDpar+esQVELuKWJBX0PfbeRD7cuXWuss2YeFq0AwhcEdWHlez3zOQUOf/wiBHycGEEzbW7P9eGdhd622RZxwDZjSfPg3kaN9Fz9zvcucdBAhn+zfVz4rZEM4RaMtp/Tt1vc6Mxhw7OPsI0jYAdf3Z X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 935887b3-8d3c-4a8d-af6e-08da25a3788e 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:35:26.0734 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 24/32] fate/vcodec: Fix test requirements 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: tkzCrtcXDH/7 This automatically fixes the requirements of the fate-seek-vsynth* tests (e.g. 16 of the 49 such tests are now automatically disabled if the scale filter is disabled). Signed-off-by: Andreas Rheinhardt --- tests/fate/vcodec.mak | 82 +++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 667e3759a5..6f49ffed40 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -10,7 +10,7 @@ fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECO fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) -FATE_VCODEC-$(call ENCDEC, AMV, AVI) += amv +FATE_VCODEC_SCALE-$(call ENCDEC, AMV, AVI) += amv fate-vsynth%-amv: ENCOPTS = -strict -1 FATE_VCODEC-$(call ENCDEC, ASV1, AVI) += asv1 @@ -19,16 +19,17 @@ fate-vsynth%-asv1: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, ASV2, AVI) += asv2 fate-vsynth%-asv2: ENCOPTS = -qscale 10 -FATE_VCODEC-$(call ENCDEC, CINEPAK, AVI) += cinepak +FATE_VCODEC_SCALE-$(call ENCDEC, CINEPAK, AVI) += cinepak fate-vsynth%-cinepak: ENCOPTS = -s sqcif -strip_number_adaptivity 1 -FATE_VCODEC-$(call ENCDEC, CLJR, AVI) += cljr +FATE_VCODEC_SCALE-$(call ENCDEC, CLJR, AVI) += cljr fate-vsynth%-cljr: ENCOPTS = -strict -1 -FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \ - vc2-422p vc2-422p10 vc2-422p12 \ - vc2-444p vc2-444p10 vc2-444p12 \ - vc2-thaar vc2-t5_3 +FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p +FATE_VCODEC_SCALE-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p10 vc2-420p12 \ + vc2-422p vc2-422p10 vc2-422p12 \ + vc2-444p vc2-444p10 vc2-444p12 \ + vc2-thaar vc2-t5_3 fate-vsynth1-vc2-4%: FMT = mov fate-vsynth1-vc2-4%: ENCOPTS = -pix_fmt yuv$(@:fate-vsynth1-vc2-%=%) \ -c:v vc2 -frames 5 -strict -1 @@ -57,7 +58,7 @@ FATE_VCODEC_DNXHD_DNXHD := dnxhd-720p \ dnxhd-2k-hr-hq \ dnxhd-uhd-hr-sq) \ -FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += $(FATE_VCODEC_DNXHD_DNXHD) +FATE_VCODEC_SCALE-$(call ENCDEC, DNXHD, DNXHD) += $(FATE_VCODEC_DNXHD_DNXHD) fate-vsynth%-dnxhd-720p: ENCOPTS = -s hd720 -b 90M \ -pix_fmt yuv422p -frames 5 -qmax 8 @@ -102,7 +103,7 @@ $(FATE_VCODEC_DNXHD_DNXHD:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC_DNXHD_MOV := dnxhd-1080i dnxhd-1080i-10bit dnxhd-1080i-colr \ dnxhd-hr-lb-mov dnxhd-hr-sq-mov dnxhd-hr-hq-mov \ -FATE_VCODEC-$(call ENCDEC, DNXHD, MOV) += $(FATE_VCODEC_DNXHD_MOV) +FATE_VCODEC_SCALE-$(call ENCDEC, DNXHD, MOV) += $(FATE_VCODEC_DNXHD_MOV) fate-vsynth%-dnxhd-1080i: ENCOPTS = -s hd1080 -b 120M -flags +ildct \ -pix_fmt yuv422p -frames 5 -qmax 8 @@ -130,7 +131,7 @@ $(FATE_VCODEC_DNXHD_MOV:%=fate-vsynth\%-%): FMT = mov $(FATE_VCODEC_DNXHD_MOV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC_DV := dv dv-411 dv-50 dv-hd dv-fhd -FATE_VCODEC-$(call ENCDEC, DVVIDEO, DV) += $(FATE_VCODEC_DV) +FATE_VCODEC_SCALE-$(call ENCDEC, DVVIDEO, DV) += $(FATE_VCODEC_DV) fate-vsynth%-dv: ENCOPTS = -dct int -s pal fate-vsynth%-dv-411: ENCOPTS = -dct int -s pal -pix_fmt yuv411p \ @@ -154,8 +155,9 @@ $(FATE_VCODEC_DV:%=fate-vsynth\%-%): FMT = dv $(FATE_VCODEC_DV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1-v0 \ - ffv1-v3-yuv420p ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ - ffv1-v3-bgr0 ffv1-v3-rgb48 + ffv1-v3-yuv420p +FATE_VCODEC_SCALE-$(call ENCDEC, FFV1, AVI) += ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ + ffv1-v3-bgr0 ffv1-v3-rgb48 fate-vsynth%-ffv1: ENCOPTS = -slices 4 fate-vsynth%-ffv1-v0: CODEC = ffv1 fate-vsynth%-ffv1-v3-yuv420p: ENCOPTS = -level 3 -pix_fmt yuv420p @@ -172,18 +174,19 @@ fate-vsynth%-ffv1-v3-rgb48: ENCOPTS = -level 3 -pix_fmt rgb48 -strict -2 \ -sws_flags neighbor+bitexact fate-vsynth%-ffv1-v3-rgb48: DECOPTS = -sws_flags neighbor+bitexact -FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16 +FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff +FATE_VCODEC_SCALE-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16 fate-vsynth%-ffvhuff444: ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p fate-vsynth%-ffvhuff420p12: ENCOPTS = -c:v ffvhuff -pix_fmt yuv420p12le fate-vsynth%-ffvhuff422p10left: ENCOPTS = -c:v ffvhuff -pix_fmt yuv422p10le -pred left fate-vsynth%-ffvhuff444p16: ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p16le -pred plane -FATE_VCODEC-$(call ENCDEC, FLASHSV, FLV) += flashsv +FATE_VCODEC_SCALE-$(call ENCDEC, FLASHSV, FLV) += flashsv fate-vsynth%-flashsv: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-flashsv: DECOPTS = -sws_flags area fate-vsynth%-flashsv: FMT = flv -FATE_VCODEC-$(call ENCDEC, FLASHSV2, FLV) += flashsv2 +FATE_VCODEC_SCALE-$(call ENCDEC, FLASHSV2, FLV) += flashsv2 fate-vsynth%-flashsv2: ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0 fate-vsynth%-flashsv2: DECOPTS = -sws_flags area fate-vsynth%-flashsv2: FMT = flv @@ -201,7 +204,7 @@ fate-vsynth%-h263: ENCOPTS = -qscale 10 fate-vsynth%-h263-obmc: ENCOPTS = -qscale 10 -obmc 1 fate-vsynth%-h263p: ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300 -FATE_VCODEC-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra +FATE_VCODEC_SCALE-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra fate-vsynth%-huffyuv: ENCOPTS = -c:v huffyuv -pix_fmt yuv422p -sws_flags neighbor fate-vsynth%-huffyuv: DECOPTS = -sws_flags neighbor fate-vsynth%-huffyuvbgr24: ENCOPTS = -c:v huffyuv -pix_fmt bgr24 -sws_flags neighbor @@ -209,11 +212,11 @@ fate-vsynth%-huffyuvbgr24: DECOPTS = -sws_flags neighbor fate-vsynth%-huffyuvbgra: ENCOPTS = -c:v huffyuv -pix_fmt bgr32 -sws_flags neighbor fate-vsynth%-huffyuvbgra: DECOPTS = -sws_flags neighbor -FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls +FATE_VCODEC_SCALE-$(call ENCDEC, JPEGLS, AVI) += jpegls fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-jpegls: DECOPTS = -sws_flags area -FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 +FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 fate-vsynth%-jpeg2000: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24 fate-vsynth%-jpeg2000: DECINOPTS = -c:v jpeg2000 fate-vsynth%-jpeg2000-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 @@ -222,7 +225,7 @@ fate-vsynth%-jpeg2000-97: DECINOPTS = -c:v jpeg2000 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 -FATE_VCODEC-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman +FATE_VCODEC_SCALE-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p @@ -239,8 +242,8 @@ fate-vsynth%-mpeg1b: CODEC = mpeg1video fate-vsynth%-mpeg1b: ENCOPTS = -qscale 8 -bf 3 -ps 200 fate-vsynth%-mpeg1b: FMT = mpeg1video -FATE_MPEG2 = mpeg2 \ - mpeg2-422 \ +FATE_MPEG2 := mpeg2 \ + $(if $(CONFIG_SCALE_FILTER), mpeg2-422) \ mpeg2-idct-int \ mpeg2-ilace \ mpeg2-ivlc-qprd \ @@ -332,12 +335,12 @@ fate-vsynth%-msmpeg4: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2 fate-vsynth%-msmpeg4v2: ENCOPTS = -qscale 10 -FATE_VCODEC-$(call ENCDEC, PNG, AVI) += mpng +FATE_VCODEC_SCALE-$(call ENCDEC, PNG, AVI) += mpng fate-vsynth%-mpng: CODEC = png -FATE_VCODEC-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1 +FATE_VCODEC_SCALE-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1 -FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores prores_int prores_444 prores_444_int prores_ks +FATE_VCODEC_SCALE-$(call ENCDEC, PRORES, MOV) += prores prores_int prores_444 prores_444_int prores_ks fate-vsynth%-prores: FMT = mov fate-vsynth%-prores_int: CODEC = prores @@ -355,14 +358,14 @@ fate-vsynth%-prores_444_int: FMT = mov fate-vsynth%-prores_ks: ENCOPTS = -profile hq fate-vsynth%-prores_ks: FMT = mov -FATE_VCODEC-$(call ENCDEC, QTRLE, MOV) += qtrle qtrlegray +FATE_VCODEC_SCALE-$(call ENCDEC, QTRLE, MOV) += qtrle qtrlegray fate-vsynth%-qtrle: FMT = mov fate-vsynth%-qtrlegray: CODEC = qtrle fate-vsynth%-qtrlegray: ENCOPTS = -pix_fmt gray fate-vsynth%-qtrlegray: FMT = mov -FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += rgb bpp1 bpp15 +FATE_VCODEC_SCALE-$(call ENCDEC, RAWVIDEO, AVI) += rgb bpp1 bpp15 fate-vsynth%-rgb: CODEC = rawvideo fate-vsynth%-rgb: ENCOPTS = -pix_fmt bgr24 fate-vsynth%-bpp1: CODEC = rawvideo @@ -370,7 +373,7 @@ fate-vsynth%-bpp1: ENCOPTS = -pix_fmt monow fate-vsynth%-bpp15: CODEC = rawvideo fate-vsynth%-bpp15: ENCOPTS = -pix_fmt bgr555le -FATE_VCODEC-$(call ENCDEC, RAWVIDEO, MOV) += mov-bgr24 mov-bpp15 mov-bpp16 +FATE_VCODEC_SCALE-$(call ENCDEC, RAWVIDEO, MOV) += mov-bgr24 mov-bpp15 mov-bpp16 fate-vsynth%-mov-bgr24: CODEC = rawvideo fate-vsynth%-mov-bgr24: ENCOPTS = -pix_fmt bgr24 fate-vsynth%-mov-bgr24: FMT = mov @@ -381,7 +384,7 @@ fate-vsynth%-mov-bpp16: CODEC = rawvideo fate-vsynth%-mov-bpp16: ENCOPTS = -pix_fmt rgb565le fate-vsynth%-mov-bpp16: FMT = mov -FATE_VCODEC-$(call ENCDEC, ROQ, ROQ) += roqvideo +FATE_VCODEC_SCALE-$(call ENCDEC, ROQ, ROQ) += roqvideo fate-vsynth%-roqvideo: CODEC = roqvideo fate-vsynth%-roqvideo: ENCOPTS = -frames 5 fate-vsynth%-roqvideo: RAWDECOPTS = -r 30 @@ -395,7 +398,7 @@ FATE_VCODEC-$(call ENCDEC, RV20, RM) += rv20 fate-vsynth%-rv20: ENCOPTS = -qscale 10 fate-vsynth%-rv20: FMT = rm -FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow snow-hpel snow-ll +FATE_VCODEC_SCALE-$(call ENCDEC, SNOW, AVI) += snow snow-hpel fate-vsynth%-snow: ENCOPTS = -qscale 2 -flags +qpel \ -motion_est iter -dia_size 2 \ -cmp 12 -subcmp 12 -s 128x64 @@ -405,25 +408,26 @@ fate-vsynth%-snow-hpel: ENCOPTS = -qscale 2 \ -cmp 12 -subcmp 12 -s 128x64 fate-vsynth%-snow fate-vsynth%-snow-hpel: DECOPTS = $(DEFAULT_SIZE) +FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow-ll fate-vsynth%-snow-ll: ENCOPTS = -qscale .001 -pred 1 \ -flags +mv4+qpel -FATE_VCODEC-$(call ENCDEC, SVQ1, MOV) += svq1 +FATE_VCODEC_SCALE-$(call ENCDEC, SVQ1, MOV) += svq1 fate-vsynth%-svq1: ENCOPTS = -qscale 3 -pix_fmt yuv410p fate-vsynth%-svq1: FMT = mov -FATE_VCODEC-$(call ENCDEC, R210, AVI) += r210 +FATE_VCODEC_SCALE-$(call ENCDEC, R210, AVI) += r210 -FATE_VCODEC-$(call ENCDEC, V210, AVI) += v210 v210-10 +FATE_VCODEC_SCALE-$(call ENCDEC, V210, AVI) += v210 v210-10 fate-vsynth%-v210-10: ENCOPTS = -pix_fmt yuv422p10 -FATE_VCODEC-$(call ENCDEC, V308, AVI) += v308 +FATE_VCODEC_SCALE-$(call ENCDEC, V308, AVI) += v308 -FATE_VCODEC-$(call ENCDEC, V408, AVI) += v408 +FATE_VCODEC_SCALE-$(call ENCDEC, V408, AVI) += v408 fate-vsynth%-v408: ENCOPTS = -sws_flags neighbor+bitexact fate-vsynth%-v408: DECOPTS = -sws_flags neighbor+bitexact -FATE_VCODEC-$(call ENCDEC, AVUI, MOV) += avui +FATE_VCODEC_SCALE-$(call ENCDEC, AVUI, MOV) += avui fate-vsynth%-avui: ENCOPTS = -s pal -strict experimental -sws_flags neighbor+bitexact fate-vsynth%-avui: DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE) fate-vsynth%-avui: FMT = mov @@ -437,18 +441,20 @@ fate-vsynth%-wmv2: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv fate-vsynth%-yuv: CODEC = rawvideo -FATE_VCODEC-$(call ENCDEC, XFACE, NUT) += xface +FATE_VCODEC_SCALE-$(call ENCDEC, XFACE, NUT) += xface fate-vsynth%-xface: ENCOPTS = -s 48x48 -sws_flags neighbor+bitexact fate-vsynth%-xface: DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE) fate-vsynth%-xface: FMT = nut FATE_VCODEC-$(call ENCDEC, YUV4, AVI) += yuv4 -FATE_VCODEC-$(call ENCDEC, Y41P, AVI) += y41p +FATE_VCODEC_SCALE-$(call ENCDEC, Y41P, AVI) += y41p -FATE_VCODEC-$(call ENCDEC, ZLIB, AVI) += zlib +FATE_VCODEC_SCALE-$(call ENCDEC, ZLIB, AVI) += zlib +FATE_VCODEC-$(CONFIG_SCALE_FILTER) += $(FATE_VCODEC_SCALE-yes) FATE_VCODEC += $(FATE_VCODEC-yes) +FATE_VCODEC := $(if $(call ENCDEC, RAWVIDEO, RAWVIDEO),$(FATE_VCODEC)) FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%) FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%) FATE_VSYNTH_LENA = $(FATE_VCODEC:%=fate-vsynth_lena-%) From patchwork Sun Apr 24 03:34:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35416 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220383pzh; Sat, 23 Apr 2022 20:38:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrE8cPS4oGMNUALZlL31+oWLPCOTN3+lpaqb9ganZM2Q+VAkhf/LXW9tBWhNwvCCBw41fn X-Received: by 2002:a17:906:148a:b0:6f3:833d:5a0f with SMTP id x10-20020a170906148a00b006f3833d5a0fmr2633806ejc.49.1650771512069; Sat, 23 Apr 2022 20:38:32 -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 s9-20020a170906500900b006e86887cccfsi9741457ejj.267.2022.04.23.20.38.31; Sat, 23 Apr 2022 20:38:32 -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=Ae9RDJ0q; 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 C6B3C68B056; Sun, 24 Apr 2022 06:35:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074070.outbound.protection.outlook.com [40.92.74.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EADF68B2BE for ; Sun, 24 Apr 2022 06:35:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dRwbiwzvYiV9Z+ItSK6NhteB6e9oEivCPTmhc6XOFGPgT6aUTFpnWVBMRq92EHjBkpN9W5KN3PtUmM2SID9E43WrqckNPVdrOuVGeb3QTvMcAQeBJtgeFENW5SQFwbPtU+dO7spesrE74nYOLZ7opG3nyD8Lw+3NV1aHQsKbVn6+OucSsiJ7SCSdMS7FZHHHSrtqISxzEDub2RRT16VdKpTbi4JHgRK7KJwDq5FupgwJQC49rWFkYGbK1p7igTWCDH+cQ58yhmEym9DnghuwRbJmvfMm4c2Y9zsbOYXA2wdhpaK5d+7dq/5tTHuhuGVmU8TzI74fqnYMzOVNfaElIA== 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=8hXe9i3GrSa4lJTiOWgExoKvjleAWDxCcNAaEBm+DM0=; b=KLHOCQE3o/zt1p2Lq7uYAF9VnXthLPjshkd1RThEDCQdAUceO64RdS36H9BuyWPk4de0oDHmKsA57xi2ZT4wnAxXieGDEbd4n1SvTk9yBQ0v5bKqdZA3K4Hlye4J4ofEry/0+6VK6i8dm5RYttnrlOCsPH0FB3rfXiA+IAYPiGO857czQMd9bz6a73+VPe87zJDslvbEuDzFmuzre7q7VSd6HZdqV5Hz/jGuyzlwKfDHmrnQatN90+4PzYkgzMNi9hdmK6A7yUbywZYtlgInva9UQvA64/fkpUniXhqCebWRoN5QM4EGemhzKDrLJSB3IX9+JPJqthYgrxYSzJQo8w== 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=8hXe9i3GrSa4lJTiOWgExoKvjleAWDxCcNAaEBm+DM0=; b=Ae9RDJ0qWoVdUR3EGYgXDw64fJvcUyMG8CtKsCL/EUBSOjYYHLJtfuqXJm0wFmbtk4wFlvEjKG65mK7FQRifDGxT3xtjVRjC6MlYGpH2m1roZCf3xCXCJ0+Gl2hOIKbPqnNvbe7qG7Q5m9Zjw4ouzUJwcJt7vO8hqdk+2NopwSmDluZklSrcOWkRiCP8faVFj0VcDz9WN7+I1wu8zR53tMloYGiALAp4Odm6rPQTsV8mwXWJIW4JMW/ZnOpCRs5FdqTpJ+oQQDw6SRL2whgNd6j6NIswartn5at4Eo7N/bGYYfPn2gRsldfjjBzf2tjcpRNq9XVchrpjX7RiG0x5uQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:31 +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:35:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:10 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [oOdSgF5pF+TWtrWKGbZG0e9bmjRDMFw+] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-24-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 863ae649-2501-4b46-0b72-08da25a37b80 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjD/8XlGLHPooaeZpGitzHWiu4e9FSohWADLC/3ajI57isToaaAQoN2AmaMXq8RWlacR4Zosis/YfB9c5EoMkKCE4Jr68vXHGxuVyeVp6yDLINWeHUEW4hwa12Qm/DLdexreTMT1OmNu2+n+kEeL3aoYCnLnQCqIZissMUgpRIbQE//6m8BVA1Z9v1CvTWGveIDCbln6XkeefuZ7m/He68HK0+/3b8aASpps28ruUSXQEzqoWH1qn1YG6A0ZM38EaJ57dXhCUaVQkyTwgTtw4o63N1bmCb8R0MNtJpGmn48peI9/lAFoQDkQ9leHh6RcJ8GpY29Tjw64czlAWNt6qVc3HdNDpSm4IOQXPQvbo0aCDcNGuquuzdRDzUTAz2HoQ06evXmHCLS1kuXXX/G0Q3Z4pHkA02KWwmsspXT2NRZS8I218TuIsSW7YioB9JPIvnlUGQV335yF6irp0YuGHXssblDTqrkiUUdoXE6SSQx2niiCOZjdRxyNcSy6nnsdh6Dysxt1RRGEWwNXo3Xm+u5FGisADdMdCFirxwKfHCH+0etgE0AADLMwmq6qtAJeKhjmVbyLu6SCBmfggKJryloAkG151iPVC0ultmgGuIdaeNNo94OdpiPm0ODVjBGM8+53VYart4aUSkaxhyC4EyLQlnjZWgHIecK88Uxjgusdr3p0fwIS5OpfjIWgtfzhxCAk1bwWypGQrij04kkAG7YcsJlWMrRBJbzPfOudcMGqvA= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UTy0lr0wP5/RWQPZbUWCKrgZND0Rqe86e0lvY2pTgFplavd538f68/8R7s9L41VBLEn5t1+KvHYcXtyWC0OCz79iHbyqlsU53ZdKBR/eKK4UDq717yHCBioiDESXm1I3NK6Dm9aQMYBBDQC9z5/6SDKUTLT02vAfyxHUgW57QtScDJrt9USJChx4NhBLYJ3mBPmsNMAZhPdXHMcd4SbnKutjn5fW8kWbLTQAfgcMWvdMO8f4epac0k5grfCfNBqBQJ+iyIwPEW1R1YWZ4PcfpLpPiM8WBdyN37zmQpRkPj/QRfcRTq5K3Dhcl6yfZGbHqNnaUM1qnUgW+lI9O1KKstSop6bcGQnJo1afPpMlbU5vO57ZaTuRWXnLxw8+/mFeVWIRWsXhRug4zp6RC9ckfXQfyvGSbKy5FGF+XT1Ax3LeHe7SgUMh6A3Cc5l3dP2z3H8wRQwbJQOA0rbBhvdt3q86OiJ+JILavTJiZZ29PASkyfgWdIQhxVi0H7ETGGGDlcYDCYALc2A15NJ1ZSCCO6rUoeuI4PzvemklCYz3ty6WVEam89cThZDutPiDADHf7yqSeyY5ppLUu6Wi9FGKlQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LIVdJXZnWYAsDvEUkDlaJ4DwpNMP+3Dk0pPcYg8BJattC32H9Qev3J7cOWrjB/+Jxzsb0ULrjjv4l5cIzYE8f/2MozHhpym18xYFKuOxBx4rH8J2kTGnoDN7XradJRnNoUqyLpqoT4KkczLNP34JtNIb15613HJMK84GtCUqcO8766MTsgCpXwf8cwnrU90f0ZWJ6GE12WZU00hay1oy4YCv+DfaW7L5FcVGYraHIuE1V2JGbDsySQlk6KQaMZWD60QzQDG6BwaW9ZnQaf5XZ3gpsUQY3fngmXzk4r+ERpqcfFE6CJMAZf4mUfNjtAS7sj5B9mdF+vhLi/IwW0kaf5T9U5WBFLaaZrx0Ug8ZSPcYBsFqeffb2PDX4sn8Ek8d6jIUE5qJzh9ZU/X2F+kpg77bY9oP/AmvZbwx5A37Lv7/H9RWF5aGNl97Q24IQBhgJgXQtqg93LwThPw6KURfZs5QvfNnQTiDQWQUZv1uK84U+XzvCiCph3cz7EwF8NmJtmH0GD7Cqy6xJEtFQV2z/6dw7IZBGTAQxuoF/wlD34EwzbMOsUobPCB9EfM1sgRCxklwrw1RmMxJuxTVsoJs+S+naZU4/8IZgMqsW6pzAhIGQYE3Dlayt6a97PO4RS2nx81HMHquZ5z/32efiRhrW3KZKm/BVPFmICmmO6QHu2I5dVyTBEXF+d5z20BZIGMHVbMcczzdIl1PTNtPOFjIyM6GUXcWZxcFhtDAkqoTBPsXI3RPCam4Ew5nur9wW4A1jMbFfcfZPyTW1EDwnfUKDZpIVCTcLtpZR0tZikc21CsPxkeZyrszI/EDQG2DbtpMJqyk5HdFpq4gDjj/32orcxjkcPJ0xPRVCaqOEnaC0UIK4Dq8pO8Vnl04Qj8yunPOnkqRp3WAOv05VQZz1R1G0bmmx5TbmWdjfOpplfcKPgxqmt1ZdRGW6xFx3apQmAm+EoxgdcFPil3dFQsNoQYVe94L6gcFYBilGITRER4PyDKs3onxJSdQBbR0jGRQhZpwwEWoKni/kJJ8CAAw4RYNleHD17C7J2N5sl4CyMWX/vn/sy3VHa1n5V15nMeWCTEE7e8j1PrRK8yGxdC/ShxwlaM3Gcr0Y0KqN0F33CwoTCNHCsPAPcVONtP/eI0t5FitfOrDzW9pvrcKYd7lUTKco3eRCssRhVAVEYAmnheNKaBuh/ZNGK28qolC56qEo1UebadNf3LElPjzXtvowqDUfeT/gkkBi8/cSvmWe2ixalbjiP7jN4P3pYEdJ0gk2IWr6V9HdfL3Vjn+yDqMDsRyVaXU2/HTH133TaPw2YT0kCTLPoX3JpQBmhjl0Dv4JSv74oiUPQEBaYR/WkqBnD+P8lnJMh1zOAwzxVMm60HZ1v5Ix+lMWJtAV6oaB3c5dQokI8HKYnwQJwq4KaDsXzgAj1cEjuwCgD2dFetlk0iq6QhPJDNijRKXwIl3BPQElAls X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 863ae649-2501-4b46-0b72-08da25a37b80 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:35:30.9951 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 25/32] fate/acodec: Fix test requirements 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: lfWQ+2BIDcWA This automatically fixes the requirements of the fate-seek-acodec* tests (e.g. 16 of the 27 such tests are now automatically disabled if the aresample filter is disabled). Signed-off-by: Andreas Rheinhardt --- tests/fate/acodec.mak | 85 ++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index eda449c085..efaeaf2c6e 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -6,31 +6,33 @@ fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%) FATE_ACODEC_PCM-$(call ENCDEC, PCM_ALAW, WAV) += alaw FATE_ACODEC_PCM-$(call ENCDEC, PCM_MULAW, WAV) += mulaw -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S8, MOV) += s8 -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U8, WAV) += u8 +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S8, MOV) += s8 +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U8, WAV) += u8 FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16BE, MOV) += s16be FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16LE, WAV) += s16le FATE_ACODEC_PCM-$(call ENCDEC, PCM_U16BE, NUT) += u16be FATE_ACODEC_PCM-$(call ENCDEC, PCM_U16LE, NUT) += u16le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24BE, MOV) += s24be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24LE, WAV) += s24le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U24BE, NUT) += u24be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U24LE, NUT) += u24le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32BE, MOV) += s32be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32LE, WAV) += s32le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U32BE, NUT) += u32be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U32LE, NUT) += u32le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32BE, AU) += f32be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32LE, WAV) += f32le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64BE, AU) += f64be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64LE, WAV) += f64le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S8_PLANAR, NUT) += s8_planar -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16BE_PLANAR, NUT) += s16be_planar -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16LE_PLANAR, NUT) += s16le_planar -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24LE_PLANAR, NUT) += s24le_planar -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32LE_PLANAR, NUT) += s32le_planar - -FATE_ACODEC_PCM := $(FATE_ACODEC_PCM-yes:%=fate-acodec-pcm-%) +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S24BE, MOV) += s24be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S24LE, WAV) += s24le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U24BE, NUT) += u24be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U24LE, NUT) += u24le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S32BE, MOV) += s32be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S32LE, WAV) += s32le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U32BE, NUT) += u32be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U32LE, NUT) += u32le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_F32BE, AU) += f32be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_F32LE, WAV) += f32le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_F64BE, AU) += f64be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_F64LE, WAV) += f64le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S8_PLANAR, NUT) += s8_planar +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S16BE_PLANAR, NUT) += s16be_planar +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S16LE_PLANAR, NUT) += s16le_planar +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S24LE_PLANAR, NUT) += s24le_planar +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S32LE_PLANAR, NUT) += s32le_planar + +FATE_ACODEC_PCM-$(CONFIG_ARESAMPLE_FILTER) += $(FATE_ACODEC_PCM_RESAMPLE-yes) +FATE_ACODEC_PCM := $(if $(call ENCDEC, PCM_S16LE, WAV), $(FATE_ACODEC_PCM-yes)) +FATE_ACODEC_PCM := $(FATE_ACODEC_PCM:%=fate-acodec-pcm-%) FATE_ACODEC += $(FATE_ACODEC_PCM) fate-acodec-pcm: $(FATE_ACODEC_PCM) @@ -44,20 +46,22 @@ fate-acodec-pcm-u%be: FMT = nut fate-acodec-pcm-u%le: FMT = nut fate-acodec-pcm-f%be: FMT = au -FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_ADX, ADX) += adx -FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_ARGO, ARGO_ASF) += argo +FATE_ACODEC_ADPCM_RESAMPLE-$(call ENCDEC, ADPCM_ADX, ADX) += adx +FATE_ACODEC_ADPCM_RESAMPLE-$(call ENCDEC, ADPCM_ARGO, ARGO_ASF) += argo FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_APM, APM) += ima_apm FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_ALP, ALP) += ima_alp -FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt +FATE_ACODEC_ADPCM_RESAMPLE-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_SSI, KVAG) += ima_ssi -FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav +FATE_ACODEC_ADPCM_RESAMPLE-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_WS, WSAUD) += ima_ws FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_MS, WAV) += ms FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_SWF, FLV) += swf FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_SWF, WAV) += swf-wav FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_YAMAHA, WAV) += yamaha -FATE_ACODEC_ADPCM := $(FATE_ACODEC_ADPCM-yes:%=fate-acodec-adpcm-%) +FATE_ACODEC_ADPCM-$(CONFIG_ARESAMPLE_FILTER) += $(FATE_ACODEC_ADPCM_RESAMPLE-yes) +FATE_ACODEC_ADPCM := $(if $(call ENCDEC, PCM_S16LE, WAV), $(FATE_ACODEC_ADPCM-yes)) +FATE_ACODEC_ADPCM := $(FATE_ACODEC_ADPCM:%=fate-acodec-adpcm-%) FATE_ACODEC += $(FATE_ACODEC_ADPCM) fate-acodec-adpcm: $(FATE_ACODEC_ADPCM) @@ -80,14 +84,10 @@ fate-acodec-adpcm-swf-wav: CODEC = adpcm_swf fate-acodec-adpcm-ima_alp: FMT = alp fate-acodec-adpcm-ima_alp: ENCOPTS = -type pcm -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_ADX, ADX) += adx -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_MS, WAV) += ms -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_SWF, FLV) += swf -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_YAMAHA, WAV) += yamaha +FATE_ACODEC_ADPCM_TRELLIS := adx ima_qt ima_wav ms swf yamaha -FATE_ACODEC_ADPCM_TRELLIS := $(FATE_ACODEC_ADPCM_TRELLIS-yes:%=fate-acodec-adpcm-%-trellis) +FATE_ACODEC_ADPCM_TRELLIS := $(FATE_ACODEC_ADPCM_TRELLIS:%=fate-acodec-adpcm-%-trellis) +FATE_ACODEC_ADPCM_TRELLIS := $(filter $(addsuffix -trellis,$(FATE_ACODEC_ADPCM)), $(FATE_ACODEC_ADPCM_TRELLIS)) FATE_ACODEC += $(FATE_ACODEC_ADPCM_TRELLIS) fate-acodec-adpcm-trellis: $(FATE_ACODEC_ADPCM_TRELLIS) @@ -101,28 +101,28 @@ fate-acodec-adpcm-ms-trellis: FMT = wav fate-acodec-adpcm-swf-trellis: FMT = flv fate-acodec-adpcm-yamaha-trellis: FMT = wav -FATE_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += fate-acodec-mp2 +FATE_ACODEC-$(call ENCDEC, MP2, MP2 MP3, ARESAMPLE_FILTER) += fate-acodec-mp2 fate-acodec-mp2: FMT = mp2 fate-acodec-mp2: CMP_SHIFT = -1924 fate-acodec-mp2: ENCOPTS = -b:a 128k -FATE_ACODEC-$(call ENCDEC, MP2FIXED MP2 , MP2 MP3) += fate-acodec-mp2fixed +FATE_ACODEC-$(call ENCDEC, MP2FIXED MP2, MP2 MP3, ARESAMPLE_FILTER) += fate-acodec-mp2fixed fate-acodec-mp2fixed: FMT = mp2 fate-acodec-mp2fixed: CMP_SHIFT = -1924 fate-acodec-mp2fixed: ENCOPTS = -b:a 384k -FATE_ACODEC-$(call ENCDEC, ALAC, MOV) += fate-acodec-alac +FATE_ACODEC-$(call ENCDEC, ALAC, MOV, ARESAMPLE_FILTER) += fate-acodec-alac fate-acodec-alac: FMT = mov fate-acodec-alac: CODEC = alac -compression_level 1 -FATE_ACODEC-$(call ENCDEC, DCA, DTS) += fate-acodec-dca +FATE_ACODEC-$(call ENCDEC, DCA, DTS, ARESAMPLE_FILTER) += fate-acodec-dca fate-acodec-dca: tests/data/asynth-44100-2.wav fate-acodec-dca: SRC = tests/data/asynth-44100-2.wav fate-acodec-dca: CMD = md5 -i $(TARGET_PATH)/$(SRC) -c:a dca -strict -2 -f dts -flags +bitexact -af aresample fate-acodec-dca: CMP = oneline fate-acodec-dca: REF = 2aa580ac67820fce4f581b96ebb34acc -FATE_ACODEC-$(call ENCDEC, DCA, WAV) += fate-acodec-dca2 +FATE_ACODEC-$(call ENCDEC, DCA, WAV, ARESAMPLE_FILTER) += fate-acodec-dca2 fate-acodec-dca2: CMD = enc_dec_pcm dts wav s16le $(SRC) -c:a dca -strict -2 -flags +bitexact -af aresample fate-acodec-dca2: REF = $(SRC) fate-acodec-dca2: CMP = stddev @@ -137,7 +137,7 @@ fate-acodec-flac: CODEC = flac -compression_level 2 fate-acodec-flac-exact-rice: FMT = flac fate-acodec-flac-exact-rice: CODEC = flac -compression_level 2 -exact_rice_parameters 1 -FATE_ACODEC-$(call ENCDEC, G723_1, G723_1) += fate-acodec-g723_1 +FATE_ACODEC-$(call ENCDEC, G723_1, G723_1, ARESAMPLE_FILTER) += fate-acodec-g723_1 fate-acodec-g723_1: tests/data/asynth-8000-1.wav fate-acodec-g723_1: SRC = tests/data/asynth-8000-1.wav fate-acodec-g723_1: FMT = g723_1 @@ -154,25 +154,26 @@ fate-acodec-ra144: CMP = stddev fate-acodec-ra144: CMP_TARGET = 4777 fate-acodec-ra144: CMP_SHIFT = -320 -FATE_ACODEC-$(call ENCDEC, ROQ_DPCM, ROQ) += fate-acodec-roqaudio +FATE_ACODEC-$(call ENCDEC, ROQ_DPCM, ROQ, ARESAMPLE_FILTER) += fate-acodec-roqaudio fate-acodec-roqaudio: FMT = roq fate-acodec-roqaudio: CODEC = roq_dpcm fate-acodec-roqaudio: ENCOPTS = -ar 22050 fate-acodec-roqaudio: DECOPTS = -ar 44100 -FATE_ACODEC-$(call ENCDEC, S302M, MPEGTS) += fate-acodec-s302m +FATE_ACODEC-$(call ENCDEC, S302M, MPEGTS, ARESAMPLE_FILTER) += fate-acodec-s302m fate-acodec-s302m: FMT = mpegts fate-acodec-s302m: CODEC = s302m fate-acodec-s302m: ENCOPTS = -ar 48000 -strict -2 fate-acodec-s302m: DECOPTS = -ar 44100 -FATE_ACODEC-$(call ENCDEC, WAVPACK, WV) += fate-acodec-wavpack +FATE_ACODEC-$(call ENCDEC, WAVPACK, WV, ARESAMPLE_FILTER) += fate-acodec-wavpack fate-acodec-wavpack: FMT = wv fate-acodec-wavpack: CODEC = wavpack -compression_level 1 FATE_ACODEC-$(call ENCDEC, TTA, TTA) += fate-acodec-tta fate-acodec-tta: FMT = tta +FATE_ACODEC-yes := $(if $(call ENCDEC, PCM_S16LE, WAV), $(FATE_ACODEC-yes)) FATE_ACODEC += $(FATE_ACODEC-yes) $(FATE_ACODEC): tests/data/asynth-44100-2.wav