From patchwork Sat Apr 30 06:25:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35521 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp708139pzb; Fri, 29 Apr 2022 23:26:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyp9UliAMZdGlwkJt/Q8RmJQmJyUaEc31yIRR8QlTP9GuX/6XXgRCX1mJkLHdXiDIrgUrHq X-Received: by 2002:a17:906:c112:b0:6f3:fe8e:cf04 with SMTP id do18-20020a170906c11200b006f3fe8ecf04mr2763036ejc.497.1651299994319; Fri, 29 Apr 2022 23:26:34 -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 m9-20020a056402430900b00418c2b5bd35si9624289edc.23.2022.04.29.23.26.26; Fri, 29 Apr 2022 23:26:34 -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="mYCCu4/n"; 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 90C4868B2EE; Sat, 30 Apr 2022 09:26:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069081.outbound.protection.outlook.com [40.92.69.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EC2F68B2EF for ; Sat, 30 Apr 2022 09:26:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TBn88hM3y2fbGKnCbW9qGfK+2YufDoixGviRRN3qA+6Ulc+jij8X//jh7nRe3z/tmwSpQV9McB+C4Qe5HBqsbW9fwJPaUM3KFVyenyODTRuNDDVVOzcwwGCq/drMIgj2Stjo7GvWDEmXUrFL3YFAWkXws0Ck5oMm4l7rhLiiq9/ESjemnTbGw9FrrPtOV/ILJ6pIC9HptPsz7Rg2RsyIT5nBl03hTzelJf/10vLjaWS2KD95J+B/DiGqd5lMYaCBhykKcVXW1W10t5+6WerIF1F/LsZtc4B0NRwu/ZvOWJ1DKHL0qvK64UNbaGujxCx2i5wp4xuqeAoiYUi5HvRusA== 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=mb7/kelCetC0Fy/MUQThC13s3xmRJro6M2BnltKs0XU=; b=cgcK6zn6JfkhPJo8pJPGeAB52pq3kQYZyLy11LRpORk70f1PoMtx4jRaQdeY1WfE96teWWO+qLx8lWVh4xbr0wl+m6/IWiPVAhInn7ACiu/qKuScJgrJUDUroIeKcVJ5z71xOXGVJ0R09HUfDqmlczfxhKvz3e1iAAqlQqiNc4zkwQjLzsHhnZx1jX4n5H+R1jOdQoyGorqtziAm3S8+3Ido2ws99tYcKGTNTwoG8ivZ9s/YKk8UHBI64FwuWBq+j37eHMOJ+GLSM2UVQdSUfq755F64+GB4XwwLQkWEVDVPz5BXTrtj5wR0Sde52NK4dxlwQT6MO8Ssqdr2rFp5kg== 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=mb7/kelCetC0Fy/MUQThC13s3xmRJro6M2BnltKs0XU=; b=mYCCu4/nEZNtjFpwbYJX8+b2wGJVc/zgZiSPyvoxFoemaDlmJSK3MT3YXJpA04WZmY6vPb4HQKEy31UbLp/fBqjY83Szqahe7ANH5odx3C+y/r43xkNFkdQ2eEslxfaI/Bswj/i/OS3UP7Xi99NLrZGgrH3bWM7bbrlpz2QyrNhfUCiOPIyldljiy2NxzpmN/Mr3F46FiIsEHOSPlK3M+5jfPSb8EA8PuQV7uWKJDM+xJqa9Dn0AU6lK7aS/en92X4w0e9l4kBuW62Fk586u/jQAxBybH8mG0//PEk2KezkU0YIeurio5lyk/bdKKFEz1leF1e86l4VwXKCdRPrbgA== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB5406.eurprd01.prod.exchangelabs.com (2603:10a6:803:cc::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sat, 30 Apr 2022 06:26:16 +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.021; Sat, 30 Apr 2022 06:26:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Apr 2022 08:25:21 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YRlEAn4jPJkkx5ndGQJfndZZoL4ebsbp] X-ClientProxiedBy: ZR0P278CA0192.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::16) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220430062523.1425391-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86894091-fcf8-4e3c-7291-08da2a7254a5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSp1XYbE3vnwUBkebNAZYX6GlxKzm4QVLVeWVI+stcviJLqAMhMegxtvATvlWFdDrB8/YOdhbyilZ8+0lAB76qVP1Lia8taQwk+cJqSghhX/2iApo79gPLkZtzdJC9m3sIiCliwpGTlZtwW5ZTbjiJZL0ea758DKiqhjmHDJG+wjYnBkDakzbklu0XGTSDjwVWxJsVEdGnjoOPuJW2hmmVXgthljG0tT9eAduiBmb43qgVW43ESqeLr7IeIR55RLSVc88l+NpYvesDGnK0Zcm2ibwSSVYvRvvly56KqQi92KIfSDhJbymzCcpX9xrunzZTypyLRhoeEVXBqn4Oxlc3ziXNR06k0i0KGYQqiSSbmHDSZ/KixFhj1W0pMBQ4bapEgq/hl/43qL1ZVSdT3qNMyQmxhEaVCDQYgzdxYTWOEdvv5uWA1hUuX3xcOEjFjsuFXOw+C109UlTqRQxvbchIVeXa76RYXSoZKmIC6ncwAaBwVzGXntt5T7GiMJYmmb5Kji9oBwUs7m1RIyBuA3Kg4Z0MuixM1i/JSCgcM/1ZCiR6ps3r4ryD1Rn7wc2QrxCilX/1BVIolan+LVNZ60Rwy3z5qe2R1MSVCwbtyr7DfiRazXN0InpYnQw8KaFyAxitslZpDr8yz7ZRjU6p6irwXWG0ZR6EQc70kO8au0FBV4v7ATc1jOL+32yb9b9KWBxbjhQyxgrvi5oNjQSlT2VSs8bdRqTDaCBZpssOjuXDf8iP7QF64iGR1jtUYia8Wv4c= X-MS-TrafficTypeDiagnostic: VI1PR01MB5406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Vc/AREartMIaWE+CYe368KTP/V3a9xup6RDhpllb24j8pw5oNYY80In0LE/Sf68zmu/aaCZCjxsTnNRUHTBvnqpsQsteEHQRD3jsh45bgpTVjecFauWQn7gaJ14eVWgPV7aUc87XOi8wh3KSc+uvQRshuv/V8Ez5Qn6QzjVexid1DFFjBEWd5zBSJS/CU3EBI2vD4AV7Y1Zy94tVaEJP+bwvA9YlnrQrr7S6bes28njd9WaeHdW8fnuG8nI/yAnSm8tTPbPCYb3Lg3fqKV7IRSu2JSg0C80HMjEcpcDSoh7W/SMU02VKqcNYS+ZcarsbX/RoX5KAadanI/KJdGKh9yvA/+DYZtG6x8AqQ/Ht3qpvlpGEgef4t2fsic/xsngkwYLAsOmtcR/7LIg2LCB6bp/TfEf6j4VWI6w2gcV1W85zukdsqiB/8XNlObypxkb/LSzl0j3trEcRPAMo5SEsUATvQWgUzjQFDfr59kTqg+2ZpvDzWhnR2C85Jh328t6hsZX6qVsHhj0NfVOCb5yxZuEO1nAFdg9Tbxj1+nGucyGNFSD9k0RbHPK9bRG564E5lM7peFAW2M/mfhXXKtuvg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h4niWIWPzhg3exeYHObYhFUQrH6RnmkqYyabXLj6rk/BW2WEGgSr06H5C/YN6jqyNL2wIIuqZbpqUGtNLfb4M9YkJgZPDLKVuO2H7ME2VoZV9OG/DaeNlwncKJAcpbN4fBz1xZ5TAn5X9zQtfZY69s+Dafq2vACvg0eag4m7wO6n6ucNJgc9QenHNPDKrlAzQhnEnegZCyWk5NyqczFCxZhg/LfmyalPVjJ3AeICZC/xb6YmdW0DJxXW7NNweFTot4yQexlI1ujUQHPm4aiBjRp5upZoMDdt2Qv5oFctOHWVlTGyeSF6s/o+ebpZ/xK7Nj3ncgVg4nX2C+UDCY8ItcWkYTR909L1iKt92zV4QVR/i6BVMIg0VEkuev61CXPz63yJxPSgeGqljAPQwX78bhux8dhacq6eQ327SRPwXYBHvGAYL2aUibExLUYpi1QpG/IbZkam1xcLW/WaWz3/0mcC8H9fRilQ0VwjOn5vMOVLnxHpRgRYn/zm81U2Wcz5hVct78TK+neiUDukZe3ovb64X7EyBYfH6nASb3IUBJfMwlm01yGjx8Exiuisnp4PH1CS4M+CBwZuPJuMCfbxB0VM7zz4uRIN3v+XUnPpQRgGeXMXHIRvT7fO4MCVjXBmYgbf8PbtBBPfBBhPJ47yKDrHY0hnHqodv6IWUTaefEzYMfTbZvwBB2EtECwg9sPHXNQryIEDwF4SDTJbEnAd3A/5kd9Kw/Kg0b0VXsOFpLeINJHoULcu4VJCdpIDvyL10QKbGGg7flIVO4vW+OXGz89YPFpeOT2ID8U3XQXAexFv3grFVjgkPvfGLGtNQ/vGwU3gByaPf2pqOWzfiTA8GDeK+/zQews0lbcmcyu8r1lgQWTHhdwsffjcE03BB4lQBAvw73V8hosb5tGvUe6ow5y7bVQ6YIfSTjYSmAIZF5LuQqujQX/B0jX0mjKICWtKWbEM1BvE2Jkrntlq9cv/1HGByM5frzGef78BapBO6bDVsC+nOQ/vmEto29K2YItnV527xMbMwDpq5B/eDgk4r60P49p9/NL5VebgiDeI5QDJhPYvh78e3X0ad6sYJ0wN8qSaCi2F2jkxsXSuRvf+7PKQSJtO+Xx2FyVmX71cHV07XEXSVTtNwH7N2Q8RG+vS2zc1Q61UElhZCicDfxlPkmAaGrH9px2rCFUO380fH57SlidzVqFTHnX7QS2YuCWy0nXvbEBziQlPQYZ3yxd9NBmevzr9xH+DTW3mTwOD5zl8hBGLlwB9jRw9t0Ezqjeqs5dDtbuX7xe3GJOfAJZ3xOwVwfkbH9Y0+Og+ScuD+4937nl6intxom1ug93E9ACe90OJjvjCA8xj6YDKrkJk2pb7j+WZtk7OXHOnymayhb+UIhjPoxL4nkGFAk17nUTe83AG3BIOaPb5CI+d0b1qoqyI1uHD9cYTftQsepUr09p6w/vMwUpiNnoBY7JzF85ObFvXsQQ6mGZU+hZG2x+zyQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86894091-fcf8-4e3c-7291-08da2a7254a5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2022 06:26:16.7675 (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: VI1PR01MB5406 Subject: [FFmpeg-devel] [PATCH 22/24] tests/fate-run: Always use -bitexact for ffprobe 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: oU4Bx0xlNc5Z Makes no difference currently. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 3c62246c8a..821e949b01 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -86,15 +86,15 @@ runecho(){ } probefmt(){ - run ffprobe${PROGSUF}${EXECSUF} -show_entries format=format_name -print_format default=nw=1:nk=1 "$@" + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_entries format=format_name -print_format default=nw=1:nk=1 "$@" } probeaudiostream(){ - run ffprobe${PROGSUF}${EXECSUF} -show_entries stream=codec_name,codec_time_base,sample_fmt,channels,channel_layout:side_data "$@" + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_entries stream=codec_name,codec_time_base,sample_fmt,channels,channel_layout:side_data "$@" } probetags(){ - run ffprobe${PROGSUF}${EXECSUF} -show_entries format_tags "$@" + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_entries format_tags "$@" } runlocal(){ @@ -103,11 +103,11 @@ runlocal(){ } probeframes(){ - run ffprobe${PROGSUF}${EXECSUF} -show_frames "$@" + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_frames "$@" } probechapters(){ - run ffprobe${PROGSUF}${EXECSUF} -show_chapters "$@" + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_chapters "$@" } probegaplessinfo(){ @@ -222,7 +222,7 @@ enc_dec(){ do_md5sum $decfile tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift test -z $ffprobe_opts || \ - run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts $tencfile || return + run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return } transcode(){ @@ -245,7 +245,7 @@ transcode(){ ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ -f framecrc - || return test -z $ffprobe_opts || \ - run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts $tencfile || return + run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return } stream_remux(){ @@ -264,7 +264,7 @@ stream_remux(){ ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ -f framecrc - || return test -z $ffprobe_opts || \ - run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts $tencfile || return + run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return } # FIXME: There is a certain duplication between the avconv-related helper