From patchwork Thu Apr 28 23:24:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35480 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp233272pzh; Thu, 28 Apr 2022 16:24:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIRn5U6zAcbySLnwQLGE/PRMAziMqwhxXyXdH+7HNE923tTRa+cGqfikjGz/MWAaZuvXFP X-Received: by 2002:a17:906:6841:b0:6cf:9c02:8965 with SMTP id a1-20020a170906684100b006cf9c028965mr33432562ejs.440.1651188292207; Thu, 28 Apr 2022 16:24:52 -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 x18-20020a50f192000000b0041d9354ecacsi4941071edl.222.2022.04.28.16.24.51; Thu, 28 Apr 2022 16:24:52 -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=YMOelNN0; 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 31C1D68B23D; Fri, 29 Apr 2022 02:24:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2037.outbound.protection.outlook.com [40.92.91.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D03F6801C8 for ; Fri, 29 Apr 2022 02:24:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FiO8HnuljVgOUJNzzHaa8XhQlL/TG5ox1NGQLjQOuQjTxkYEBmAnVynkVs0DmmeEdYZOfjlWAkoM+BzixOzV2VdjtrYryeU6Kchqta/6luye33hrRQy2KrnPtNAMiFuNIFt5uKsk+13WkcayMhbPgv/5r2tZXoPJPLAFIaKJ4aSBy00+5FacqK34PBmuYjTTTf5rJ//cgOeeB8FKwjYnu7hLYXadm7FDzXZO/P3oV5LMspGNZwacEuOffA/Oxl7H75A5t5grBLUE5gm//mngZE42jR8o8DkIywt10mw2df8yN4yN1qo2kCpurfUyuWujE4vMSKr+SpAnduXueU83mQ== 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=XYEYhIFxMHuL/CcGWT+1ivtv4L8eqj+2Xl4k+w7ExUI=; b=iQ4OTzbDJV2VBWI90MQEe9+3PRSDOz+IDTaR21lhnXJaxz4z1PYkqKxTPJ1KOfE2s1wsXIeVd8yV5N8u82/qA60p9nsybSK0MeqnB5N3+OfKZfAB1IMXTPKv7/p2J72cZJ80YQ+b0QJXnumkNPp1FUbfnVJW0U+/madLogMu1qZUwZozQr890EIozMr+sNOdw6ay2J6xNTiJvx1ruJGffw2ps3UioNa6pIKv0bOV/C4EQaRsd1Umhdjd+AV8r6l7TBtFl2LImhwRrNfr7uPVwsr+tCB2yqoiiH/cWzDP7K6E70hB3pwvy7jUPDVcfZH4pTSmS9bNssMw26N/4onO0A== 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=XYEYhIFxMHuL/CcGWT+1ivtv4L8eqj+2Xl4k+w7ExUI=; b=YMOelNN0l+G2m0a1w4OQ/DcIlhWc79aLUHYGOY9ufZInNz2RApcRRA+/NKy8YEBr0BvQoZ1lu1wAPg9IENS2kLMSzoUWB7GDFjzO7ZaREcs4gLUVoSWvfs2NzjUj05zE5jVLGHEJtXfsFgfBMDUDs5j/QJQovw3S7JLkA+JolI+8QZ0q65Prvwx2yFYRzwswsujQuUXGB7F5pApiIKjvgz8qq8yhUFT6CO3yL/zdMnWoUDa5SLAqaSG9NhSsf1AhvPSHXtNWv6vwUgZ4WULq/0hJP8nYf8rZdHIbc3J5xbZsi6gy4vgW/zttMZ2iEOSmZHebVYiHc2vQkQKRkNWBog== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PA4PR01MB9140.eurprd01.prod.exchangelabs.com (2603:10a6:102:27f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 23:24: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.021; Thu, 28 Apr 2022 23:24:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:24:16 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [jwuXTu7TRUKz1sAs8xCEbYhyeAuM6Uw6] X-ClientProxiedBy: ZR0P278CA0034.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::21) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232428.657333-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6ffe3ef-af23-4b85-ab23-08da296e42a4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xMG7t2zWdj/W+SpjrrdAJaXVs1HeMB3peyqR+gO8/nYTn70XKy23yHd54jl2Vay+bI5/PC8oPWP2uHf2fSbRIr4eXU2b69YIaDPu30ugDCDc86VSYH4K2l56k9ANLhGK/nScdThzx51QP0hcVgEo0rpy2NIGIPawSNhyg5XXvsGEgxv9pDvU70S68Y9IQOVUU9I7hG4nRqpMbI9ESDX3AHejYBJW26epbt9eA4vTfRsLjYsLyRO2tT/phT965NnbzyJI4M/qOna1cBytbR3JBG4OJGViNEySCOHH0JHkLLhD2XI53c4kPvufS5pwNKJ78s9R1SwDkDiRgnH/t2py5iG89Df0C72V4fMMwN2Ih1CNmdSiBOHJefaYJRm8l4Lnv8MioYguO3VLDVU/aSemYhzvmExcM7Seajtm66HgOj2OimfuipXpC8+GLAn6aXFt5AIIDpylogYcDwfx0OuYcMFPDNwG48whmboVoC2GFwZvTgAgDxKNE55nmNT6zWzGttyT2IjePM55D8DTSSnA2RkcpBSGYg2XxMnF7cGQ+77Wg2/deB39/Bln2Tn2fxR93NrGnMax1vGuODDPIwV1Csa1q1FjTq39MT5hUsjoUKEmd1HZUneDY9+TH6rI54T9kSP//RXWpoiLCfBrY7ODc83397wc4fRnXmEVXJTqGkm3I9b/BwKCoBwYV6yxIqAlJVEeMq3vAnCzIcXFUDnodCTgkaRDxjftx/ZRtvA6PC8k0= X-MS-TrafficTypeDiagnostic: PA4PR01MB9140:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EM6HDVN0hw1sBjTV4TZTs+bGHANEUUn2BflZON4CD/J7hRZ3FfYz3AwKb+9mjncB2Sf+vhOiJF6BmLj8MwvLr2PrCBI8rrXMSVDNhRFET/q0RXilbtQ9YFNTxaHkHd8YKZd+EiQZad9+bgbasjnyJyFevrs55qI/EgoCqe6VspUYBtZyHv5C1yVSJSI3x8vX8AsG0Wr85vJ8c09q9gpL7HLMINNXKg1eO53TlDqcANv9R+xS1bU0lvNIbodZ4Qq4U3F8Y+7yyb2X65S3k4TO7HCDklzxbexdr+hpJ62MMCDPWqZaHO7uL+zsmWOCIOJH/YEIp/XME4+o7cKjB8jroulWDK4AfB25/sDnlWYCWu8o/2l03jjwDlEuzsPuZs+V5CnCmjFcpVTmnxcuWcPvrFhm+85x744hf6Yg1fs0ZXsAhUhubYOPAt/bQ8uhDPV/QnfUUeuWYzo1AFuwALlBUn44fk0ZdQ+ODVG3SeQx8qT22Bg1PcSswaxg0s5W++/Z7kG246HkHQWE/5pX28zJOu0h+Fk8+TPjz5yf9KuQUVXbnNnOGpSXM9W7rZPL6fjjGUR9OiZDlhDFt+yKbdiDGQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DyYuhe+cTQWdpgnu1OlBjRy1+UO+AMNg1HtU7F6cR/2xH7W2+IKjvBOcBfRSHTZsmwPFCZiUTEj+tB54gq3n7e5VBQvhGVrd1S8aJxneNREII6rcB86v5MtGlo90ndbp6mX2qe/VZUZlPFBRrIn4H8WTrxjXp/sgxgs5ifxW3Rh6HQev9VHuu7FgLr75iPjhvqbyO2Cnk4ec5jusLr0v/h930zAzlSTrpD4bHhmPY5mDvwHGn9tox5Z2zMtEiE93p6i39B9hqtqQgCS9Qd+7wyo3mBqq50GlKPPc3ICVQtFmzRUlrwEk2Wv7jfIQhoZ7CQ23clDD1VKO89hXFu3VYUOw1IBH99+/i6JCVzD1qo+u7uIyR/551OGXNoxUZjPdz1GPl/m2MK9UXpf5xeziEz6yyAJmtvR82xi9c1aobU4a7xqi10bjzAOVkBAIGESYsZ1nIfkvpqSw184p0KiXjcZzTFNbAqvXzTpM1loRYmepzXP/1LTU5zuwhNLzkT5vYSsg3diSp6xsZacqoWKrpk3UqavYOEdBX/nCKBDHfnSsr61IWevJi8vJWVpEloqPR8J+gurGDk3sSq3P2A8DRwyAeGa6wfyZ+dou3gYFUAN4ocwkc41Qr4mwZpdxD6iONmDDtpDqiLDyVFW1LSzygc1vyl28V81KMyrH/d6gBrdaclLG2dW/Nyb5f1rT+qE+PHM7mRO3r+ERZGPRsWMqIuv72oZ5zHQWk7NJU9Q+g8JdBy80RWET802KxM/cg5geLXuvKxtJuzjoF77TgDHsVRG8Wu+molgLfJNHP+BjGY+YzpmSrPP7W2g5vsZSvh32cQOfqcJw9RllkzCBVUiDNo2W8difTSO+kKgXRS2v0rvicbsSThIoKi5yKpXYH8itU3USZETfp+244e0fQ+1Ms3HOnacmI3sldlE2O33wU3y1bYzbUSmdxToEyRcBxzOQkearuYkC7CSVRVFCR50gOSIr74kjkx3N3ftysvsKwVkWYMB8mJns33Q/p9EMoTanU3HUZowC5wK7zavehxPVTJYQ1ya97lFhEVMGNrHa4onO0DjiFd5g0WX+PlZ0c5pRWHcEU89w8nis4h0xs/AGIAxYLDzLJmhQ5xEhkH9NNK/u3i/jFYatclTiBDdlMG6mo4ACWo45vUVuPK6b7WBfVG0GxHRpgR+yGxXuY/ddzLjnYml9LP+yiB5sZcaIpwRGDGf8Dt7y9qFk93wUM+dF9RfMt6NY/Na8XwOdgz0oUuPcQ9EBvFfGpQbRQV/jM1kLkZUe3csbW7EuGmwdonAkqCJFnksaO0Ks6WSYAkZO/hKC6awJTagI5cMqAnOcnM/E0HB0uLDslJr7ZT/FbPFFwUjZmucUcsQxaK7ExWRrNEk0RqEW6txo1yx2/WUHkxLDy3Ff5vKkjAu9amXA0I7RMo8/LqiHbOYZXekorjDW8BuaH4i/xNjn4TbMCAHURNDZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6ffe3ef-af23-4b85-ab23-08da296e42a4 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:24:39.5554 (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: PA4PR01MB9140 Subject: [FFmpeg-devel] [PATCH 01/13] fate/qt: 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: 9K6mhOpj66Wx Signed-off-by: Andreas Rheinhardt --- tests/fate/qt.mak | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak index 6e71f6e4d1..42e5fd9107 100644 --- a/tests/fate/qt.mak +++ b/tests/fate/qt.mak @@ -1,52 +1,52 @@ -FATE_QT-$(call DEMDEC, MOV, EIGHTBPS) += fate-8bps +FATE_QT-$(call FRAMECRC, MOV, EIGHTBPS, SCALE_FILTER ARESAMPLE_FILTER) += fate-8bps fate-8bps: CMD = framecrc -i $(TARGET_SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24 -vf scale -af aresample -FATE_QT-$(call DEMDEC, MOV, QDM2) += fate-qdm2 +FATE_QT-$(call ENCDEC, PCM_S16LE QDM2, PCM_S16LE MOV, PIPE_PROTOCOL) += fate-qdm2 fate-qdm2: CMD = pcm -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov fate-qdm2: CMP = oneoff fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm fate-qdm2: FUZZ = 2 -FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono +FATE_QT-$(call ENCDEC, PCM_S16LE PCM_ALAW, MOV PCM_S16LE) += fate-qt-alaw-mono fate-qt-alaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le -FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo +FATE_QT-$(call ENCDEC, PCM_S16LE PCM_ALAW, MOV PCM_S16LE) += fate-qt-alaw-stereo fate-qt-alaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le -FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono +FATE_QT-$(call ENCDEC, PCM_S16LE ADPCM_IMA_QT, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-ima4-mono fate-qt-ima4-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le -af aresample -FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo +FATE_QT-$(call ENCDEC, PCM_S16LE ADPCM_IMA_QT, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-ima4-stereo fate-qt-ima4-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le -af aresample -FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono +FATE_QT-$(call ENCDEC, PCM_S16LE MACE3, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-mac3-mono fate-qt-mac3-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le -af aresample -FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo +FATE_QT-$(call ENCDEC, PCM_S16LE MACE3, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-mac3-stereo fate-qt-mac3-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le -af aresample -FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono +FATE_QT-$(call ENCDEC, PCM_S16LE MACE6, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-mac6-mono fate-qt-mac6-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le -af aresample -FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo +FATE_QT-$(call ENCDEC, PCM_S16LE MACE6, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-mac6-stereo fate-qt-mac6-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le -af aresample -FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono +FATE_QT-$(call ENCDEC, PCM_S16LE PCM_MULAW, PCM_S16LE MOV) += fate-qt-ulaw-mono fate-qt-ulaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le -FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo +FATE_QT-$(call ENCDEC, PCM_S16LE PCM_MULAW, PCM_S16LE MOV) += fate-qt-ulaw-stereo fate-qt-ulaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le -FATE_QT-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw +FATE_QT-$(call FRAMECRC, MOV, QDRAW, SCALE_FILTER) += fate-quickdraw fate-quickdraw: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24 -vf scale -FATE_QT-$(call DEMDEC, MOV, RPZA) += fate-rpza +FATE_QT-$(call FRAMECRC, MOV, RPZA, SCALE_FILTER) += fate-rpza fate-rpza: CMD = framecrc -i $(TARGET_SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 -vf scale -FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1 +FATE_QT-$(call FRAMECRC, MOV, SVQ1) += fate-svq1 fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t 10 -FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1-headerswap +FATE_QT-$(call FRAMECRC, MOV, SVQ1) += fate-svq1-headerswap fate-svq1-headerswap: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/ct_ending_cut.mov -frames 4 FATE_SVQ3 += fate-svq3-1 @@ -59,7 +59,7 @@ fate-svq3-2: CMD = framecrc -flags +bitexact -ignore_editlist 1 -i $(TARGET_SAMP FATE_SVQ3 += fate-svq3-watermark fate-svq3-watermark: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/svq3/svq3_watermark.mov -FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += $(FATE_SVQ3) +FATE_QT-$(call FRAMECRC, MOV, SVQ3, ZLIB) += $(FATE_SVQ3) fate-svq3: $(FATE_SVQ3) FATE_QT += $(FATE_QT-yes) From patchwork Thu Apr 28 23:28:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp234747pzh; Thu, 28 Apr 2022 16:28:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7+X2QZrSjN73fZfuRCnsQSYeGuRJg6dWwTOSfeju7RQn+ogF+KuzX1tLiLtV/d69sJOG+ X-Received: by 2002:a05:6402:40d5:b0:423:e40e:351c with SMTP id z21-20020a05640240d500b00423e40e351cmr38685569edb.52.1651188522553; Thu, 28 Apr 2022 16:28:42 -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 l17-20020a056402255100b00426138eb190si5681406edb.613.2022.04.28.16.28.42; Thu, 28 Apr 2022 16:28:42 -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=JbxNOGOX; 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 B160268B27B; Fri, 29 Apr 2022 02:28:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BF8568A848 for ; Fri, 29 Apr 2022 02:28:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SiV5zc8CfBjt0Mb0vYDmwybqKs2Z/5JZWH7IDuQ/2b7q5/XyCFxdo70hcSD2B3Pma2jT2z9ZGP8fhmR1nWuUZr79laxpDlhB7DFV8OF7uo4/pya/NKh/0XYWp46aMkdOA3gEp8UZkx3z7nu3V8wQsxWrCVXQIu+5/3GWd4EJnNsUkcjjEr2MvV6dkk2/juGStVxHLuk+DzLWq2vt49S0mikclL49J+c408N9/3w1fVh0rDJLtXA1ZLjwXnlFXGeuJPc3jdZKMnxG11rDzmPA39YxLZutIZpvj97jWV0+4soR3BwwAh3YjnFbCLp1orI3l0l2s1+DjO3CrDzI3r/WvQ== 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=61Ee1OCLRYEUBv5p0wp7ueiqPeP3EeQFLxDssAqpH84=; b=e1Yd/Zo7G8FkzDJNxZ8K01531fYXDqFhb4hNUl69jy65P/+xJPvrVmKL+/KUCrHa4q7q3Flaakr2TR89RKXa//KB0RFfXhz1L3UyWa2wel8gN04JEnFufephULndHCpLucptthYRgDL7embRlyuoN3edA+lQ073AIm1pWV3nu8A5L60BGdUMa2VQPfUIuUrkhhap7nGZzrciQPtSdvf3o0TtVO5jmuJK1KZVAHWHi1Edm+dEsj2nrUjFdZHsqkBINhfoILMdN4M8t2Vmu85BIl5TqGOMuzAnAz/T/L8y6mcdQfno6C28+9LbBWRKe/aTsEt3AUhMmlMe8n6VQvj5Yg== 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=61Ee1OCLRYEUBv5p0wp7ueiqPeP3EeQFLxDssAqpH84=; b=JbxNOGOXSKZCcoRoKr6xHIjNIascXC6VwS5olPXuecrI7jXxe5lZziqU/9WxCPe3nCxSyEvqU26dEWMivTuXY4EoMtcf8qq7vIORc554evGA9DzXFd/sI24PpC5KblLAl9p8HoDTaeLlio8SKswmkNywza+wXQqjz4dml/oGrtwXG3RKQ7Ik9gHajLSOEhOR90Ctb2RJnSOUUgGJK8jIYh9lI7FnSo7sNHNboVK3UgUHhRXJ4aicKt7z78+IHro0U3LArUpUiyqxloQArH71ZmkreTyoQsjmW7AKz7965u756zRbw7pM/niC/aLPNn7lq/p1hWWLMdGr+0fRAYn++g== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB6480.eurprd01.prod.exchangelabs.com (2603:10a6:800:144::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 23:28: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.021; Thu, 28 Apr 2022 23:28:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:13 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [B6l6cxw9GU/+WpTezTPTeAQMoZjkXRp+] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6bd68a65-ec24-4789-62d7-08da296ece80 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVjun0oR/i13GVUp6sVtsqgmqNBCNqnqHyOyAznOTCQYPryaHK1bDIgvUHzM30ysndfT0tGXz4CS5PEbHCF/DXbkYnIxKtneFE+8Dd8Ycavevp3bsQOxQutMV0PpZDOc1EPOOfEJuTov9N5keKXm9my2fhX0MRHtA9Vz/GNiZOXdpOPahTT1z/kF3I1weFCGqfaxGo5Gc3PNxWDGosrn2vAAC/QGAYTDsBCqO+fU7NvzfYxpHyL2slZ1FszlSgr5y9Pq+YTkLE/7ObnLJujZ1w4a2KWgNH+LxWmWirp0ZK3lJJy5w8WK5xzm9TVzisSzZTSahdHZOWWrlb1U9FDEhTmtYglsa8A7t9Tvcd296ewZ289rbPMRhLFF7GQWRBF0g23uDBkX+gBMmOPkHlOYQWqCWZkUlTNkkRoRHbpxDyi2rGwqYP94Mh9/a1pekS1QhLNI//AGlauciiYzcUXFXKxyqYBzl5BnGyejCFXCNc94ywP1Pn5UZXTsj+jSBCayvlAToCJDan1SvphiOChV1n87v+g9Nqz2rLNXWR0koslhCdjnbs+bhd5Cer8uJ25R4ZXMqLURnj7vM94o1nNuZLLDzuO6VoewvGz5x+5WX4ivIOnkjfxCqY7lYXlinvtHHw4gRcJwHW7GtXF5YODNdnhfK4SbjD7M13XUdjL3yctdb+q1/xotW9dzpxSF4ZVVmSMx3Xysw4cG9gmRtZ8aSUa5iq0nSqGetM= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Y6Ki2xo+eKHZiY65Sd7EyaTdu48d3ilso61IHo16nvcVC3fnPucoAGOW63x6Dxoa4s9FL9KySWWYCQLhAgyaZFHJNolL3aUSFSVsnqyxjeWGZINYCnZTXpaLeGZh6ZNrBa2w2gwOCYNjKQGtgDauiLHq5GQh64zkkvZjGcH70WoiUmwVYxHNHKDm7E0wW1y2ZKrYX1a0HV/7loga6oFILApl9PAqU+P8EuZZxiknFai3Hp34eJK11lHxBiO/TKhzi55kNbxiKrVis2KCabNaA3msPEWGcAXlT2rm4x/itBWR2/AljVxKZfrC+jvNH0eIR7nxBGsP/pbUrCV4PvXhFQgfd99zPmtGHp/aytNqnGJV8bVZp53GJhY+HYqI+ysUAkE8FxhivS4+CEtT8TnKEdWCXZsjo1oOCGcju9FpUiJkz4j683V3fwYYxKtyzYL90cQLzU1DUkMRJXZMCHIjPmV3W9C43Hi0jlPJLrVZphVpPJMDnPmd8Vh7+ggPdEBujVmWZx7Evj36tJnbDiVHeMgBXDUSK+5VGTLDip0rrCDq9TuECbDm4/OFkNFLW1hb7jII68BnTh3v/LYUmOeJg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hkf8LL+L8jaFTnfh6u2nI0vY1TUWdC2lASdKOXRFunn9zNs/kgC5cONTt6MuUVAWs9yTmjXbspnsRSiaCVQkLj3Zz8+GKErOaAUIFP3KLLflBFdks/ZHSZGTtxCNvN7LyLllZ9ou6rWkh6JvflPD/ua9bovxohluajztD24VbCO3AGBYIOAj/xevlt+5fWMEfDXe46+FW4qtIR3zqY/iXAwbg2bvBF1pYHAmE/ZQ2Sxuqjyhri3eOduoydGt24IvNy1Qn2DPlY1SZiKyEKPmpQdToEXUDuIifvhc+wF/4QuelGTeda68NNT2iBqead9hY7Cgae0OJ/T5H/KVVw9Jja4fUZg3t2A6/zB5uhTGR6P0HTu2gh/36PRalPe2jQTTq8SHzu/f0VeBnN7hrQSf9bl4tQfgB8dM5bh76b7txGh+sv2/dJuTnkz462ChJVRTUWjMFf6U1ngZBMzrr6s7JhZEjkxC6rP8jcZBohqSuBgfo0Sa48PDGcdyz1F4xRji8jffXx60tieibs4rVmFLqyW0K/8msc0flUlE/9LNWE7w/5RFdJcUzof2W6i1sg2xLpxaQdzUJeWSuvGyz+2nKxfse5d8Wt6hdMH0Rk5ZdO/TmFac5rwLmwSA5K7FdUaahpUrbAFwyQEb3ZdeH1dU2J39GvJGGpJChFmn8sPl32zEt1Gm1Rzwqe1S+kzlcuBUSeNS38JtJEbxhbbBNAIY54P4+TJW6jlmh8ScdeIKA8QGdhfxVMOkjAyQYCT7jv8yPbWIgWAYrOMXMvhD2OX6T5k3bI9TWYdrEc5Gz2pbU5PAcyAMB0baVLltC0bzsOp3zx3EYfq5mS69MzVfg3Ry5xlDzPMap4MOhcPBh2JQpJ9W0EZJ5zkN+HyvvYbsYv/caD7/W/ZLyyMwHW1eK6i0ri8oOTsapd5EL4v+d+jFgTx0pd35G/QuCuMvLc5at+OlO3a/iBrQOjmOnoex0b2Xz5fW7sNLOMiEJhSDsrOBV9MRKexw1tnHefl6TQN9niW5QltJ9OxduvCBDgtwYc8gWcVU3i3tZnAXVQZe5sEcMJdt2bJSf2/1+kUvHqJnWijBFEjKY372XmtkJJrE7SWia3RH0g2ZG/LaXR4W2AH7wuQ+Hxu6K2W/M++Lam1B5GOB4DT7igYbzg2KYh6g3xt9CGSzzmHC95qJyAde+qxOwJJOE/a1R20O8IxdTMjR7QhNu5kupshN8iwQC7rzEWgbDBVXxv/uRX8718JS/bWNh6SVEo29TzSmE7Hu07tSFRWRb1k5XAloRM5qSQV1/wO7A0Ut/M8YEjLkjeksqeGw74eIDtNX5U7Y2CBwbCZGKuHCWTUD56BxUp3qBz3bCt2JRmquxNHlCSI8YmF0k5UnvoS49mhm4BcY+ld4wmpdr9DEWUJ46oXtI7ToyS83yuvZVEqvR5T1kxQqa18dw2CvMwkOkiGkpVx3qWOI+mmm4LGJ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bd68a65-ec24-4789-62d7-08da296ece80 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:31.7757 (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: VI1PR01MB6480 Subject: [FFmpeg-devel] [PATCH 02/13] fate/canopus: 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: DKZ2C+hH0pWU Signed-off-by: Andreas Rheinhardt --- tests/fate/canopus.mak | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/fate/canopus.mak b/tests/fate/canopus.mak index 3d664ff911..4e50716813 100644 --- a/tests/fate/canopus.mak +++ b/tests/fate/canopus.mak @@ -8,7 +8,8 @@ fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb. FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC) +FATE_CANOPUS_CLLC := $(if $(call FRAMECRC, AVI, CLLC), $(FATE_CANOPUS_CLLC)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_CLLC) fate-canopus-cllc: $(FATE_CANOPUS_CLLC) #lossy @@ -21,7 +22,8 @@ fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) +FATE_CANOPUS_HQ_HQA := $(if $(call FRAMECRC, AVI, HQ_HQA), $(FATE_CANOPUS_HQ_HQA)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_HQ_HQA) fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA) FATE_CANOPUS_HQX += fate-canopus-hqx422 @@ -30,5 +32,6 @@ fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix FATE_CANOPUS_HQX += fate-canopus-hqx422a fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an -vf scale -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) +FATE_CANOPUS_HQX := $(if $(call FRAMECRC, AVI, HQX, SCALE_FILTER), $(FATE_CANOPUS_HQX)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_HQX) fate-canopus-hqx: $(FATE_CANOPUS_HQX) From patchwork Thu Apr 28 23:28:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp234804pzh; Thu, 28 Apr 2022 16:28:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyr+8QkrQZ6ExBVxwef9Q5hJVVZMz0qEKmV3CQGV1yz0fzF2BtrG73W02UyUVbXK1UeSgm X-Received: by 2002:a17:907:86a7:b0:6f3:85c5:2679 with SMTP id qa39-20020a17090786a700b006f385c52679mr8409540ejc.642.1651188531659; Thu, 28 Apr 2022 16:28:51 -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 e7-20020a056402190700b004262b42b27csi2835586edz.259.2022.04.28.16.28.51; Thu, 28 Apr 2022 16:28:51 -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="TV8Lkm1/"; 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 C558768B2AE; Fri, 29 Apr 2022 02:28:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9A4568B262 for ; Fri, 29 Apr 2022 02:28:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XvLxLn8cQZ7/wP7Tt3enp8ty6mq8DCWX60RCxNXkOQZ7Pdl1MnZCJFDzbZcgRx1eYelqDlPvY3mZD4pG5z6JHeO+Gzv8eQTOPYYcxlFEivWuTSDTvOlt5UwYiAOjzAG6h6+Y3d30jqowX2/t4Yau9UktizQBlqAG0z/ZAPuqaUUZi0DHUh1cUrXb4r7187DcbfaNc5tTbXx+GXs4y2v5zh7+b/Ou/1Bd2I5BGXEn9HMTX1e97Wym2NECkhEZ3oEDm9HSiWxcgv5kzeb7jZanjsJWgmGJHzJrO7Ie05WkEOR7nb/yT7ALTU7fYKsMKoMbtY3nGkqAmo3sbRcC+BYuYw== 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=fkEdorS3FFPvT+96CGxuXnv5GV4fOME8ZRnFXDGL2Tg=; b=U6xo9UZAYYFULXA4FgKrke6qQgxG3m1Bj/eRqJkjPzWn3axNVwSgDgoForRqlku+G6Jlt4HbzhfNdM7/UtHXYPzlNCkOc49XSAyUhqBOxI09p6EYTdXpZxCYwEBD45DlZuedxYgYpUGdOH7G0cHViEd/ad+mINLvqaHxBq4ULivd3sq7PB9H0pHAgynbLZ0AOwyqJxaeSCzztGPsZKtsDGZoeFhCP/DYHzW43mdPJlC5wzza7miBrWuKKm2iPl9fwU/QzoN1sD9mkCuY31NqlITxrnVLr3Yx+co1SmSw66Uy8muvfPn7yXLSrwqDwzD2quBWr7raONVXnbwRcptSQg== 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=fkEdorS3FFPvT+96CGxuXnv5GV4fOME8ZRnFXDGL2Tg=; b=TV8Lkm1/2QX/Vu7HGuJAGWURWACiLIDIZrutScGIOkM7YXKrYreROS7dC3sUWSoTEenOju+oHRcgNOo9RAyj/ZqpUWS6j5r4WnCwCihsQ80LcmshcdHEqatD63AH9AcUB5k9web6r5aj7PeCqwAIEYEhy1FrdEApPgjj5CrjyK6RBHa1a00zaYPlCGyTIT1WHF7FXisEqV6x1bIjRUNnNJwzHnSji3BMaEtZZ/ZXtUYAKlQE2Cf9JO84IIQ/ow4XcXtu1zxwCTr96MCtl/ffdhBNhlqzBTKHso5epEmWjkgVa4Syup9m/T+2YMOb49Vw3CKyIzQMF/m5KBOGzEPJzg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB6480.eurprd01.prod.exchangelabs.com (2603:10a6:800:144::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 23:28: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.021; Thu, 28 Apr 2022 23:28:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:14 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [pc8vZoEGVWGg40y97Ryou1GIXc0Vy7XT] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e5ba116-cd46-42aa-08ce-08da296ed035 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xMmoRp5xhsxVHFosL2sPIbqoQ66DXv8fxRubENnR2/isBE/E60dgDJCDcJ5D/tOhwpLAqxvMrki+fcs3Iol2eLJ2Wig1hL0+JBtNSBPJ3TgugGcTTox6Awv8xIuR0Qgcho32uc3yuLD4PcWamCz3jExHzbSElF66Z7dLsLBa9j9/X4SxGUaR13lca9UOjA5HN9u31+HDioaJU02m/Cmu3aB7OJhpDN+isaaMyC5lzWKPvotTBkf8eoqoEd44txLOxthAnf2ySQsgaTYhKt+OKVQEUriKKpWmClNt7RV1MXbEmCg6viceXZ94BxgXimBTPPdCquyE/+Vyo5Sh9mIsJpY6qO6juWkCl4GMiqMGMkNxv/Ar7+4lh3RHks+AcZoJhA47Y5srqrZGJZBwkuSWhom4p7AbAh9+aji7ts1+Cj7DlFuzj4S2l0gCvFeRYfhl5cp+tRzEA1juu77cOiDCjjo15PwGATEVQzqZTRSD7oH7UZ6Uti/amoftbFGiYW7yVq/+Ntd8cRCa/pBO9Dum/MRZGcTDBUp3ni6fYp1r1euYmDZ+51+G8THCF+DNJ1D/A/a4FnO0mnbZaYSJWe8NHedtyHpzV3meBTbGv7PJp3iBJHTtVWcYE9BhoUIiLzYbCtQFwGkzK3WInSmIrU6DR/YCM5UdNW/SXeNEyFBA2FnU4AOUVE8urL5GFjIOGi/jiuGV2Pp0PIWI9PmSKyutVa7D3ILqDnx7cZMWp2EHP8Ng0= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /sJ3GTQoqtngqLmvl6H3j765YFFAlNPTkm8wPZUw/g1Lk5RFoWTGxB8gpVrH55EmgGiWt6dRHksPYkmBxRorf3n+JSyC5M92nfnBoIMs+VHJs4bzutwl5v7D5fQpRfAghlzfnCp4tLogsprSOXCeXA9BW+iG9mXpkC9qD4P3z+Ksb9OJWztKURrwatcDOZSwrOLUnfqGBXDlfDH/RbsvOs64aFX7/qev2U7PHJj0WckaTt4fsS3Zdy57rnAU4EyRwzVVgMCIXLvJBIRmQtH+NwNScHUOIwhXjtYhyMMAs58ucT5799R95xHfQP7ZlwOQLPldOkHVQs0DoZVzSQ2t0+z//l7aEPag7POy4pQlZHGintE6IwR/J452uoRx1T0wcUTzmgeiIMVw00oDGH8L6jKvNERkt5bVdnnJGi962ZJN5mLWk6nE8cd1dw7VyPvzzSn+x36E4w0AdkSziJX4bQAVYb7E2EICo1qi4/JtIchZlEW8RtQsdfyMJBQGZJ9wDwX3eRnThfsXaLsK5eJtxurIMUCA0OFWSiK8GVLtw47pNKdP9pEB6CjVNX2wqATGvT81AAhUDXrp2Vl2VEaLsg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: R5C/q5RRxy/8etNY2u/8JOi980Ueb1K+ze5XA0NED0v3VZv8O17J5DGV585j2wEg7ZRA787JFYt/pWMXqW4zLg/zhl/eJNjZybmdGTUiDhjfEHD1IIX3Prtn4oVLzAEG2bTG2p4S24wrQDlg4fw7GTKf65RP1F7KlwPqgb5XXuAaWg/vCaJwLVgzpy6DcgvpLudcxyKEJyaZQ7WfIB0sX1rsoHpQPeG99k/zkeJ0mpJPxb2vRcO68raB+sOaV3PcOQ5RTj2h2TLc/Gc4KglZhFO5TR53SOLWyBzj7n4LhBkF5uYSuMJUrhSu4je3i1YwJxqPzopKkbfRMDW98OEJMqUzc8uppBWFxwgebi9M0ZeYlGZbJ5ogYe3+X093O1oCmu3yyy04T3RcDdLXtywG2HETqdqdO2QVIv4o/37liKal/jowtx7Mj2uGuZ0YA2Pi99hHmvaHnNRCd9IPhEW6H0PaiIjpUYQu9yHG4UENXwIswnzWJYqu8NAuPsaRxx8mhUr6fuYGr2z/2teEZYPKNUArcGrykS1i7dECjxGFXtauOZQj+tlf+JRqFIleTXlL4QZk7umYlajw1eaz5VMez8/Ai/jpmV2ctBvZ+pVzdrlSoFeaWpsuHVo/9Ty1GzMsBbl1Ih2Jlfj4kUSMaUSs2yRUschPvEGrHsgZIud12v22dLl4lurfL/64wIfPeU1/WGKHVjNLiuQC4v98SzvGExxQ0Xakyz6Jv13sWF0i4hKHARPs0qCDLLZli8qeyZVD0mQDG+4k1kBWjHWv32ZVpI/pmG5Y9e8Y/IuG+PJr6mQYIgFuq6Ph6udVpElhEyTRbpbee5a7Of4DvrAP3RPnaRsPYUQYJX84wWcIFe6QL6X/qzIh40R8BBIszGlmDgNF2bCBUVJW7tflUk1IXod7qKocqrvtyhV4w5TIuXkJ376wEGThUhUWN3LqIP8NkO2u8DSavp3SoDxg7nYb1muRGEB5XJ7HAqVHJfvvPEyWjsHS7oSvbdce8UZc7Ia+2kKcyK4FbSbDTMJUzJaKqIR8Le2Bj0R3P9FfL+3T/AmRqaedNtU9waRjB9uBE+x3gxHFZCTQG3HrmUoTbHwr1b6c/FsrkfM3oBf8tTh5EzDqN0e+fVoKLvvuJRfidyRgz5mT2ci7ZRzNyDwpiQgT/Ky2YsPyUu6T/hiq/12y2OQE6t5uOZPqcnNv81QPldw5XBwBaK6TooAMyoIT3xojIagmGVhVx2NWePhs/153iWwUKQOLwIXj7gzr3zE88ppl1ysQ+1os44O77T6j550pbfjtNW5TlEnV/95d2ggH7rlbU1Yh92j/1qjsSxvSIqGXzY5t7vvwfeJ1ij0bP7u1nQQ30+qJsmTN+Vxa9hkDj34AoR1f6YNHFSr4pRxDY2uWKda3s0WlE8sghWwTIY4AnMKSCR8aLNVVmSVN6v4HJT2tFYGaMqV5C1RFVwbLlMEaSHYy X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e5ba116-cd46-42aa-08ce-08da296ed035 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:34.5905 (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: VI1PR01MB6480 Subject: [FFmpeg-devel] [PATCH 03/13] fate/dnxhd: 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: n6gtAXfnUnUy Signed-off-by: Andreas Rheinhardt --- tests/fate/dnxhd.mak | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/fate/dnxhd.mak b/tests/fate/dnxhd.mak index 59f3f90e91..f261766b53 100644 --- a/tests/fate/dnxhd.mak +++ b/tests/fate/dnxhd.mak @@ -1,15 +1,18 @@ -FATE_DNXHD = fate-dnxhd-mbaff \ - fate-dnxhr-444 \ - fate-dnxhr-12bit \ - fate-dnxhr-parse \ +FATE_DNXHD = fate-dnxhr-parse \ fate-dnxhr-prefix1 \ fate-dnxhr-prefix2 \ fate-dnxhr-prefix3 \ fate-dnxhr-prefix4 \ fate-dnxhr-prefix5 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, DNXHD) += $(FATE_DNXHD) -fate-dnxhd: $(FATE_DNXHD) $(FATE_VCODEC_DNXHD) +FATE_DNXHD_SCALE := fate-dnxhd-mbaff \ + fate-dnxhr-444 \ + fate-dnxhr-12bit \ + +FATE_DNXHD-$(call FRAMECRC, MOV, DNXHD) += $(FATE_DNXHD) +FATE_DNXHD-$(call FRAMECRC, MOV, DNXHD, SCALE_FILTER) += $(FATE_DNXHD_SCALE) +FATE_SAMPLES_FFMPEG += $(FATE_DNXHD-yes) +fate-dnxhd: $(FATE_DNXHD-yes) $(FATE_VCODEC_DNXHD) fate-dnxhd-mbaff: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/dnxhd100_cid1260.mov -pix_fmt yuv422p10le -vf scale fate-dnxhr-444: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/dnxhr444_cid1270.mov -pix_fmt yuv444p10le -vf scale From patchwork Thu Apr 28 23:28:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp234866pzh; Thu, 28 Apr 2022 16:29:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmtBEOkNv1CU3OhBRhua2XfN9nSn+YkIzBLxH4G4a53EXCWwDbYOoJ4zHCL/0aI1/F5xvM X-Received: by 2002:a17:907:6d97:b0:6f3:b04e:3bc6 with SMTP id sb23-20020a1709076d9700b006f3b04e3bc6mr15376819ejc.345.1651188540729; Thu, 28 Apr 2022 16:29:00 -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 d11-20020a170906040b00b006f3b49b5402si4104352eja.924.2022.04.28.16.29.00; Thu, 28 Apr 2022 16:29:00 -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=rWUHPFsm; 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 B4B1268B29A; Fri, 29 Apr 2022 02:28:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E71F768B262 for ; Fri, 29 Apr 2022 02:28:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ck3UXdwI2pEgBn4HaktF3PnvsSJv772yHgIJB2iPLU7VrLYz2QxBGjCY8O+ZNC6u+NQ1juFwY77rc6+Yr4ljQ+h2/dP72ZyZ3PvwYtZho9GPv6XBER+3bXgul5nYtKeqWoubZDmMgKDnsL3TWpeGnu3s21Xxd+vFH0zwhdDcQQEhlYl+DV4/+ZzQw1Jq8qUpvEIYDMeAG4ZQYlpGAnHjn3TIQqFrbiQhyZtkNLh3z3+YOQoaN1ZSn48UxUx+Z0/tkQSTci5NT5jOCA1T+Xr/gxPJcOfGJ5HgwKnC9OXttO7joeeqYIR8/1zgpLtUlzTL6E0Ln/VWGLPdVl/tQp9NGQ== 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=GdS58uHoqfJCdyRuCGOrDYw7FQBZj5b4zZzW7Vur4Ow=; b=j6Bh0lC9LZ6NH4zFa0XCCLr3EIj8VoPTClCz2yLj2d3B73Yrkf0ZES9Bc9Ml5y/f5yzZqsx8L5cbBqV2KOgZz6+qGcop2J36kBwjmf7NhVU1osZpyzrfprz+O6G8P+fBlcNyLu6AUYxYLinon/p/bTJYrZ+gXGIPxCvuSA0cRm2GU/FfWImlfUUzo+LW+p2MJa/+AtbDswu/qbWJDgJE9YSft5f2wPNAvrdyG5bSMnI/2wdBgGLURMd8RUlbxM5RDD/Xb4qqRpcXQ0ZPU/k8pvhuYrz/fd8BsD1uHiAarhqFbEOK/P4Lf9yO74gEZsc2X8K9/lOBfe/ar+mUwHUoQA== 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=GdS58uHoqfJCdyRuCGOrDYw7FQBZj5b4zZzW7Vur4Ow=; b=rWUHPFsmpWMi5N8LJnr16XpAag0V/O8DYVIoS6Sbu0S3dGjSe6t83sYXNfHtqNB8hiUqzeOy/rjAkKIOFXS8mtikG8x6V66IYkXyyyeUJrKzLSVW3Ztdw5x33KtSd585Dg9nFTwvsr3ksS+awRC4/o94cZVOXiTylvq/MZZBDivM0HdSjoSmtodNHT5qIxRoRKtVF1EKgJDE9kiF0Y/uTJ31PZRvRQ3r0GLww8dxTZEXp3ievmNK1P3gnbl7idVnoi5CX6nlYYMT0hjGidm4zYA7LKKOnhFmhUIyfv6JDegXp/A4BJ/wTsQZnDN2h4J7I8qUtSs92tTSw6BcSSsx+g== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB6480.eurprd01.prod.exchangelabs.com (2603:10a6:800:144::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 23:28: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.021; Thu, 28 Apr 2022 23:28:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:15 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [5vExzubwDaaHrUR/CklL3HMLhWYc9om6] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 437e55c3-f801-4901-c5af-08da296ed37e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xMm2XvTXNqmaq+7CQU0LFIFMjkfRUAcMp1BmxfGBz2pkI7ZDLk8ABG6cwDVMi/OckI3Pky8fD0tSehQUtNGm7P528LYfAyvXCfZeJnytINHiVcCm8TdtPbRH8ad5bvWBjzTS7Fp0CfhUJ1TY8p23FO0OcsFZNO8PUIpTqbruS5O81MVcQzGSqPe3EeFm0BfMzudqzdOUcVjhuGtP3ixw6uZRJnjfBjxg+LDrt8R1gf5BDOGBzvn8EEy6R2ATee8+BR3lZijt2diI470DkrHBVpIzafK/4CFY/5J/Opd7VzHpJVIbD/6Zt7pUqCwEEo2OhN9kodkq4MygvIPus3hazaseJhLJ8p0ZjBxkZnc6Ev1sHmdh5D4OXpMTvxGWlkyn6ahq2smf9TlUc+LOl6ZqMj+2svRfu2HrAR8MNsXFc/yu0OS7Ae59pKOL7GF9gkPcSCubH8idZLdlcm5ipfuoVlVZo/re43qP4Q4IkGj7M1qAoBS+kKMHDCpOmu1gu5KytVttQNtFXrOOICWZWG0FaRZBKC69UzGA5v7+9+FUW2IR6FTCwh+rtNmPwcbsW0P5xE/LhLrbuBQzc1JSZ88D18UFIwCXbD71Jd4DghMUIsyIVkv+imxbqXrTEXv83N7ZUcAqbJVnQgedAeys/Jb/qz5aJ+zG9Xs20HSJsyY3e1uH+TUXognJ+ZfwwmqaMxNrgu8lNzdmsFecVLsvUwrz+vovoX5ME8i9sPimCx+Mg46oc= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YhBBnEKxJPaVs0EvTJD3q8PRZivjllm4pg79pOJYFvtYNFCPA3Xpl0zPQQ3wEeNx6vtdgfm76+dZLjxUfWn+TSt/NSd0I4lpufa6oQuOGH/h2gX2Jk/TFaWY8PH/O2xYveeKv1nbSLHaVc58h4cTA4kcSuLTgS7iAgDCc7iLIcZvaGOrtxVU5yHKqWcUDFp9VsRJPdKIacmMU28kn9hxZkL3jAFgZtRtJIzuFxdq1gqNpYqDXFtE2yC69+FvRGJ8LFmb2Tmxf2dMnD/OEM5zRzwfE0BD+H0IInstz0q7ey+fcqXRIHGyP0u5Mh2ZoFtvZdfHAJyd0Ep5iIGjQ/Yb1hFe/MtANYEvu/nks+7B0Z9iwmgLWPMOtH9/ZWGagZoG2GB99TT2+kpdx7mKSEjmvb9rC8c5rjoXoM+KrT4z24UeXRUUIG9FRCyai6iahMvMMCGeYkP0IRm7gOyQKin4/52pPhpZv8uKZoLmW/x9frHilyxlFnxEkNB+lneSZNHcS/oQnj5wzVOGJkDilo2m6KAtXhhkD2NUHr5/89r0oi2uN8Eq0CJ+gGNczXRHgD4Wo+XToWRQs+RHMRuHFEFTBg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kaj+bi5fjSUfcrYMmGy1jUvCx9yLPcLF1Bn3En1/bgz7Sb6TUN+TVm+A3MICfKtA0hQhbC/tR1X+ZMDWeRSWrFjck+/7EpCoJVaDJVs3A9XtKH33kAU5pXgfxXfX0usO99O+6hu91xV49rH+47kzDdnj2X+iZE869dffgJXfCMDNIonOIbR39KqtkWGwHiha7yMnRzYcx2eHxIGraoqMH8U6Gxg1zL1fdkGYSNyZpgm5FEcbamWXSghoPQm5uerI00TCrSb/+HxKb3cFn5cF2M7M6XqE4V9+DAtLbPMPvhGfMk1J7nZUmmsyktCvXuhXG4jxDvXUOZ2LOsWTSehf5nwFcAFCzPSF7B72kAnpvXRJxSQs5ZhwRuApdh9mi0FXZk1qre7MGOE2n3AyZ+gVn2TownHhtyfIkRDNAwPj1Mmd855Tia/A4F0P/t1VrXz8JstjvWVW24zHu1E1JJr6NFCYyZqDiH554X41f84oL/e1PoSB6YYXRL3sYDN6qe1p9ykoBgmU+16g286ODvky2ocfxnUPh3QDVH5Wnx9TuxJOo0TXVlh/Cvqbd5l24rD8iUTYXREZ7unBVTNamND+k50ZE5hB3SFUEJKWCdmHvwy69HvFNWDiGFeoUxm2Sq6nVyR6vCo99tXo7UhHN7OaIUjcRufVDcVM7jBW3nQxIN3vi8s53GRVRWurvD8T5E1cxAhjXdoc5PydWt6+EoC5LxYcD7c9yxMdo38lu3CGPnSu6HGbmgZeuKA4xcn6/kblvZdgvI9rZmdZoMMduq/ItpBm0ymjIrabSINRAm7q20zmsp0PMl1pEuwuVPMAdaqdlkbTdbwNg72wEh/0e/fd0BNar+S+H5P+o7QQ4bqf5nt9C/ksgQ3E1rfJKP1l4d9GWRMb9+gJuqi1VmIMCKdI/afuBerPzZz25PLZcZS/ubl1Rm9+paOByQTg4u1Ce1bTDpCAy9aVNXV6p/gRQH3l5vJFZgQpcemrVt8JzKkQumlBVxx1gSMvDOI0u34COp9BJU3RKpLNgHvH3iNHFaIFwEYZEVKEYpJX8B56TX7Dwp7773JyDk83o2maL4ZSeyr0yKD4uynHxPKExxMdmEKiSORmiD6nvZBQe50FOCGtU4OrbsCEc4LiV4gMCafRYWSYaIsJ58T5U3oc0VI89ZygdLVrmdCjbhsdisVygkLfznd4Avu7hS/t9Pj5xDHp6SqbUmDLt/4CrmI4kUULoXGucYpBqwdbGgNPGqiVbK8uwUWIUfdcj55QfcyHbeWbdyIv42Ogv056qL/o7Wo/FLut0mF+4zL4+SiondSYWQKeQ1C5bayMURpDs5YJeawcZuz4YhlrwxkuAw0wnG69Hz8qy0v6iA1iHMbhzQOhQFj+bOCkRFBD7Ukty2wefs3CGQWk+p+j0k2xZi7SzliAorFdg9eT6NhMl7+k31BZDVaYH1TKfsMjfvZzQlLvXy8s2RnI X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 437e55c3-f801-4901-c5af-08da296ed37e X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:40.0131 (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: VI1PR01MB6480 Subject: [FFmpeg-devel] [PATCH 04/13] fate/ea: 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: ZsHHXm1vBjyX Signed-off-by: Andreas Rheinhardt --- tests/fate/ea.mak | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak index 7667102ce7..2d1ac6e50c 100644 --- a/tests/fate/ea.mak +++ b/tests/fate/ea.mak @@ -1,25 +1,23 @@ -FATE_SAMPLES_EA-$(call DEMDEC, EA_CDATA, ADPCM_EA_XAS) += fate-ea-cdata +FATE_SAMPLES_EA-$(call ENCDEC, PCM_S16LE ADPCM_EA_XAS, PCM_S16LE EA_CDATA, ARESAMPLE_FILTER) += fate-ea-cdata fate-ea-cdata: CMD = md5 -i $(TARGET_SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le -af aresample -FATE_SAMPLES_EA-$(call DEMDEC, EA, EACMV) += fate-ea-cmv +FATE_SAMPLES_EA-$(call FRAMECRC, EA, EACMV, SCALE_FILTER) += fate-ea-cmv fate-ea-cmv: CMD = framecrc -i $(TARGET_SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 -vf scale -FATE_SAMPLES_EA-$(call DEMDEC, EA, EAMAD) += fate-ea-mad +FATE_SAMPLES_EA-$(call FRAMECRC, EA, EAMAD) += fate-ea-mad fate-ea-mad: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/NFS6LogoE.mad -an -FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq +FATE_SAMPLES_EA-$(call FRAMECRC, EA, EATGQ) += fate-ea-tgq fate-ea-tgq: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgq/v27.tgq -an -FATE_EA_TGV += fate-ea-tgv-1 +FATE_EA_TGV-$(call FRAMECRC, EA, EATGV, SCALE_FILTER) += fate-ea-tgv-1 fate-ea-tgv-2 fate-ea-tgv-1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an -vf scale - -FATE_EA_TGV += fate-ea-tgv-2 fate-ea-tgv-2: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an -vf scale -FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV) -fate-ea-tgv: $(FATE_EA_TGV) +FATE_SAMPLES_EA-yes += $(FATE_EA_TGV-yes) +fate-ea-tgv: $(FATE_EA_TGV-yes) -FATE_SAMPLES_EA-$(call DEMDEC, EA, EATQI) += fate-ea-tqi +FATE_SAMPLES_EA-$(call FRAMECRC, EA, EATQI) += fate-ea-tqi fate-ea-tqi: CMD = framecrc -i $(TARGET_SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA-yes) From patchwork Thu Apr 28 23:28:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35484 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp234904pzh; Thu, 28 Apr 2022 16:29:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdwtPRQXNQBqxMO2ocMXB/u+UM8sUtcojZFj41SJ9ZDmdxzi/BG676c1mvffLbuY7DI048 X-Received: by 2002:a17:906:9c83:b0:6df:839a:a6d0 with SMTP id fj3-20020a1709069c8300b006df839aa6d0mr33200427ejc.419.1651188550972; Thu, 28 Apr 2022 16:29:10 -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 a69-20020a509ecb000000b00418c2b5bf2asi5519237edf.524.2022.04.28.16.29.10; Thu, 28 Apr 2022 16:29:10 -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=Z2wM7RzX; 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 AB14A68B267; Fri, 29 Apr 2022 02:28:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2078268B267 for ; Fri, 29 Apr 2022 02:28:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hkz6iWPv7OgWyLJXGuIhX4hlMhgIBMMkMdVnnhPMFIedI+iRUQ6aGBJuMXQlWPToXlO5HlvjEfcMN27p7YYJr06VVFq5dy8MNjrlSL5vsFcfcgs1rkXrX/hGOkZ0hwfJVNnU+G/DPVXjMnSQcThMyo2YRFRtcXyH4gOz0RP8TeXF/vevM782dxXQfTeNBgyQaYEB+Wh9yjornyOitCBVC/7vKn8HzLiCh16yMfp5oo2LpzVE38TGhSRXjDP9xU9JGBnR43SGUKvbIO/Iit6bh38SPJ6SzLvAEGPmcu9/YsXfwEMWOGXzVuhKiBqFe8NMfD1dNXdj9RdruN17JdzVnQ== 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=vhgS4p0eWF+OYBf14eYDisYJb17qsF2Rha/BPvhqDgY=; b=JUa++IeYyDPdeA4gXyV7HbRVHTsDlZ7jaAP1LeE4QYBiipmBciMTP7vCvRGfTEuXyf4chEb19+3ZMIxGnw8UWd3+TW8T+2KfBvnu5TMzTFwxgHbZhNPB9pmmacT78rUI8TkPM4vEoiiA/wTaGRqjCteTW785CPP/P2u51AKVQTpxKdk0XKcCT/x9tPfcXJVEt3r5C3ENJaBOUp8xW6GpZwKPWvY9xETdELZkgw+ibEx9v1R3J4g/NKMvs6aU5x7M0u3XtTgqnOJImvG8+f9rjme8UfgapS+1X0iNPqKNGdjpRf/RHLvVEV715yRbt9I6waGi80Gd6gzVn5gKNXnOFQ== 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=vhgS4p0eWF+OYBf14eYDisYJb17qsF2Rha/BPvhqDgY=; b=Z2wM7RzXuw6sK/rKzGHGo6/Mg2N6kyEdcWFRh86HE8/bHnjdFbYr6EkTR1mB9K6AG2IWuYZ5o/vBVmYfUvYHf8KT39EPNukqr9XQScj8rE4CYVZCfugpv2l1Z8alq9+DTA3kqi2fsyUiJ7JG8SF3XpfkigdU2Nznv/9ageCdS/bdbhiOf8bJUt1l1IM1PrQTAulyPJV/q6Jnr5EwnaSdVfHrMQt3rWgrSgHmPydBXQHVlLljeFFewBAGhYVuaJugrzXCW8JubnWHlIXXal1b63XRxXU6CcSl+JV2+ret/ZRkqpUZnGu2h9aZ/zz+iUOBNrgMyRqGNhW77YDwGuivBw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB6480.eurprd01.prod.exchangelabs.com (2603:10a6:800:144::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 23:28: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.021; Thu, 28 Apr 2022 23:28:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:16 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [G0iARI/cVl1JWsjBdN1eC4MdiZMRzZA3] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39a4cd72-b2f2-453e-9210-08da296ed43b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXk6ejEumfpC3udpoNhomAJ3MVf9c0t4DLJ/bolaisYums+E6oGsc+XduS0GJoygRqHlfx2DpYeetKtYurbOQ33DUwZRVtXEgVSUQT+beoJSmLd5ICV96h9KacoMSIBbZzhcBPmfGJkHU6FF6RxYZOm3utfDvUhuO7n4H1n8YudnHZjdubllohanzF81GbQkAhE2oKm9EsBjxB1G2AtJ0UiZiQcRNJowiE9MktBhu0m4KIKdmMqJS+H6YdmHJrXsvAUmycsiL8czVdrPo7csttnzrbdEsNRCA8xr5k2gFV3HBYMN49jXFDV7Zvd3cb4+yFnjkYTD0/KOm3FksHKLrsaExrJnIjRWy7trnFaGmTJQAlRpYrqjoL2dkx+k8oro6AxC2ULLjo3yAos6ttgIwnHxO/uYeP77o9UjOPsXLx/IBlDWA91r652Ml4mb9KW6ouhncAnipU9Bdm1mvJAOtJx88aDLFEjnCP8Go0hHtXx7JLsfTHZfurekcT126pSu7coAZpifhicI+XnHBYr91j7Fh+roUT1TcbtyjFAIdzDDiu/NsB/t0gsglHSCCOSsyazuVClZRX/YntrSQXrtwgYE21uW6X+JiNVwb++2UcYSIHBJL55CyDQNvAsqlyeDpGrHTQ3HKOnR+SXVKe4XgNvBHBtwB19tPJ5CIMa8hGe3NSCwttmbfrVtOOITmUt+TkaeTERS0mDz+fgvJzSMlIvUFlqb+FTLtw= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TBRFbZ7WVXboHENp+4v1vXZuJqIkfDW2rrIm0DJY/4Y8htQrNsYIjvFE1T8yHIMFcVvItlYQhKxemzmMaL/gx3iHZQZw0g8AhVIML5VjcrJcc8T90TVzSl0tO2ZUg5BN066p2P6hC+vgs11uXdI8o3bSZI2wG6ir7VHSO9QPjJOfCXM9IwkAqFJI42wrr6GTFAc//8+1icpLHq7xaCxe3gf3zlS22XMGxpmWozo/YzxWhsvR3PZSV7BN0TwxSlf1vbk0S0S00zvTcQEyOwLuu09a4lqXfygLzMsjANEOUGwbGK+cKmH50p+bixob9GRQ0nC6nrdR/L8dpdR4HVLZ6kuvHumPqKqDTV0NRilPcYi/ncd6myPXegSALPnmw200X9RvYy1hq+S7otyjHsWZ8RZRofPml7cRPKwevp9dbUKWzJhtTf8c98L7RlAPRigbKIPcSq+U+qJEB2xdLbK5J6Xj88EUtgpH+LGtB3ivJSPwww4GPAxmIuPjJCTALouqRh98Av8fcHjVuVmZMC3bNSWZklqtR/Bf9BMRzDo2diAGjZvKzS6FxypIl8iRlW/+EK6OlQnoXekNS7A304s+yg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pAV316xrM18Q/5CGTfxz52LqT93u22aUDECIYOLu9snso8M/Iw22w9NjGp3oxCl+0csMKR5vb+eogCpD7X00Bu1AyuEBCHYCc7FLtVQCBXjDF3m6gpRFdih3BEanP7WOZXRWV180SCgnJagdJzcT8mP8mctfMsx7LH+UIjivoryhMciTxMeTY9qC+AsQM9wQuU9BOZviTXRIay+LBBdCzFtq1YHW8LAT7t5g/H3OkZ8r0gE5v1mCKC/8uTr6duYxYhlo16ikaTbvbKrQRV66s3K+fXdtPaRkZudaU9bM704HPdxwwd4vIg4psQft3yTQOZGEqFCzaNA16UJvTbILp2tbvEx1FIlxus0Hw0IIshSrvD0r/SUChUn+bcfW/RmxOnc43mYVq7FZsjHeNiD1VEzMMgCGRA6IoC9fYbzxiCr260CBj0UbYxiaQEH6eDsHmPsmi3wPvDAHT+WBteALoODYzyKaz8jNaBx06yFPDBVJFniZjFjJKThcoDH/E9EMr6zTCxAW7jodMljs7rX3dGOZSE1qU/P0I8F3+ZCioToWQJSAdrmoUm4ji6QtyX8Ha/yngiRHsUnE30qtj4uMGnFGwNAxDqDLAienxM4zZBkMEvb00qkz90q2eWX8+D8B9QOA5va9XEqHOb2003GUuHTTb5QGdKmF/AzJHvT41fJJNKjGeHlfK98d2RwkjK+UdafZvsBdFhUoa9jNATSaMRLWfYs1cyarkHV58FUVC6PMxQ2C680Yszmiy6okit6D2IFjNKl6OKdyXzgtPcvYb5f9ARWJFdDHlmsUgD8QAE+FUhPTwYbMsMLlGFopfa5tdMgvjNgh/cmNQmFJkkv1SA6kg4j2MFqKu1BF22dUZYFKhAL2kQ+jifccEQDyHeVcdjJhjPIMtM6Ix9RvWS1vg1GxjBHOx/q7QL2PuwwkGjEnEs01neKF7gx3RHwcobs77w1JHFRp8xz5ZmkWr4ufMFDWxl9N52vhknoY1x4qElLG8SkPavG+qayCmZ9XtGb7hNXt1pZ67wp/2NLpdfS+0DoQf6ZNb4+dwC/TXCLP+5qW3gZv9vTPK+GJBqivjsIaEK00PXmGXrzt83KhGwLePR5SxqF+3MngfXM7vwE6ST4lRw/07X3cLapWx7b5BNxHhYmXJdfXdys1xWUC3CyGPoZwZe5D3aTv5qsFRqM6bo64HBbYZssrMLnYy+ugBqKmN9ggO56+3S+VeP9huuhqNOopjU1IMn5kkntaIRguIKnb8uaiBcshfP6bcLxLPvofNKeCKUCyp2XWyNTrF6YPH4oX2ZmdLQHYrcNkRPwa9J+vyO5vr9bfiLX0vKygR7Avcx71jSXrhAEAqSHe1OR7TlVvNrPqI9X2xP9AwostWYqtYtZEL5WjDXz4vT2cXYZx5WjRl0MYzXB4O5AV/PODT64RoK5bud3sTOnIin/OTwH34H+FWVegESpogJOMxnuz X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39a4cd72-b2f2-453e-9210-08da296ed43b X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:41.3747 (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: VI1PR01MB6480 Subject: [FFmpeg-devel] [PATCH 05/13] fate/vbn: 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: 6oVyRoTENORb Signed-off-by: Andreas Rheinhardt --- tests/fate/vbn.mak | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/fate/vbn.mak b/tests/fate/vbn.mak index 044b110ac1..6c3fe82c99 100644 --- a/tests/fate/vbn.mak +++ b/tests/fate/vbn.mak @@ -30,7 +30,9 @@ tests/data/raw-rgb24.vbn: TAG = GEN tests/data/raw-rgb24.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgb24.png -nostdin -c:v vbn -format raw $(TARGET_PATH)/$@ -y 2>/dev/null -VBN_REFCMP_DEPS = PSNR_FILTER METADATA_FILTER VBN_ENCODER VBN_DECODER IMAGE2_MUXER IMAGE2_DEMUXER PNG_DECODER +FATE_VBN-$(call ENCDEC2, VBN, WRAPPED_AVFRAME PNG, IMAGE2, \ + PSNR_FILTER METADATA_FILTER SCALE_FILTER \ + NULL_MUXER PIPE_PROTOCOL) += $(FATE_VBN) -FATE_SAMPLES_FFMPEG-$(call ALLYES, $(VBN_REFCMP_DEPS)) += $(FATE_VBN) -fate-vbn: $(FATE_VBN) +FATE_SAMPLES_FFMPEG += $(FATE_VBN-yes) +fate-vbn: $(FATE_VBN-yes) From patchwork Thu Apr 28 23:28:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35485 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp234975pzh; Thu, 28 Apr 2022 16:29:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxbiGdQXmzUUzzMiUV5oy+8hIKLHfybalPG90rA2c+xnKoos8VCMbLbK5xsJ20jHWElGm3 X-Received: by 2002:a05:6402:350e:b0:426:1bb4:729f with SMTP id b14-20020a056402350e00b004261bb4729fmr9756514edd.144.1651188560822; Thu, 28 Apr 2022 16:29: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 a19-20020a170906191300b006f3b3d81aa8si4619341eje.216.2022.04.28.16.29.20; Thu, 28 Apr 2022 16:29: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=nxFchDLa; 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 AE1D068B2E5; Fri, 29 Apr 2022 02:28:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 603BE68B267 for ; Fri, 29 Apr 2022 02:28:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QdVglkfOzdU8HTCV8td+1u4lvxJypXEayuca30ctqIeLf0K1B9popxK+RRFNvK5GukNALCHdeisyr6otzdK+5e0V8oDtKyFjl43VE8R/Rr5Nfxn/GdcQ4cscH07GZOqK3ir6GMAW3kHCm4rKxWwVZlwpela7dFViK838iDOKy9FaIxEbumVg760OMF31EJPLRAY1aVIpExxOyEy9KmXGrNYZqbfkR3K8+m6SWBj2X59s72tKRZePLXfPjTdynxXyw0SN8SxkkwBekWYcqYhn50kTGAz2by6juGBqoKA6e6yvvxr4StdyOHmVIrgY2943O24k+Nn2uD1bsFIfqNqAiQ== 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=pEILlyXBu1Md68YxNQlnoHr1s9yJS9TfGwbovm19zQU=; b=dJMaVXX7Qmp+maUAgh5vU3FeQkmukf5rEgP1EhjJuGrE6Bf6gzWZh/Nn6glbSy/xipMBDX60ZaGu+ryNzhP/YkuJA9EBYSbHlbwfs/iQN0dAAIz+4p1N6IstXlhYON8wlyGvZB/Zxjx0G5o1pjQM8dNmDJGjTLtf5ElKacuctHYqzvumDY3hmzCJo9P5igcvtJN3XjbxGLg22MZWYA8AlNyzQe/dvCsrgKuMcWdfW2hny0Nssbjffa4DNmw8yvV1H4g4F1v86cQEvyPiJEG3PheOE8DRnuIENwBjGpvVlGE5gzPKjlU5PBqoH+e05rS3FLqEJjmFiwZpaGlBwAT1pA== 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=pEILlyXBu1Md68YxNQlnoHr1s9yJS9TfGwbovm19zQU=; b=nxFchDLaSmJqW/W9gyzJbuidDC72hGy98f3dXvZoEmE59z7W3hm4g84YwoPApdGRtkpkN+/qVpcd4vxWZqYl511GC9T10J40y/gzbBJRz3Qy7CmMyfp1PUV2zJJvh3ixg73vC2tGRFnm8AK+qb2LqbXUMx2Q7Kcr8G3pfnOw+MqHYASpT1K/nipI0qJEH1vSrVHm2apGt/tcTP1Rr4L7EJzPZedzqIHiRn32fztqGeyksPFZDtkIr23W9mwInFj6goPmM+HFaezNR2voSFl7HMnradEoi0tG/krFwLsuPpOlaVjfQNIkaTq+fO2NrBj6i57vTQJRCT+suD3FjHewAQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB6480.eurprd01.prod.exchangelabs.com (2603:10a6:800:144::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 23:28:42 +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; Thu, 28 Apr 2022 23:28:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:17 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [raKz7uonC2Q0Yb5LEAQ1FxkNHCdCrHtN] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7bf7977-b0dd-449c-211c-08da296ed4ff X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xM1j6NE4OyKrpbcauKmOeU36pSsrpY/4FEdfEZ83Dr4mHa+6Z/FNeSOrFbdYeGTEld3EKdWNUAu5BaKQkReRwhD/U7mfYgGSiZ4j/nMqCeKmJWqYLIgSNvP/xFNSFspW3LjU49KR9BIfUME4fn6aEdAJnbO1Q9AngUWfmyRsNeKMaV1qj0hAmG01TEBi3j2/jWbOwtlgGmQvs3KtWTKT+6++PcxHGMsZjGcwmuxPW6JVn4NDnikpMnShBVd+A4WW3N2k1oWI89avmKfCsw8/k4XGsADHehVW+GEg4SVGzw3aDXO8/6rFw0UloXYD+kTLa20U+q49qNt3BoLnU8w7FKCyZgyuP9Wp46FdGTQ2ehbVgGDGmuEJn8HbXVP+0CT+YskXvQ5UyPk+fidZYRiocc6kvVKxHJAj3Cs/Jj3WO/ekpDRrz3oSk3o/9EJ4pONoWRsDsmNBjpBuKo0H+WooqXA0u6Zic85YActNa8gzwtkxUAOq1ZH/j0hMoQYojNdz9J4uR68OGtGeA5dfmCEoMeLdoRTYMqEZymRZ41ujENFy6CXipT/mA4PuHmtmGFRCxboEW68VD1P1lj5LqTaXBnuvpn+rLcP+WTz0gUaHwFSH/6RuOQ0s8LpoqnYNcm+GtSmEjPltNGCtNaAXMdCHTzx6lrzfZuj55KYmuhJvwotOyz43p/EgeQQUqhIWlHJKmd0VVP/ELJzVT3XvAOWX82SQVMLYECXdCCQ9U5QUzM2kU= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +BbV5fZSSDFLNHIxazTbEnQ5EtsRB3AI3Pmnj6kUGM33wyBFngA/rH1xoUxQgKwhwf7eKDKma6TVGE546VF2R5KC741IHKNjudjkwt0YdAHGSzzWdqi6Kx5g5YFQ+TX9Uzbw6XhagPVjcorzuxkWiXzs5OFEfQonjtCyCZQnjzpo7gzzDEKd5716b4WSytkuSVA1lIWtzWbvBQL+1OWNn0riYccJ6mamVMKYVWqPB+wkrS2hidohu8gjXwejY5SW42XSvy70CQfoosPQ5Yn1jTU9U0m1cYfPfp6Ldde1StG2UD0nOCVf254+27Q53wBLr07oYC8+Z6RkmaMoQvsaQU7q1m2fhWEO2b8P25BH8ZnMRYJupjnpf1Mrx5TaYOMnfSsPFkbFj8DqAtXNJBPzhmEHfMKiekYHT2/OhF6s/IoyaZLfzFP7lxinkHNgpyw8AJIe3yCpdD9uHX7oKZYaRA+qGT9+uKB868SQH4qNG+FyY1fMUQ+9U2XyERkueN/LS6UGOesaGreoiXsEjgBJYHue5iI9+ozH0CCd0gt/kIUEf5Bvu1aXkoiUfhBgL2UCe3VSNA8SxaruKVEPcN5ouA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gMnR2Q8T5jiQDBkrYT4xKxnnixvpujdA9CH80sxALUkehDVkDjL+XENueSMz/mQQA9hvdeksqTcUXNM/y9fpXoByPGZ6oMqU0I1rWTslrIthDODyh0Wm86S9nCOUIuPywpyHloozK2qfuUOn+xq1VsmRB0aGlnc7fn1cVcxoPYQx0J6cdBmQ9J0RnHhk8NTx8x7Lsf//TuYFKFgt2ajeXDVHXpBcJY+Gy50WoBGT2j/G+pNnCUkRM4V554Da899pBzNxVkbydOjg/shdcLMjwMmrWV6WY/qC0yaqf586Bd8V95gyiNO6ABKVrxISKE4K+TQK2BCaAwd9DXABLNasSq7M+EYF039p74koR+tf3/QNi9+756sn8k0yqpHne4PRJiRmQobK0oxMWXiCZzy+bNamRaa458nimmyekcJfehwN4tqnj3D01bzV4d8+jqBuEiJAMlAlTuAVs1f55G1i6SFo+4/Y0gTAjI8Pf96ZuauviKc4RPOJyfd6PABJ0Y/UFZZd72VoJMbe5kkYXbyNgCFvWB2M/zcjxoeGEk63vdF7Ntlj2YGOiwqDArmkwMe1mOils79hHtecHsXHflrN0tXTeJ6Ky1Pt/UEyo/aFA59LqybmRHa7LGkovpy1eUCTfcobnH5R1yyXA9O41Bs803XdVFmW3YuVaodmy59siyhs+ybHdgkV0gBlgKqIJiFwHBzqRVVor6xoLxlDBXf5Z8LgBo7M8L40MCVzrrxBwIleEZPyj9IhL657O3N1H2bsGxoCScp0e0eVAmNecHVBOF8oI9yQVQ4fkkS+lt11Kswq5++Kb3h50ob4s8D/YVvxSdTmYRYJzkS4XKvVxPpgMy7AzJZm9kFqnR4B1nam8cMaFm0rQ0LPQFjxbxzw+Fp56Q5uplu58BhnpNEs/33O9woMIt/ya7xa9diw4tEwlGAf7VLiK/xJ83mVCbYQa5dMY9+loP3bXG6+k/+m6T1F6dh9XOEcaQwPuatrb+CLDD2bkJh7Pv8D9aznXp4jaNc7T2DhWbZQTU635LeYHv2S16Cxx6mxVRS19V8vqo6qFgcAkJVWz8wb8WIPfCxG7fRdfRr5gPxyte7jJDwwVmp3+aCZWdquSTM2eBtuN59Ny1j/0IOw0mIZHBhYtHGAqSkU0tAkQGoHqIT8lKdbUx9QBHYFLbcbrCkkaWgJDJuf2UMqitsUDWfL8nShSFl/4JcC76N70TXjr4Umb+8L0P2y+Utk/YGFIUq026U1gZ3+CTkzy/tF08E+I6OccCh6wQfNRl0C5y6svUWu4pqBJIuNz7ItON60Q0P3H0Hz5ZUXhT0SeKUveTH9AXpU31IMRBn0iAmNQD+6ZV8UXAfh04mzXh4zqRMF44IIXy+lOJxAGwoNXf9ttdTKrbm4hM4eDqRvkaeqp5DivAJmyUq4CNiD4WGW+7X3MX80yvXanZmqw6731Mxf7V3/uPiJaqA8nspW X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7bf7977-b0dd-449c-211c-08da296ed4ff X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:42.5321 (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: VI1PR01MB6480 Subject: [FFmpeg-devel] [PATCH 06/13] fate/vbn, tests/fate-run: Delete intermediate VBN-files after 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: 3L81flccO6eg Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 22 ++++++++++++++++++---- tests/fate/vbn.mak | 24 ++---------------------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index a96ff049b0..3c62246c8a 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -393,16 +393,30 @@ cmp_metadata(){ } refcmp_metadata_files(){ - refcmp=$1 - pixfmt=$2 - file1=$3 - file2=$4 + file1=$1 + file2=$2 + refcmp=$3 + pixfmt=$4 fuzz=${5:-0.001} ffmpeg -auto_conversion_filters $FLAGS -i $file1 $FLAGS -i $file2 $ENC_OPTS \ -lavfi "[0:v]format=${pixfmt}[v0];[1:v]format=${pixfmt}[v1];[v0][v1]${refcmp},metadata=print:file=-" \ -f null /dev/null | awk -v ref=${ref} -v fuzz=${fuzz} -f ${base}/refcmp-metadata.awk - } +refcmp_metadata_transcode(){ + srcfile=$1 + enc_opt=$2 + enc_fmt=$3 + enc_ext=$4 + shift 4 + encfile="${outdir}/${test}.${enc_ext}" + cleanfiles="$cleanfiles $encfile" + tsrcfile=$(target_path $srcfile) + tencfile=$(target_path $encfile) + ffmpeg $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS -y -f $enc_fmt $tencfile || return + refcmp_metadata_files $tencfile $tsrcfile "$@" +} + pixfmt_conversion(){ conversion="${test#pixfmt-}" outdir="tests/data/pixfmt" diff --git a/tests/fate/vbn.mak b/tests/fate/vbn.mak index 6c3fe82c99..91ce3c9639 100644 --- a/tests/fate/vbn.mak +++ b/tests/fate/vbn.mak @@ -2,34 +2,14 @@ fate-vbn-%: VBN_FILE = tests/data/$(subst fate-vbn-,,$(@)).vbn fate-vbn-%: PIX_FMT = rgba fate-vbn-raw-rgb24: PIX_FMT = rgb24 fate-vbn-%: SRC = $(TARGET_SAMPLES)/png1/lena-$(PIX_FMT).png -fate-vbn-%: CMD = refcmp_metadata_files psnr $(PIX_FMT) $(VBN_FILE) $(SRC) - -fate-vbn-dxt1: tests/data/dxt1.vbn -fate-vbn-dxt5: tests/data/dxt5.vbn -fate-vbn-raw-rgba: tests/data/raw-rgba.vbn -fate-vbn-raw-rgb24: tests/data/raw-rgb24.vbn +fate-vbn-%: ENC_OPTS = -c:v vbn -format $(word 3,$(subst -, ,$(@))) +fate-vbn-%: CMD = refcmp_metadata_transcode "$(SRC)" "$(ENC_OPTS)" image2 vbn psnr $(PIX_FMT) FATE_VBN += fate-vbn-dxt1 FATE_VBN += fate-vbn-dxt5 FATE_VBN += fate-vbn-raw-rgba FATE_VBN += fate-vbn-raw-rgb24 -tests/data/dxt1.vbn: TAG = GEN -tests/data/dxt1.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format dxt1 $(TARGET_PATH)/$@ -y 2>/dev/null - -tests/data/dxt5.vbn: TAG = GEN -tests/data/dxt5.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format dxt5 $(TARGET_PATH)/$@ -y 2>/dev/null - -tests/data/raw-rgba.vbn: TAG = GEN -tests/data/raw-rgba.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format raw $(TARGET_PATH)/$@ -y 2>/dev/null - -tests/data/raw-rgb24.vbn: TAG = GEN -tests/data/raw-rgb24.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgb24.png -nostdin -c:v vbn -format raw $(TARGET_PATH)/$@ -y 2>/dev/null - FATE_VBN-$(call ENCDEC2, VBN, WRAPPED_AVFRAME PNG, IMAGE2, \ PSNR_FILTER METADATA_FILTER SCALE_FILTER \ NULL_MUXER PIPE_PROTOCOL) += $(FATE_VBN) From patchwork Thu Apr 28 23:28:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35486 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp235053pzh; Thu, 28 Apr 2022 16:29:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx36mAmMH2IIP2Iv+qoFxmTesme+fRq+Pi4rvAKr4fCeATbAAG3klW/2kofC11tKNvwiFWm X-Received: by 2002:a17:907:c0c:b0:6f3:8667:9be4 with SMTP id ga12-20020a1709070c0c00b006f386679be4mr25339542ejc.325.1651188570471; Thu, 28 Apr 2022 16:29:30 -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 a12-20020a50858c000000b0041d76c3b505si4741570edh.566.2022.04.28.16.29.30; Thu, 28 Apr 2022 16:29:30 -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=mr9jXF+s; 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 C988468B2EF; Fri, 29 Apr 2022 02:28:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E33F68B2C2 for ; Fri, 29 Apr 2022 02:28:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G/HcdUFzNUmBllZmpmdIHrMRbJx36AVcZbu5NOkIXs2IXvwlbSoO7o0+DJIbNUSKbdWT8YTFlizpwdSO7Pq4PyZyFQ3E7CgA5fQk3pWLdhha7aAjKMBi9P5JFM4+IAJgvA1NQuuLWHR1dpfLKw1ChzLl0YjTFns/BAQ89TlBHl0bUE06U7brguv0KBxeC2RdCGryvfuJPdcRAaE2OxuGgDT+rZv3mECXB2r4vTa5GPmRN58BkTjSdO/8qbsStmGsJzMs07NuGqHt+FHcuD0yTuwo4FCxJeU9UucxiMYKv2N17njahzmpPXKp0VY1WMq8oTamkweX2Frp3bqwG0Qw2w== 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=sseBa/LXmbsCGn7u0YfyA161cGw8aXz6s9L3Olc4a0w=; b=ft5hfKFwn6C70sK2TA9q6kVw7zwEne0u2f5Y6wEaQ9sZesuqMVdWHRaYf3/DwhHj+8IC6MJ/S9trswWtcPk/Cf9mRIqSXtOSaQvDufLvfmqdzVquJ09jfksB9YaWf3qM5e8SH/BtARGGNVLRZV7JkVDTPpFfFtVXwU7G6RMRfOtmJniT1pMh9utmJAPaqMSTvGgGac/qttlJO7FCl7UtbFBpFsnAyFFo5vz++xkmn+sMcu2y+JFTdZ7lP0sWRWYOHb0IorG2Jk8oLIIWf0tYjSovTRfq4fcbvpDAeFBzUNgKiBy0hWq2o2N3a4kAyAt3kwpNoWi9YtoD55KAaQRVcg== 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=sseBa/LXmbsCGn7u0YfyA161cGw8aXz6s9L3Olc4a0w=; b=mr9jXF+szjzIBIZLNrMHh4VjlBokTQuMqqtI1c/IrTOci06HXDSl3o7rr8OknzvwXnF1adPiUD7bfERHxLZGGtofMS8ATN0un8BcT4YQknWuUhCB3BCbZKgTGONheZsWp5usY4ho4ppkTzWUJoFq9rsjAhzIlblfIAYI7pDGdI2cOiYjoF/+p284fckyNjzy3smBs4b0rw+Zsz56NDADYGPgIqrUtvm5VNzOGLYlWr6qJjIBVRqSjXBMRQXM8nm8eg12410FDlhb+y5x6joSzwy/id6ZrlbGhmjJZ2TxBgbTwrahIMg+M6Wgtrog0ntHP418fZnwPtOtSl6/JgoN7A== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB6480.eurprd01.prod.exchangelabs.com (2603:10a6:800:144::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 23:28: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.021; Thu, 28 Apr 2022 23:28:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:18 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ii5RxgyQImLSuI6vdgoQZ+6IE2TiNok5] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 103c2088-757b-4dfb-ad75-08da296ed5b6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xMQ5ds9w9vsbSNS7vmQk10d8ERvS7+Pqc6xAnoE45z/iUKlRk3AEihhHTPMnGu6gYGhvF70lVq12bJIZ5QaeciRZzMDWyo/8tFK6s32aQ6R2yNGZFB39lFVj93IERxPQchYx5Lsl3opXH/W226uhSUBUVbzTHO3g6pc7MMcabP08ZltuTQKB96mgp/G4aTOoEi3Oz9YJ5vUfPSEjrigKrdRuYC31Zvz+f1UQI9O0BYAFg/L3uaVNI1z+mm7wGtWK8hxlXUqyOdKy8XaXfWdnwugmMv/DhhfJOX28mS+IZoSucUQJRuwm0c1yc/ZGbFuQmrZyHUn2f6wjbylIG+Zn9qmuldVhAmayIxMTtr21xv60QL734AoSzB1BgmG+ElWcsfoQ+kho+R6wgg4W99DNS8mHlgmo+52+mwB0IANnK52lueE3KfxvN/OOsEB80LhXitGNNA0Ab4TMA4N/Wq/eVTEMQFrhckJWRFeiRJAGk8YuVf8+oJM5Ajv6Q14mlcf3D/CxHKQCezP7GedNonxw60V4jLj1NEJbbkIcOuKGzAeniUYU4e7AAMJDXz45xpXSyuNZ/MWAeQBZr4FTPoIzrnVlXBTYq+/HKvDpYCcAfAdIFfZWi9kW/V0nWbegu3+r/zuuHnZ+Ln/W3B2ZcIFL7P1wOM5Ywnhrjm0jfUwyCVHJ4QSFqvWXXMvKZ+LNwddsxA4ftzQ0VM6TubYF4ixPJp2H6c1jDCdQ/ZvB730e0/t4I= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MRnWd9hYkk1iKJ4syAc3nlIqoa3AVNhnb/zI3MKIGW9x6owCLImcce5NrgHN0dNDcrniAyCrtBbqSYIUIYGWGbMUaf4eZKpNH9aBSIWzDqGwncM+5390Xq9PvH6djX4dOEDpxaR7pM01oeTZgjXqGXKSvHDBfuEuHruPRk+zfNTVtOUAgU/hGOzvsymaYN+eMMs9HLkK9LzytM2eRQ0cUopCjvV5g24I2BOceC4CBEckYRekZnCpws08BsfihE8EXqLnrYjnSm6S4Fd2Gda29Xc/EvTi5oiogMpvZHWkLcW/BT8sXYorIULIVy9T8oeA1UrR9UlxxkmU0Pzje6hMjTnUbb2MGmKz5VQZL8PorogwAKr+hnNhFFkPFNJp8oKq3SDOrRiq0LrldYzHHaXf6xMpDVhjb6IsSnUp7F39k1F4mBA+QUoUvRSRYrokd70TiQw6WQiWmY+HCOS8/oKL1B/0P1MzgqNP0/MJwtkTWG6RX1ZuCsPUXUNmh0nTfXDsCI+VzbtzQ8i60XntZMq6SC7c1ZMnTubVSs8fhHjgdamUIhOqVNmjtlmHcARCie2o1GGz6QlSOfHAnZR2NxJg3A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JvM7HIxzyOwMpzLfJXl6/qF6pQcKOJKBXEktjeFeXEnSYYvc5gZVP7mlFqyKexITkC1stRbKB53BnLV1FTrGkeBq9IcuaE7EEp3IE2NO2hvGdgZ9GJ35eCY2OtV9846nOM+LaPD7mxazyYP9wOzAg60tiAJryPrgF9sVh9tbgjisYiaS5EabSuv6xG3yVFI82TUgY4Nghxzn3Uvvr+xLYtUM01rsPetS8k/6Ha4WyaBODprGA0Y4catA/7pj47yD4h6QER74w4DxOzcR2aC4Lxyxh3LP7Spw2B+BqLukZSEwNe3pyLU5KPs27ivElxgsXfC5iaTDwS0537QR8M6VSSEw3UJamnu8BYtpNfaddR7IUlDfB/myXQTSebYS2NT80Z79sVOkpxbNqeBH6k6eGZdEFxkLrFu6ePn2wMkuGkh+/60JItta36441V4wAfn+e3lVBx8P6opTaPrYvMs2j4dURb+UsqbQj9/54XRhgMwD2J4fIRyouZjA1GQblUK9f8V87HtQyXNpMmH3lZaBb8Goc5UF3MY7osrER0JZhp0GZmYUgMEdUcTFQEWaNtAK8Z061YBV1hywjULYYqYMpEOSUoN7DJ2CDsJZSf25h0hJKNxasvUFFTJnhlDL/NmhCn1otjv30YUTVd33fX5heqJg6f8eDYrPR801sV67hVVx8hUfpBu7A4Fb1UegZ/JnaQcizlwTfsie0DkNTHRvKoik8rf/XBlnNZj84UUQdLzvQFgU5Ydo4GiZ45/uyEtMUxCRSv0/F2p9SGUo1wyrsDTP6FYYW5FZwXJIdBguSVHmunREN3Wf4nh5Mlh5osdqKBEyjRcG88i5/s0UoCIiobzXKKv/7dBP2rcKFRQWK+lGWrT3Z2BXsBoNzecSPKXDLXhCjyi0l/DdtgueDAhF3ga07L07Eo1OggS73/HN9Z4j4NG97ZpV89x+XAF1JZQuRxT2ysTn/aifBuCOVtQlPMTd+2OPhsKzZRi7APHsKCB6SY8Jhf7xdJCYB0rBP3lKTghrv0L8VonQKe3rt7cKMggwg2bdHWvBQ9Fj6QgmAnbh+QaBse61JkBRRfOzUinqTVtveDFU9AQnTkqaGYltfoS4HAarl+RzUPJhc5w58FBBCJSHI2zbPgOJ4QTn3V40Ar1cxARjnbEEJfhkiYAnudqiMJuXOS3SdD9gpamWV7kC0mgagb+iShT4oLJGFhnK1qmk+yw50PcPDt9rY/Ok8SQbBKkISu4OUURee1oz8EVB8KmZ+vx4RM6qWeIVUlDh0uQc3lH5D9KSbIWAU0IEk6dNB2XDSx6DyGxGOkOJJsutztd842oHxWaGhP2zSwedRcXtYZgDiI8APsgxB1FOQ4T3OJMlKUlx6zSq3SXPssuliruiuqxumu62r5UW5iVq0Tn3Kq+8iMOlsRX1w4xRzM2fKWvbrSLwhbUfrDABMyxV6qf+jxM+cVKgypIr2iYi X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 103c2088-757b-4dfb-ad75-08da296ed5b6 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:43.8599 (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: VI1PR01MB6480 Subject: [FFmpeg-devel] [PATCH 07/13] fate/vpx: Remove unnecessary eval 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: fsWgBUoUZqFg Possible since ca96e337169093979d7c763064ad9dae12b3108c and ef8c93e2f18c624d0c266687e43ab99af7921dd3. Signed-off-by: Andreas Rheinhardt --- tests/fate/vpx.mak | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 990d4e5adb..a59971b092 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -85,26 +85,22 @@ fate-vp7: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 define FATE_VP8_SUITE -FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-test-vector$(2)-$(1) -fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf -fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1) +FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-test-vector-$(1) +fate-vp8-test-vector-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf +fate-vp8-test-vector-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1) endef -define FATE_VP8_FULL -$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) +$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N)))) # FIXME this file contains two frames with identical timestamps, # so ffmpeg drops one of them -FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-sign-bias$(1) -fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf -fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias +FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-sign-bias +fate-vp8-sign-bias: CMD = framemd5 -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf +fate-vp8-sign-bias: REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias -FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-size-change$(1) -fate-vp8-size-change$(1): CMD = framemd5 $(2) -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear -fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change -endef - -$(eval $(call FATE_VP8_FULL)) +FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-size-change +fate-vp8-size-change: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear +fate-vp8-size-change: REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change FATE_SAMPLES_AVCONV += $(FATE_VP8-yes) fate-vp8: $(FATE_VP8-yes) @@ -131,7 +127,6 @@ VP9_SIZE_B = 196 198 200 202 208 210 224 226 VP9_CHROMA_SUBSAMPLE = 422 440 444 VP9_HIGH_BITDEPTH = 10 12 -define FATE_VP9_FULL $(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q)))) $(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP)))) $(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H)))))) @@ -153,9 +148,7 @@ $(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo)) $(eval $(call FATE_VP9_SUITE,tiling-pedestrian)) $(eval $(call FATE_VP9_SUITE,trac3849)) $(eval $(call FATE_VP9_SUITE,trac4359)) -endef -$(eval $(call FATE_VP9_FULL)) FATE_VP9-$(CONFIG_IVF_DEMUXER) += fate-vp9-05-resize fate-vp9-05-resize: CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-05-resize.ivf -s 352x288 -sws_flags bitexact+bilinear fate-vp9-05-resize: REF = $(SRC_PATH)/tests/ref/fate/vp9-05-resize From patchwork Thu Apr 28 23:28:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35487 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp235108pzh; Thu, 28 Apr 2022 16:29:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHAquJbLtgBhlc+fbJUHr7SCisSsCCcNSn1ejkwxCW6J+ziUp7EkU6hNcDagmCWlCkgOXX X-Received: by 2002:a50:9f06:0:b0:425:c1ba:5037 with SMTP id b6-20020a509f06000000b00425c1ba5037mr35558778edf.285.1651188579970; Thu, 28 Apr 2022 16:29:39 -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 kl6-20020a170907994600b006e80a81a548si5016216ejc.832.2022.04.28.16.29.39; Thu, 28 Apr 2022 16:29:39 -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=rhcHUHOG; 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 CA44F68B2C2; Fri, 29 Apr 2022 02:28:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC11F68B2C7 for ; Fri, 29 Apr 2022 02:28:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VPa4MJJrlwpa7/4uJTlg01Uvk93N2Tk4zoBKgo8TFhqqDvdpt+yhy00VmRco0iKpgMqE2Wlza3TymuOx1H33NjyxMDHi1xHgKliw1vUcd5nurRNyrC8W16I4040qQIpL2dKwRSUquH3ZSIfEZyLwsM0+raZepvJOOfr9jf9HIE432aJUTTLlvhACqWLUDesjDF/7B1MhRuI+xUFYr3fT+TO3gVHCvLxeZirwatASnlmRuK3JQ54gQ74t/s198Ke8EBDvHfih061b4ceY+RBR33dGh85wbVE67JMtZm6JkT2ACNjW9MNMPLV9mX+aVjHUP3mHI5CmK+QYJHAlKkqXGA== 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=1uoeD6156ehIoJ0vzSJynn/wkV2mLhNVBzJk2gLjhjY=; b=JZ4rXO27Z7b4GWu4vaa2PlidXEe7j7nEBZbk4ipB9BVVyfJSedjC6sceyfKXyV5VAifhHbpspqGFSQiCpfnPqP0fmJffvhDrVMiaDHMoIX4+DxuSO+3H4WJlyuWINxcTr55AAdXae84/K3sbET9SLBOAFhYHxRu1sxvSJKahPYtBfWf0jkIeAWCr2u7QW1GIINnvwtsxGJJPxHq1qWcXaSMGoM+Vx3R2uoqt8KwkaydRtFR27EMQktc35pLPQtpM0O+wwvqbYxAtKXzVIDEQ0MPrfjocLWMTWvbs8poldBkCD4XqqTKFH7pvKERiVTvJwSz20OG5pcovB2JidjRA1Q== 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=1uoeD6156ehIoJ0vzSJynn/wkV2mLhNVBzJk2gLjhjY=; b=rhcHUHOGfvQ1JW4i+biL/Yk0Lk4UsCkkJ+eePxbn6tNYe9GxogfVGQmPfvR/O/QPZ9hzt01FNpq5aqtvU3tVpUIyItWQw6E/APYwNvnKggrBUiPjAySh4rQGafMiuT4HLyWElcoHZc7e1u//3L2BV1UL6fgmdsQLu7YZjRRkvPC4rRelGm2u2/KSgPYpaQTyanw3x3fb/XHf37M7Tuq50nrsao74olltDBnx72NWQAddj9I1/hyWV/2KXsS8+PtNocsO10nf8RzKLsuM/E0wb48wkjgdaE+tHynBSikizE0X18mHqsanT3Hy61uH/POALRRQ5+S98Yj2Ha8GxsdpPQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB6480.eurprd01.prod.exchangelabs.com (2603:10a6:800:144::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 23:28: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.021; Thu, 28 Apr 2022 23:28:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:19 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [2Ji/l92lL1z8biufILbAq8RzTSHoa1C4] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 55613df4-768a-4500-898f-08da296ed6a0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xMUSi26AWAi270cqp9SI3BlyOZx+Q96uf4KH27Qs0tMlIjYeiDqE15kdn8xIZ8lrLU5av5lAwITJE5Z1YL3BuFhchLKpndIEByfWNagqqahAcQc32eVhKAe7hMzF0d7kYP0swBOrA6SEk80IM6b+dF5pKJwoEQLqiFb61aX0XkcMvAkJrVk1o6EkSzbO/9MU5OQiysOdAzqaW4y7HZQ8CJX2cPnb6cc3s8SdeYZwY/8Oz+rn22IQOihMRry1mK+SYFJ7IyqgGq53nhQRCb4/RH3PBBLap0qZ706d610Za7s1vxqoT/KcO6fhPKtHf6Oso7GmC320zVITRYfTA6LG2gxlEN3DYFWtie6ygQ7/Ot0gFxKKTXfnyYNFrmzk1Bzz1D6dcm2P9W2FUPwPG/o5yOFlrTOtgf9swIOL9ekmqpoRMWPUgd2C0kHa29YhkB/s6JaWT9tfc3Pp9vt4Y8zfIAkVZqkECdIZ7uzd/lNGea46ZNh0UPoj01kt+6lLZ6hpxNhYxacZ8Cw9UNjr9mvp5ZDK6TAYcfXenTCPcXj1llppBuyZs34S6OeG3jwfkoq2FLJTNUpheu2IMD2+olkVQg55p0zBw8VIChqHpvVI8ABgiRmPCZBL0CJH9MBeB12TkoZdjeqdJtCx7CiYW1Gnh9bB901c3rz+mfuKukqUd1ph+489WU1DYoPig+kwGoyKrzy6u5jZJLLfNvl/+AK2qopZSUsE1PqFOHHeqm1al5zvQ= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KreLyfKn7ufbM2MgbCkOtMa6ZcvGj0DrcqDe7EnINxGYs6mYaOQ/S4mASkoMf18kjG8wkyHH8291R4W045dvsrBKWeRWM2g53K+Ef4zXqyH32KfBih6psCElp+XW3wppDz+EgP5r1jnsva+oGLLyWm/A5uv+3ocxpt3DPQ4+oRqWngZpa/CCQIMyBOAwI08Ft8OBIBUvz125M74hltBRUvlZVVM0lMEG6Sc3+qXPeqIWr46xCxjPNM2jkSLwH6Z+HbRYRNA01zBqGDqI/5h6cGBJX6QTjhjpeC45q4Nl90bhJd6uHbfLTmRcNQQbnVd3VsISEwhcgUM7zJi4jDdpa7b4tWKEVwsrJrEqMQhkVxIt2SoZVyiqjPq0bdJ8ZU03n3VmaU7hII1iSYk1NK3b07gP1m5leltPhwH7gNx7vYwPJeeYtiWQtvhJLZ3f74SM9/eba7DG2JfX2H63WI0fBI5gaiIQnLoIiYGUrRiJyM+duqLlbEpj6z4jZWB8ZTCtxalxGqZTSH15UflhJAAJuYlfcjXwcHPxmhklUe1/Zx3Ek5X2oF+OfyxKLlzkqdSpSz/4XgyCcDyeEj9ClLTyVQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Kov8grzIk83t2dcb9v/2DEjl6FCgh8KKXguGGYqbBaKo7Em/ZiWzqvFYjGOZ03l25y4ug51SpOhCfJjR8jEczrXFWFRlkFxIN0U7O91kk8qDyZaC+BmnIc+R7q+Xa3ZlPf2Lsx0HTD9PGMc26gSSTz88fF1oghI+RzLfKByBrz0HtpAWXqWTjUljiMQ6q5wDoDyugzOlI6lppM6DJBn2OF6DBbY/iAipNjb+C46fh78drDqpn6GlL2Qb+OPep4SNGX2STLYTXKLmeJGlyXLcbMGKsv8qL+O+CUMS8VOvo6hX9IohKP1ym1l48T9DlgSZOo/faZIWd9DHoUvcVSMNyZ7uZqq+xOIdRxfc+IuOy1dYXMG5SleHUMyREuK5bbGyceDrr1K1MuJJ2rH7FVUpmzpnE/8+AbVhkcdX9/SUfWkV7pu/ADcJM/RHSbaZ9VMe93Xqk91/K7G4xap5/+Aii7pUBW0E1f8mB+qFC6suK08zZBkf0c3J3iAP4lOvgV+J7QcrSYXu3mVsmR73eOuLxyaLys1G+K//aCSVEEZ3exy8+rFkim0JufUKLF6HhXjMNn+MhBdvijowiLh4a8W2ZgMhNR5rr2CDPwrjRLQ15TtPlWP7RDKFwzmK/98Jf+0Vrf8yjL3YnYH4TEKvAWXVVUWPGUHIVU1AUJSlTagjbQrghFgjLcOVk9DeVEsJJc8xF1xgG2yU8X1UX3jNAfIiVzDE9zs0P8uWGXEXhgWwtlcJMB9S9rhxq8CaSkjpm2fZtHfXxkAhlrAmyi5RnJlTDNvejW8ucy4crfA7ZPQdwD2mjEGSg4vplAudpTkdDGw1tkazDSOxRUdjK46BFdXb6sTPgx3adSsbp3/myRzFHNGZCv4ZDbOVTTSElmX9xToD4s6BvTG8C3/0yeAj7fS3oWS6QmYRN04rilOMdRSdFFRM6yTqHX952qFQnh6hFf2eFc1pkmVnZ4x+sdy/sOpGapmLG6kiDNBUPg2mtef7RD+g/d3OvCL4Koc41NMtyeQpAm7MOgFuR05gKjCqfaCl2V2JKnSAv4nCXgMyPX2UNUsAvCAoTGPMerAP/fxSU/JhZQ9dONjwFbpXmmyBNgHzb3id47Ppsj7MRWg7GjktXkoZZOObMar8bd9guJKTEB1u5WE2t4PCtvQGBpVVx8ZzOyptFjwo+DjVL00S2wkVol3gvAhzxB5MAy+fk27a0tuO/Kr/fozGzNBijS3ChkaFdKU92LKJ622M8qckvdtkh1iaEx8Pa0oizPu00xK71Zm6J4jedUbwOHxgTFX4rk77ofbjzc7eJuzHs7+8NH6T+RtLQqvsmjF7dkwhrS/5CJyFqEpiVqE3ZqcNHLDe4dhBYHJRUcg5jx3xHIEl1PddgPr1O1nxQe8tdS7RD3SXL3KqtXWks25AuprpdG5E+XeuGxS83+XUbKKGopG2WYboFMWN1jHrHtTK1/vUXu85x7gB X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55613df4-768a-4500-898f-08da296ed6a0 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:45.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: VI1PR01MB6480 Subject: [FFmpeg-devel] [PATCH 08/13] tests/Makefile: Add FRAMEMD5 auxiliary 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: AIYVkVn3iiSV Similar to FRAMECRC for framecrc tests. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index 6e8fc5906e..b4252a991b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -88,6 +88,10 @@ 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)) + +FRAMEMD5 = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ + PCM_S16LE_ENCODER RAWVIDEO_ENCODER FRAMEMD5_MUXER \ + PIPE_PROTOCOL FILE_PROTOCOL) FRAMECRC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ PCM_S16LE_ENCODER RAWVIDEO_ENCODER FRAMECRC_MUXER \ PIPE_PROTOCOL FILE_PROTOCOL) From patchwork Thu Apr 28 23:28:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35488 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp235160pzh; Thu, 28 Apr 2022 16:29:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKR7ly36OLUYQo9YkxSyx9BkClFbqWeSMv4N//A0RN4EOOFnoNND9gvARkzLHVmKpT05g3 X-Received: by 2002:a05:6402:6d9:b0:425:e968:725b with SMTP id n25-20020a05640206d900b00425e968725bmr23850390edy.213.1651188589330; Thu, 28 Apr 2022 16:29: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 u8-20020a1709067d0800b006f3a83e2606si5149224ejo.125.2022.04.28.16.29.49; Thu, 28 Apr 2022 16:29: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="c1EZEoR/"; 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 C4AE768B353; Fri, 29 Apr 2022 02:28:59 +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-oln040092075108.outbound.protection.outlook.com [40.92.75.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D474968B2C2 for ; Fri, 29 Apr 2022 02:28:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VId47bUyKDJqzn/DG0NLvdgX6fAr9TYMKzM+HDYG1wY+qfHOcRBlJFA1f2BQ93js8ekXFqruxvjaK3+zYS4sTAyXE2AIaUYU/m3gfHAQPUCedviqenLwJ8A0Kac6VXJP6PypoVL4fHPUYbmOLcyeJ/sExKAjOdOoFlLxEKVaruk0aguRbStesnaPVhH9rFTL8FyYJ4QQt1toPI8d0T397NifrbziF4Uoy+/yIa7a0Egf1k7kyaqfsbT9D69QoZUwk7lMTc3OLCbku0EFZxxKsN5prfmlIsM4jrsxlwPjYKIqxN+vP/rLv6Sl9qtKzfEeGxa9Gwgx8QTMdoCs3DlE3Q== 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=uxBiRBz3BZNIedQyujZrL6hZx9X2gsh/i/Vd/szhbL4=; b=hQ24pbm+X4iJqjZ6vukbMGuKKwjInIs6e2rLGR/FAOhUMfd49bEDfvS64IsPxotsVMa8RKWyaVpR60ShqVcT5CtmJmYd/Uj4R3EE7APUrFC//2uU/Bq/f7LT7SPM0YrCv+X+W7xuHJi3rORNFAfnLZO8Zb4UDo4VNS9ZEEz7gNPEuA3dtkSLNlZcIIg5IeS7MwTUTvDmUvImc2QtuZRt3CE/JwDmTSI0VbN/kV/X4renVd7x1SSupmBWxzGSNpu6GFSiUPWdGW8r+EOCWBN84hKFlOJQI+1l3PYowq/JksIbvivrarsoGjp4CVa2V9BURtzKIM6GbWuKicplA7RFIQ== 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=uxBiRBz3BZNIedQyujZrL6hZx9X2gsh/i/Vd/szhbL4=; b=c1EZEoR/EyyujP16uuvIk0rgVAMQJVTeiLf0ARDdWK2QZd5SzHR7xWwf8vYR5FEFNTbzDheVZmCYyUrgrKYOm3nbBjRkxdWjOdL9JDQUKf8pqxabg/pj7K/XEl5P+ln8FicbGvqSdx6A2/1SxF9jUNLquZ4TEjZ3de7RxloymYQzWaaSfxrDQd5zl/RfFKpHWpAaZCKiqOT6BAGSSzID1xOBMtQ5G2xMtYRRaMcgUMTpLrUNexOScLMvbKeBLguMe1f6CWIXO0Kvq4LHASl6Nv0qvYeCUuQw8bhsdDxWH4qV5MSEs1bo/a1jKSPevlPPRb1egvV1o1gHARjTV5osGg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PA4PR01MB9140.eurprd01.prod.exchangelabs.com (2603:10a6:102:27f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 23:28:48 +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; Thu, 28 Apr 2022 23:28:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:20 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Xar78O59Yw04LFIMT7Z72UiGcQkDKzMB] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e386860f-970b-42a4-a0d5-08da296ed868 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xMurPcyEtAbfW4tfTFEceVY4/hQqQ+L1g57OouAXfdW9N4MVT9ZF8jFSu4mtwvxT3VaFDcO6WbjWt3aEcOp8oL903E4smc7lvXLvj6UfshuwNGKE8YEXjRwW3qu8/NJsySSYY0wrnGFE6b+k4bCK/0Ej/EOJzOzWIR5OzoGWIL5gg6HqZQoF0IO0irNHxP6ekj4bHyJVjoseqP52NTCwJxn6AzTc7CgjIkmd5Qg6DzvJxFwzRXYuES3dmiuk7tmCyaNh5M329gjul0lO5RCQxizznLB4x6HXL9F8GOgJtUAgvfdnqdJRfJgloRCqNj1l3yC2m5kaMfkcI18dDJ5AnwL54edfXmdBTt9GFz/DWiYiIN+HfNjOauH6FSSJlQVWQqtsXEfRfjh/5FZx2OVEbXQvz/YfExRc7oZfA4/gGOI/kuASZA9db3ZtK8k/RBVzIqxiUAiMaG5rDlWLK1My8CP3XYo0ITgF0kMIY/V0QTmeujWf0rHV0D+3Aqcs2cqL/xwKQUgBICRBrFyWew1DZwjFlarnbYuRlewQYVvmuc3rBUNy1FWqELzxIEF8B8ikyyBBNYJrd4tJ6JxcWJRv3RZy3ozlotRvDnXy4B5K5Pee/vjiHoNyDEsIruqBLF2gW0Zxvm5g7YfR6Tz68omhGK7eJE9fjFKYGf60lw22hJNW+nxCHeoaPbekCYFwfaG07/nAXBjaAyT8dHiNNXNw/IlmnUnSglcdFTf1n59EwJ2rE= X-MS-TrafficTypeDiagnostic: PA4PR01MB9140:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DKuDv+zbZUIQW2nH5eRyp5gBeKakp6tEUGSHJeExSDw/28T4nTbRyaeHvEmqCwotbgArGYOO+1Azw5UApmxOl6SEuvcphWprFa8l7UxmWHJDlmI0Q9EsQnHrwveIKekVJngAJ/EXhsGyqy+PIh/ECMbY2/bvG6pkX+BUP4+jpNVRLXibHNz1K7mp9Ecnd8dEOBE42uKLStXStJg7nvuqANKRMxA0enrdF6HmrZr9cbHH5G/uRgUit/jJgNwon+x1nv8AHTRvmkZmMJNk+wORCwPcEMOOphrJVt3CIRExMezRpgvcTF1MA3W7cqjo+DeNgS5glxk1pZsgiUJI6mCFn2yrdTd3RS3Zb5Zvr2TYY/NB9seQSTIJ84O/mdpKW8fvGAfFAqGHV1fWP92OqWyJ7o2Gt8Li3Ja3afRMCFCUVATkbk/Fylw9REV1fc1NJf10THv/vLYtRly0vBtoZ82sUBo/KrcmJygMqsVs2cxs1ONrTl29feSg+1NFoI6cZrnulZlwzCMSUjkmbYZqpQfYOR5A4pZAsP5bYIM+5lc10YrWPPfkwbT1jBlhoYeArFUg9N4b8jVQQ1ldMHlECKIwAg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o5nFl6FecYRnenCqI51ZpSAFHyyyxTIu42Z3PG3RhhvFFsDY+a95Lu6WLop2kBfnjIN0Dy97uhjvUTxI2tbENLnjffikNbSbbmeNeH61jLPEm8Fljxjy5drAVrofIfjaQUXZw0LGBvbRrMGFbp2akdqQMl2gfKik81zYbLQnN8TJwGIaaAWgEzHiZyO3aif3gb+W2v4rQSI+/m7quberFusVIhNmRb2UsjzcyiBSLXY5zGpDtDjzYn7xQCy1U60jNHcct0snHZJ3zMPqwfaH1/wtE5kUqEr2QJo8PiNJR21B5De6e+Gd087gN6LkA3CKrkHlsQ4wAvQ5TM5iDsNzQdTbP78FOgQN1SDNGN/oDeDbVJVmLUJrroqoo6bMJsjo5NGRfStrjJ9RQmHOOLb1ZNynICxqjKtKUoixaZqwAHpQm6ZuBFS/NH9MgdmzFJbHAUSYlyWoAyrIsgYs9QGifLBQKijCBZ6jLuwbBu0P0XR6G1OrLrTTJFT8qFqUGifgA0xcDXQ8vgFpAYU9Ic8z7v91LUN5psHuzJHEXbMKvEzig12hZITI9uf3BT8iw9mhJET4SNkEnPQavfVW2HCFyk4iRS6VUw+nbxu5RUK9gdI5ig8XxzvqgdPggTcipjoCx1MvLzxn8BUyhpKPmq/t5PYiVMn2Krxscs3yKgDYOXHi3LC9bEsLgS0cMpZDVVT+FoJGTTbhhmK26GHI5l7Fp+5j90pWUH1GRdriJkwhWmWzuywQ9bIsNS+Ok0ODR18adSGzmnMOz56gb5eemy2c9blyI7EcdPrijSAm3qRgV76gW1Kd5rMekgD9cpkCNwLgqFmaItHIAxGRTNNbytRnHNIaC0Cppaxw4o0KM+MJCiPhgssaK6vL1Occy3M/O+BKAmVOb7RuF23m4T05ElAUAYrjRQzdvctkQbUkjo4McIQx/n0UnvCmpvVtikixGH8oG0u5VqLVreRaWZnqaJI5CPVb18MA3Df3ozthsnKpFS3VPx3DvoZctMm7VgG6G7o5sz3q5FbZhv0ZZul4Zi+e2UT80tvfFnvX8CGiFnzFm3PHkBZZHy4J7aNkMmM2p+VSG9/QUtzEbC+3V+Emk2Ti7Fh2fKs+iLv9pjcVc5jMfNmT0ZFl8DcmnbGurtyKw34Xy2Hy8GAM3vE1/iwZLB5LdVQ8+k23lhKUoImbjuEn2mFGOKj9yzRUZtt3S14c5/fKgJUxV8a85VfS+ALQOgeSObjNTiQIryG4rdrIlIMoHPQXlMV7OAu5OFiNmGeDud0YuE3fDLXKpxds2xjnj4B4r91147wq6VFzAsOz+cLVuyRiAKV9SjjaMoUKFHr8Blel88V/WMC580SXmCPY+7jfypguvvDw9dsF35mgurNGSh37VnRRal+byF4Ch7Cy2o1qPmX2t+sX4fKFL9Lgay/0TeHVsdP1R2GXb2nNsogF0PhTss+tAJ+ozbDrqezW6aBN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e386860f-970b-42a4-a0d5-08da296ed868 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:48.2426 (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: PA4PR01MB9140 Subject: [FFmpeg-devel] [PATCH 09/13] fate/vpx: 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: mhNdMkoBfgUb Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 2 +- tests/fate/vpx.mak | 68 ++++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index b4252a991b..5de9ad4c9f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -245,7 +245,7 @@ $(FATE_FFMPEG) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMP $(FATE_FFPROBE) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_FFPROBE) $(FATE_SAMPLES_FFMPEG_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF) $(FATE_SAMPLES_FASTSTART): tools/qt-faststart$(EXESUF) -$(FATE_SAMPLES_DUMP_DATA): tools/venc_data_dump$(EXESUF) +$(FATE_SAMPLES_DUMP_DATA) $(FATE_SAMPLES_DUMP_DATA-yes): tools/venc_data_dump$(EXESUF) $(FATE_SAMPLES_SCALE_SLICE): tools/scale_slice_test$(EXESUF) ifdef SAMPLES diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index a59971b092..dc8e9e04b7 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -4,10 +4,10 @@ fate-truemotion1-15: CMD = framecrc -i $(TARGET_SAMPLES)/duck/phant2-940.duk -pi FATE_TRUEMOTION1 += fate-truemotion1-24 fate-truemotion1-24: CMD = framecrc -i $(TARGET_SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an -vf scale -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION1) += $(FATE_TRUEMOTION1) +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION1, SCALE_FILTER) += $(FATE_TRUEMOTION1) fate-truemotion1: $(FATE_TRUEMOTION1) -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION2) += fate-truemotion2 +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION2) += fate-truemotion2 fate-truemotion2: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tm20.avi FATE_TRUEMOTION2RT += fate-truemotion2rt-low @@ -19,73 +19,75 @@ fate-truemotion2rt-mid: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tr20_mid.avi -a FATE_TRUEMOTION2RT += fate-truemotion2rt-high fate-truemotion2rt-high: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tr20_high.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION2RT) += $(FATE_TRUEMOTION2RT) +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION2RT) += $(FATE_TRUEMOTION2RT) fate-truemotion2rt: $(FATE_TRUEMOTION2RT) -FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64 +FATE_VP3-$(call FRAMECRC, MATROSKA, THEORA) += fate-theora-coeff-level64 fate-theora-coeff-level64: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/coeff_level64.mkv -FATE_VP3-$(call DEMDEC, OGG, THEORA) += fate-theora-offset +FATE_VP3-$(call FRAMECRC, OGG, THEORA) += fate-theora-offset fate-theora-offset: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/offset_test.ogv -FATE_VP3-$(call DEMDEC, AVI, VP3) += fate-vp31 +FATE_VP3-$(call FRAMECRC, AVI, VP3) += fate-vp31 fate-vp31: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/vp31.avi FATE_SAMPLES_AVCONV += $(FATE_VP3-yes) fate-vp3: $(FATE_VP3-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP4) += fate-vp4 +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP4) += fate-vp4 fate-vp4: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp4/KTkvw8dg1J8.avi -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5 +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP5) += fate-vp5 fate-vp5: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp5/potter512-400-partial.avi -an -FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp60 +FATE_VP6-$(call FRAMECRC, EA, VP6) += fate-vp60 fate-vp60: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/g36.vp6 -FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp61 +FATE_VP6-$(call FRAMECRC, EA, VP6) += fate-vp61 fate-vp61: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 -FATE_VP6-$(call DEMDEC, MOV, VP6A) += fate-vp6a +FATE_VP6-$(call FRAMECRC, MOV, VP6A) += fate-vp6a fate-vp6a: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov -FATE_VP6-$(call DEMDEC, MOV, VP6A) += fate-vp6a-skip_alpha +FATE_VP6-$(call FRAMECRC, MOV, VP6A) += fate-vp6a-skip_alpha fate-vp6a-skip_alpha: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov -FATE_VP6-$(call DEMDEC, FLV, VP6F) += fate-vp6f +FATE_VP6-$(call FRAMECRC, FLV, VP6F) += fate-vp6f fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-video-streams +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-video-streams fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-audio-streams +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-audio-streams fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-representations +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-representations fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live-bandwidth +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live-bandwidth fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 - -FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-2451 +FATE_VP8-$(call DEMMUX, WEBM_DASH_MANIFEST, WEBM_DASH_MANIFEST, PIPE_PROTOCOL) += $(FATE_WEBM_DASH_MANIFEST) + +FATE_VP8-$(call FRAMECRC, MATROSKA, VP8) += fate-vp8-2451 fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an FATE_SAMPLES_AVCONV += $(FATE_VP6-yes) fate-vp6: $(FATE_VP6-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP7) += fate-vp7 +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP7) += fate-vp7 fate-vp7: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 -frames 30 -an VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 define FATE_VP8_SUITE -FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-test-vector-$(1) +FATE_VP8-$(call FRAMEMD5, IVF, VP8) += fate-vp8-test-vector-$(1) fate-vp8-test-vector-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf fate-vp8-test-vector-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1) endef @@ -94,11 +96,11 @@ $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N)))) # FIXME this file contains two frames with identical timestamps, # so ffmpeg drops one of them -FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-sign-bias +FATE_VP8-$(call FRAMEMD5, IVF, VP8) += fate-vp8-sign-bias fate-vp8-sign-bias: CMD = framemd5 -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf fate-vp8-sign-bias: REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias -FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-size-change +FATE_VP8-$(call FRAMEMD5, MATROSKA, VP8, SCALE_FILTER) += fate-vp8-size-change fate-vp8-size-change: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear fate-vp8-size-change: REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change @@ -106,13 +108,13 @@ FATE_SAMPLES_AVCONV += $(FATE_VP8-yes) fate-vp8: $(FATE_VP8-yes) define FATE_VP9_SUITE -FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9$(2)-$(1) +FATE_VP9-$(call FRAMEMD5, MATROSKA, VP9) += fate-vp9$(2)-$(1) fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-$(1).webm fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1) endef define FATE_VP9_PROFILE_SUITE -FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9p$(2)-$(1) +FATE_VP9-$(call FRAMEMD5, MATROSKA, VP9, $(4)) += fate-vp9p$(2)-$(1) fate-vp9p$(2)-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9$(2)-2-$(1).webm $(3) fate-vp9p$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9p$(2)-$(1) endef @@ -132,9 +134,9 @@ $(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP)) $(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H)))))) $(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H)))))) $(eval $(call FATE_VP9_SUITE,03-deltaq)) -$(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv$(SS),1,))) -$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv420,2,-pix_fmt yuv420p$(BD)le -vf scale))) -$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv$(SS),3,-pix_fmt yuv$(SS)p$(BD)le -vf scale))))) +$(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv$(SS),1,,))) +$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv420,2,-pix_fmt yuv420p$(BD)le -vf scale, SCALE_FILTER))) +$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv$(SS),3,-pix_fmt yuv$(SS)p$(BD)le -vf scale, SCALE_FILTER))))) $(eval $(call FATE_VP9_SUITE,06-bilinear)) $(eval $(call FATE_VP9_SUITE,09-lf_deltas)) $(eval $(call FATE_VP9_SUITE,10-show-existing-frame)) @@ -149,14 +151,14 @@ $(eval $(call FATE_VP9_SUITE,tiling-pedestrian)) $(eval $(call FATE_VP9_SUITE,trac3849)) $(eval $(call FATE_VP9_SUITE,trac4359)) -FATE_VP9-$(CONFIG_IVF_DEMUXER) += fate-vp9-05-resize +FATE_VP9-$(FRAMEMD5, IVF, VP9, SCALE_FILTER) += fate-vp9-05-resize fate-vp9-05-resize: CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-05-resize.ivf -s 352x288 -sws_flags bitexact+bilinear fate-vp9-05-resize: REF = $(SRC_PATH)/tests/ref/fate/vp9-05-resize fate-vp9-encparams: CMD = venc_data $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-segmentation-aq-akiyo.webm 0 5 -FATE_SAMPLES_DUMP_DATA += fate-vp9-encparams +FATE_SAMPLES_DUMP_DATA-$(call DEMDEC, MATROSKA, VP9) += fate-vp9-encparams -FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9-encparams +FATE_VP9-$(call DEMDEC, MATROSKA, VP9) += fate-vp9-encparams -FATE_SAMPLES_AVCONV-$(CONFIG_VP9_DECODER) += $(FATE_VP9-yes) +FATE_SAMPLES_FFMPEG += $(FATE_VP9-yes) fate-vp9: $(FATE_VP9-yes) From patchwork Thu Apr 28 23:28: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: 35489 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp235206pzh; Thu, 28 Apr 2022 16:29:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxew/y0rJAtJjc1ilBI/C+JVrgBdDEuZelIiLmcLdAp0h37VjZDfd6oMbzjRXtkvqVE1KsM X-Received: by 2002:a05:6402:1941:b0:413:2b7e:676e with SMTP id f1-20020a056402194100b004132b7e676emr39151124edz.114.1651188599286; Thu, 28 Apr 2022 16:29: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 c1-20020a50d641000000b00425ee4958fasi4916187edj.67.2022.04.28.16.29.58; Thu, 28 Apr 2022 16:29: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=EdqcXpxx; 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 BE45C68B35B; Fri, 29 Apr 2022 02:29: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-oln040092075108.outbound.protection.outlook.com [40.92.75.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AE5268B2C2 for ; Fri, 29 Apr 2022 02:28:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bwOFLpE1PTsxZhxEJluwQt3f1usEsIwmsx2Q1kycNzBwBEzvh/Q7Na9u3EH8N96f2ehYvUSQcrHJZpH6Q/zIYhP75TiWg1ji0ayayJ9i4r/wY7JWAq7rG+fj5eyLnEVhS9tT3kRuyMBcOGzRzgPFIN5FNV4RAYhHVrKt7ahHtKcluIS9E+W+reqVsqlOQqgM1WJbUa1jjeGi5P7S+WFXDC7aw7SauPZhom+amJPYCGi36tG0kchehdh4HRw556ZFZaaWB3rPF6RovwGKW3G/Fax1pn7VIJ02SueVVpoYH2eaB1D225lMTBXHdrcGtmAOvUSFJTOZWbDhQxh2cZlu6g== 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=/reiAcQLAVHyz3fcvHRWOKtj5uOqJZ8IcIQD5uNYqfA=; b=LsmHWbbhy7QI1FPufdxLKG3nSgQ7kdA70KswNpkxa2tU0xd0rv3z1GDaXs5bHHEEz1FFdC3jRBUUtBhka/ls0IPcUj2GvjeoHeka5IKPfbeaCWT3FBIlpKwyw99cexdQ8JeGvWoKd2Nh/um9TgV41sERKNy4JeuqsXKuAgwpYlPGQ/crgX5agoxI2EFpyalaO+XPJugp1FJL4dFu/1v4qCNmMP8wR9iABgsNYVP8pOJP6NgRVyjx4G7ibZCe6hg0YgQBZFCtzdlZtKe4BHgC7/loKNkMaC8WXF1YjBSXv1O29A2wqpaS+uIL0Mqqf8kh/JrUUdBbgOdFbJVG5CgpqA== 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=/reiAcQLAVHyz3fcvHRWOKtj5uOqJZ8IcIQD5uNYqfA=; b=EdqcXpxxcMC5TQoVB2OV57qi5TKcFFzVdgQ6pknqZPlV4pFfAN0Hj3ow1P7JXRkMoEi4RqRy7LBzrJsHKGtJHDhxf0cTQ4APoEnPTFeTmWjlt/OWVgogHsQrDtZlnYspTUknNlKmglm8Wj+eOIQfAGFRq4uTrkuzYhHY+amUx4U34iBWsmgEkQWUdfSDjg7tXYDVy/cYBXEIxx56EJkaMeu/otpxQRL2mwvORE3kdlxr0ViqIP5oI323xjixC8f2/IvHQjDZLEffssRysiGSd8WrtQTXZgNhdFxriHoxuhs3iuJze8E8PfkCnua2gnSXl8OokV2OGqH7xIudJQsAOg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PA4PR01MB9140.eurprd01.prod.exchangelabs.com (2603:10a6:102:27f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 23:28: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.021; Thu, 28 Apr 2022 23:28:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:21 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [T6lrFWiiTAnvHuySLFmi7ZkGOQgsk43/] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 767d9f6d-6f90-475d-06fd-08da296ed9d1 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVjun0oR/i13GVUp6sVtsqgA9bmk/nnOVpfBC1vHX1qrkDqQ/FSGpkeImvNYwx/X/26v+9IJDnM2na3HiXK2gHL8mq441uLAQkL00Q86yJzlEQIunX/HiqQCm0IV3JbDcc8W2VSpzaVejN/olCA/xyWzEF2wfQn9xS7EjFB+aST+VPdxtqH6T9Mq26dnqSufXCYfoylHErAMEBj23jcf9GCGj0t+hBsx/BSWB5E/sjw8hMYWPkZP0cuUKYx6TVGVpnigWpnPJtT4Rw2Y9YD2xdCQCKank8IcysYKVlvHcycs02XI7ZY4VYxGabpjCqwhaclyq87YFvOMoKBSbo+CwNrOH02FOpSGyYIjlBJxdoZ7+dhxXpk4M/FCuDQdUSFGvIcLWCrAgH95+LaGFM4kXRlIgPa5cXsWgW/fSSNZl59MYpxzWm6GtD85FaFU1M0RDa83DjS5o4x3tl9x0GVEHodO28PAI8ZYM0HsQ2kV+1Cr5kZkbdxgUhydXUkV893VYsaefAWJuSu7iJvkRzWoe0hJTlbzCKup/O5YBoBOM39YJzrZKt+LKZXiVWiOg9sW62H0m+4wy954pceqfIFTHTTtjtkWgKvNSet0tr66i0MJO7VO/Eyr2n3Jn/msusbr+V6Ipj5Bj/QzMtcSYm1CHjEkW66jSJ5tAnmuyF/Yiz1IkSpfo/sZbM5N3gumQaEpaVWNK83tlfDil6x+ml1i8IW8lGlJf3PuDY= X-MS-TrafficTypeDiagnostic: PA4PR01MB9140:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nG5bAcjTblZq2x1mr60uLyo2iLL8/Hk/W2tp0fHubudYcRU+BM0Np5iqBznYpWNP5SVAgLhSK1evawLyDGcS3TAGDbCNtwCEauhilJpkP1AcLNjgVxj8z9K1f1z9CAkp+4PhbaYuLWn8jRv4FhFWJM+fWRtj4A7pSMICVnufjAvZxdDt8/58KvIa884z0rZ7HFihYYIGoc3+K3NIFEGkW6NiHvHhgVXX2ViOaUKBZtJg61z3R2CFidRH0hiO5SfsERFBnjJa/FIKbgz6vkGLZgVxtz6YwGqyugQMLY5ndPcbfZ75MTuWNdtc1YEMjsguLbtqDXGQvyGX4X9LGdpx3XBersy8SMLVvaClFNd2dKvKt0l5Slr6oznPcm+k/454XY3hdqAs4HVa0BdCyWsR4wMIaqHnSTnJniYNuSh85QW4N2rSY5g8IzfFKpjZE01foRTPNLhx9SVthSJXVaB4JwPDjrYU5x8bRkZyRn/YO1AZijy9BG91E2scZ95vnKmXAJdfKgDHTHSHyDUBEqJbJ/1hdLfYIpej9a0Li+naSsmf5IZcLOtynqSBGWhzpYlxIlcoGEdlpTMwuSVXfWxDPw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CrH+Aor0u7Y7lKh5EgR9ETgTBoqd2ZO1DmrDRKpqyvwoMeFYaYfawPEPAqco7o66cbecCdU0BPMQMFrZITO6+32pI3VCM6JRocNYRUokhLpGUdb2fBEFg8wkz0uDY5IUWSltntw0KNzcm+LaJ5GJJUQwvZ/Og/MvpIbt+MetUPQz4kY6fNp5QdxTRRsiFFH69cr+IDTA3n88oNFKYFqtvRmVLBYhbO2MlKXk+QXnfCyXwE671rFEU5Fy3H4T4i9W0EJtPlIwbLBOqeul0MErGFHqYR6PxyNG4gEFwtJ6yVp/L/YH1qlSfJSEBey6uibi9+ZE4vIG3MTQhGTQ8nSeWdM5OcHL2F73eneQIX6waYaSE1nI6H+v/gG5p5qTPMgjprH5Rk3ht0vsQPlxd/FfYg/LVoj6Yt8yu0xQMQrqECduvAbM3w0QjAyAnqOaylJY2kwVNHEWFOZ7xgobmWAdVGWMnZ2D9+X6pJZml63Oh9bq9yGX9WQ8Ulg0N364hQASIRnzHkAeDfHhH0UWyFCVZNLQ4c0eZ2teOalj91RsYqF2NrxdyIj61M1lANORvIla1bukkFQzfS/U8FiqBjav3f+nJ7TShCz4+0XTJzHGdKBHwq40s/eaqMeJrv9O4x2vjaGQSQzekJ46dlCDg9y60BcBlONjgsFibKPxhLdh2Xof5ULsGSvUf9Lj0tKECf1MQ2apLVbIgNlGwKaZRpNvh6HV2Xb5njM1mqXAnKuTfbI9d2AeR/+r6J6bgcdmyfJIf25PmLPKS4jggscOX2VF/U5VtGESzf1OdWAaNSmlidghaCO2uuTGQWEWiqNTyffFLfTv+tY94nypXSI3WMhmFXXDf/enOktt9BuxDFMFvhVSlu/5Vqi0cGFrjsioIuJIKr+JNdLGMnP2biPpjEdMMf/AnidwKTjFoMtgrV8hqg9k/Ymk8cKdYGl8KT93ROvqugQfClCaWEbLqAB6zUwAdvsD2i9MI7C/JqFzQ8UeCp3oG3Yv/voxFVplGvmG5ZbNBs26ToDnatOnb3HXeLz2PkTs1tmUo5NyRL+yoqGslZYtVOpFxc9jNMNjj+F/QlgqEGLCnOcANxfXtrvZZb6l2uQQXHNHtunE3mrr+Dbm7C05grZXU+DqymORr69zofB+bnimcxdF7YdW+DKkIAz7F+yb7KHxwVsyxxf0l/sRlLajVMdp5LUGzHMKVSJAKaAs0xyCRRAWfdlLPcwJ0hLfnjWOOP0zJ3sxmF4ISaa4Mnm0lUAe7XlCpXYXOeu/Q6bCnKn450mo/d0rktMMEDzgaDExh3VCbSzeUdwS4ZtI+hi+gVJAUvlaRU7PF3DsB+GK302Djpp/UiKB76OXkXMBycHCfx9WUQhZs8RDKaJCyaKfBTS/5inM9f8iJG2DelUYV4tNMub/3QtEfck7FdRn3drku7SbsUM2ccIxzLfOVKrY+MKPB6GReax4LIudch3tn06ATW9L9zEw5CiPAsKhnA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 767d9f6d-6f90-475d-06fd-08da296ed9d1 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:50.8699 (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: PA4PR01MB9140 Subject: [FFmpeg-devel] [PATCH 10/13] fate/vpx: Move webm-dash-manifest tests to a new file 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: gAnoPmhluVlo These tests have basically nothing to do with VPX (they do not even require the decoder). Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 + tests/fate/vpx.mak | 20 -------------------- tests/fate/webm-dash-manifest.mak | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 tests/fate/webm-dash-manifest.mak diff --git a/tests/Makefile b/tests/Makefile index 5de9ad4c9f..ea5e939cf5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -219,6 +219,7 @@ include $(SRC_PATH)/tests/fate/vorbis.mak include $(SRC_PATH)/tests/fate/vpx.mak include $(SRC_PATH)/tests/fate/vqf.mak include $(SRC_PATH)/tests/fate/wavpack.mak +include $(SRC_PATH)/tests/fate/webm-dash-manifest.mak include $(SRC_PATH)/tests/fate/wma.mak include $(SRC_PATH)/tests/fate/xvid.mak diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index dc8e9e04b7..a5c7ab0365 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -55,26 +55,6 @@ fate-vp6a-skip_alpha: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_ FATE_VP6-$(call FRAMECRC, FLV, VP6F) += fate-vp6f fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv -FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest -fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" - - -FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-video-streams -fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - - -FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-audio-streams -fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - - -FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-representations -fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - - -FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live -fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 - - -FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live-bandwidth -fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 - - -FATE_VP8-$(call DEMMUX, WEBM_DASH_MANIFEST, WEBM_DASH_MANIFEST, PIPE_PROTOCOL) += $(FATE_WEBM_DASH_MANIFEST) - FATE_VP8-$(call FRAMECRC, MATROSKA, VP8) += fate-vp8-2451 fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an diff --git a/tests/fate/webm-dash-manifest.mak b/tests/fate/webm-dash-manifest.mak new file mode 100644 index 0000000000..0000664bb1 --- /dev/null +++ b/tests/fate/webm-dash-manifest.mak @@ -0,0 +1,21 @@ +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest +fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" - + +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-video-streams +fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - + +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-audio-streams +fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - + +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-representations +fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - + +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live +fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 - + +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live-bandwidth +fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 - + +FATE_WEBM_DASH_MANIFEST-$(call DEMMUX, WEBM_DASH_MANIFEST, WEBM_DASH_MANIFEST, PIPE_PROTOCOL) += $(FATE_WEBM_DASH_MANIFEST) +fate-webm-dash-manifests: $(FATE_WEBM_DASH_MANIFEST-yes) +FATE_SAMPLES_FFMPEG += $(FATE_WEBM_DASH_MANIFEST-yes) From patchwork Thu Apr 28 23:28:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35490 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp235255pzh; Thu, 28 Apr 2022 16:30:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGXJQrcMHYV/enTXIsjorFYosGz3sensVQVJ9IvUYQwX20EK1dV36Y5gjXe/80a5CHsESX X-Received: by 2002:a17:906:f857:b0:6f3:a331:c043 with SMTP id ks23-20020a170906f85700b006f3a331c043mr18213195ejb.246.1651188608998; Thu, 28 Apr 2022 16:30: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 cw26-20020a056402229a00b0042408fafa75si4573226edb.433.2022.04.28.16.30.08; Thu, 28 Apr 2022 16:30: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=DW14Bqg+; 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 BABD268B36E; Fri, 29 Apr 2022 02:29: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-oln040092075108.outbound.protection.outlook.com [40.92.75.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39A8368B2D2 for ; Fri, 29 Apr 2022 02:28:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BkKKjna2jsz9k3cKuHzn6hUpatBCG4KgCt1e+x/oX4luWWD95hvcFnRAT1NdqLfLA+8DCx4fp/sFl/EPpijxw1DMLtna3jdK9yZ3jqGDpV+FLNm8haDkkJkJYVVbxGUg5OjNc8fgfVf74sYKLRgRPqIMMeZLiO52wB1D3xNDyd1FlznI3R/7O3OEq1x69ReHjOY+8yjNWcrZzF3IfjqvxduZ9+fGJpbjrED5jb8Gk+t5/j7GuTseff8Sh3uuYXMub/dgcPfAgswzFWVCytAoF0Wbq2BFzxnRWwwHRgVtVc1+eLHhcPJh3EaBdg7qySZwoNv/CxlRHF7mXZkzbIG8Tg== 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=gvv2rMb0lZsEn08B6nR8HwAtS+Ap6S9csNDwQ3hqfhg=; b=ZnT953eSIEG6Zwx6hu3luoqNPrnJY74+d+3shHqFCqJEfRSZGWldfQrEgLTNZLIggihoXQB0GjxCS9YeplGa+UbcCNxoHVqmK110L0rsj6h3k9IUkpTtEEpOFaSzU+RpQ+qVLy/4PFR87zSVILcYb6raPVZ4KChKMC0DVSf3KRKhV/DV6BWlomfAD4eHzMdkAM7CzmPs9V0CG2285LwfaEIfWalG8KnlLhNB7vCYklmiCjXDHVBagHVEdS7AH18Oh/izv2qv+9uk6EeDycUmbKMywuCa/iv7+xSkAbLJ3aFv2g3bTz+ey+nKwoqFPpNPAg3qkOaWK4NCI64PGAhlvQ== 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=gvv2rMb0lZsEn08B6nR8HwAtS+Ap6S9csNDwQ3hqfhg=; b=DW14Bqg+bnO8azYAZ+Y3tK5ctgiUFxnM3s+lmfuT4VuVbsnA61HcLq+2ITZ4yzv61NDNypbDAwJ3/H+Txdq+SqgSjFtxqM7/Hdsk25HAcqpqGVyXQgzj93+0lxx2iLXw8ghAmuIus9QErJfE0PthGPQbFIdUqKT2X3HpPo/4mkdUWx/O87XG+QaebQjgcV3oNhqb9YuZVBPV2MeJQI1MVVqbJeUBZXG0m2s2DiBk7sdc2Xr4IboMuubF4qdXod0eRQZhtkwU/o6rPZv9b5ezs+Qw9DQHZXKUdRFoj2aK/2ni0Ax6XsjY9fL8wb5zw/zf7y6a2NZhbAXINpyXtBDp3g== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PA4PR01MB9140.eurprd01.prod.exchangelabs.com (2603:10a6:102:27f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 23:28: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.021; Thu, 28 Apr 2022 23:28:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:22 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [lHNhc11erGcJ5ZzqOCOFs8rNVtkKS2nc] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f63a43f2-1c25-4c80-f520-08da296edab5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVjun0oR/i13GVUp6sVtsqgmqNBCNqnqHyOyAznOTCQYCUwgcdTho2OQFIqtoSDaGshW0FnSr7gpmIEveK7GnH5vC4zLUhRUseHTtCOALG/yIy/e9tYtqkFUSo6Nd6q/e23SpN3DxssCOP9mwHnuOeu8NZYzTz8iwLQiy1uF/TzNmDwwhO3fjujXSzIepEShiDPoD9ODNgA1GcvRPIpOCil85Jiy4azclddqpFOk5mOqnw+Ls1nw3X3qVDQRgHqnJHTPcY+v/Vr6LWNuklJ49yJEqMQRF5KJ+wKZhz2mZki8grPciCrDCz0Va4/hFGdsGGGMmEHoEjTw6uAJY8YD07mytdLXYA9MUzCVYXtcNKEN768xdD6qpq9XgNygkbml9RHgyVA3suBHbZkQXG6khxTDDqh+oCZN95J727UcFqN/LHRSfSukTONwEUKJqcYSHgGbKKUIxHwUbVz7zuP4mA2n//WzS3RfAeZ9lle37ujuPD9KtkOm60K4CxZ5L11cuNnUeZGX6UKGGMRnLAcZ8GsLVZKYPpckTWyGX/ozI7z20zxclwSIX4H7sIiWG1yT3UOp/ZL5XQu5TgimHigQodJZYsyaNZD2T/FcjEsE5kY5LUF0mVFPub91SvLc7/g+oSNdbdBU/Gq/wdTCLabkBJ1a2ZmSV/dBOkBnF2XDN1Z+5t54bq26AjdSO5Pik8agUSnfqa4wwWJ7cFi18QiQiInI/2WWEYCuAw= X-MS-TrafficTypeDiagnostic: PA4PR01MB9140:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WKNKasEYey2+kdNN1N2SfmC6giQESbYXpV1vZo7hfCZ5xH2WlVxntsoslFCYBgM0gWAF10x5VaQ8HsnH26INkf1dwCg65QGAyPCpmF1BhP6v9XK92aw89aERTavx/WTyLOPayLfxXGvgVM2qJO75wK/mLnQ9opwEXzdkbMI8559PG5Mz16XzslDyeVbo3pBMyoFba83olWmAeXBddYyY6laeUFI7sj9Mkk1dr2DSk1Hgtl43UJ7/+M7QuFTl5AMlQ5CGjfXbKKzQdw5rg0tvbM2xp6E+YLESrEFtvnFyuo8cbA33sFEci7fA6kccQFFAHRGBbRZA/Pk9FdWMVFtOdB9VCBLOwXGjYNsGuPsO9hjjAI5lmdxlnTEdzPwMumIInSsJTV0Rz9lCxHUb1SZ6kWvsPNu+cf/h8YBKJlMBHcY8+jFKyvBfM+rx9bdbhzOPYJZ1Wx6+xTTTyHaZ8z3DEJQ5iZpluglcXoq2Fhn/OUJiGhVDrTHG2xwGJj4ZeJzd+7zgoQiIFsRjxMU3SGVZ8ZbVJQ/Us3mysbyV9cUeO9w6y8jZmrKzckZlAy+oTQgxtBxpL4W6sKykxhbfI6pyxA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jppv1vjW4B2gZtcwFZ/mLU8SZXf+nvAzRabbYVgkRbmgSIxKAe02tNCIK3sL1QwsPiYIZd0dl6/iVvAxBx77U47nBirjIxjADKsNDIkXYqoMDXxYWPZnrN1NsS8reEoykAx7W9Ifazzj7zTdldtm9QKDsDBAp/yAIrAooHstpEfO4YaSPN8y6/WuOs7hP5aOilMEij+xqy1HWyr76E2Gn73d6jStYlKlVXYTwBrCvxigzEVZxQgdZHwKtN9Xv3O33dRxuUC/8hSUCOhHUuEbH3x9gvwq+I4gXkKAlhMGZHuVLcMNpbnAjCKsfmBjZuGhbahBGAWOJc8eMjWbaAgJOzCT3d0onxhFzxXkyU5DhxVJiEhVIKX6uetVYTklitX35pOT5wLSvKQZFHxiVZGg+XgnMN38ujoTD9stZLDRroSGKYYt6cJK6Mp9QuDnXRTn3n2j2oVzbFc6iAYaDxaVZza/FqAOYah+ZjddSTTB24pBUcJxKOSlOEJ+rz6wrXZVITlGTpGW+K81KbNaC+NDDiGJa2Lr7spIJ7fJUoD2LRLi8jxwAob98zYhuukEoo56TbPWa61merNfuymyTt2ddUi0PYJOZCyNdTSxGX104n/hyVntXPOlZmFLcxtFiuHU1+bCcaRRRYteZlT/0Hf3caoxBU3fW0XRc9F3wPXDcKWj78P0drDejyb68qf/7b2RG3PDkYhVMxkdwlbLvkrhQ/kU9qMEzrf8JPbcluuT8BxLAwui9R/rZVWrSDJoU1G5leUDp6D0P3eUo4NsK0ZTvbGVmdZqYCzD6j9c63Hn/Ad9HcuxFQxDdB2jV2nx1SDhjhiqaYMzyki1kAr3AwzgjQ0I66s2//HqLVIvlQ2ctdl3+zhWk5hOsjEUt6zA5z/O2uHe0E4XsCkDsdbvPUxbV0YVln/Z9LDadMUXGmv9fnPJono1dbx5tigd7IeCl6+bRDt/tBRpupGh3lIwMC+I/Q5tg/aGiap5HPoVlQeZgIuZgDdEdDe4c8kaZcfCMfNXRjzhUtsLnhROT1WGWFk/XbD6p38Uqhe/IksagL4tYdm4kQ+Lr+KC0ao5201VtwVAKJp481kjXL9VdEu8QiX9oZ10GTMsOG4SgdMzhNQgST6wC/s7dgo6ZNnbLfUG3sb5AjkqTHC0ECboil59SdigVE+rzSRmjZpK4wha4naX86nxjxAl/kS/9MaZADBGWejvdqdzmn3kh+5R1jqZZ2vrU08Bs6gI8lGqtYfh5U6sD5pbHjVk2mixFeL7+ZZz5NJ2EaMj2hv06eCK5CywLJM0guMJNlPEM6pSE3y9PSGQ+KZ7Sp6BbBumK+7atgfd/Ml9xYul6P76tADManc2r50m66iIQNDvLM1SFpiNR0SOI1Ejk2rpyw9rbR7ZDZvnaAtFW6jU6F7D0xzBX2PipG8bzxwpuGMJGgNSHxA2nx0TkBqsrErOx8EW2JywN7D6QPqfRv2y+t3PmkieQ+etRh2Opg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f63a43f2-1c25-4c80-f520-08da296edab5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:52.0720 (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: PA4PR01MB9140 Subject: [FFmpeg-devel] [PATCH 11/13] fate/prores: 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: HINaDX8U3AZp Signed-off-by: Andreas Rheinhardt --- tests/fate/prores.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak index f2c11259dd..9e05b33b9f 100644 --- a/tests/fate/prores.mak +++ b/tests/fate/prores.mak @@ -6,9 +6,9 @@ FATE_PRORES = fate-prores-422 \ fate-prores-alpha_skip \ fate-prores-transparency \ fate-prores-transparency_skip \ - fate-prores-gray \ + $(if $(CONFIG_ARESAMPLE_FILTER),fate-prores-gray) \ -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES) +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MOV, PRORES, SCALE_FILTER) += $(FATE_PRORES) fate-prores: $(FATE_PRORES) fate-prores-422: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le -vf scale @@ -25,4 +25,4 @@ fate-prores-gray: CMD = framecrc -flags +bitexact -c:a aac_fixed -i $(TARGE FATE_PRORES_METADATA_BSF += fate-prores-metadata fate-prores-metadata: CMD = md5 -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -c:v copy -bsf:v prores_metadata=color_primaries=bt470bg:color_trc=bt709:colorspace=smpte170m -bitexact -f mov -FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER PRORES_METADATA_BSF) += $(FATE_PRORES_METADATA_BSF) +FATE_SAMPLES_FFMPEG-$(call DEMMUX, MOV, MOV, PRORES_METADATA_BSF) += $(FATE_PRORES_METADATA_BSF) From patchwork Thu Apr 28 23:28:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35491 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp235302pzh; Thu, 28 Apr 2022 16:30:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxM6KibgZYefSH6zutiRhry+47bIVUE+R3Q+Twmz5Qu6tFWqRoecWfTCrtpF/s6mHVTvCG+ X-Received: by 2002:a17:906:9c84:b0:6e0:7c75:6f01 with SMTP id fj4-20020a1709069c8400b006e07c756f01mr33851253ejc.103.1651188618210; Thu, 28 Apr 2022 16:30: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 cw24-20020a170906c79800b006f3a3d0956fsi4898098ejb.473.2022.04.28.16.30.17; Thu, 28 Apr 2022 16:30: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=bwRcnb43; 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 A7E1868B37A; Fri, 29 Apr 2022 02:29: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-oln040092075066.outbound.protection.outlook.com [40.92.75.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48CE668B2ED for ; Fri, 29 Apr 2022 02:28:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4VNbzyHrva/zpa/s85jOyyAL0Ph8K0TjweK4L+9iH23fusRNJUoWmiGJWTJJRiIiTmvpgFnLTca0L5EGbxTEJtaKbNK0GKI/X/f6IwsVLuAzUUYthfQ9Mo9AKFP7N5pEwvXOKQk4R6MYLbw5EDaUvngnLE0H3kJbHGhqrE/EQH6bLIv8EIsgcYMWtU/zy+5Xbjn2sWH+JvAJCfc5Exz/pRisqy70pb7/8nYD5Bl+AGdZDKDY4vOfoK0FeYUk4Snm1ctjSycZLr/e1zcCDv0B3La27YtKLnqg5C98zmOWep4oQtniC8qmnNIYQoQPuUaqWTbch6BM+y3VtScgjUXYQ== 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=tI0Uj35XvUXg7O0gnppLUGBkCW0jxdVGCXxfQH+Ks2A=; b=e/nqipwh9G7ERitZjAEoJU6Iibv/b9+O7x5/xxSCt1OZFLFiMwKTl58UQB/NAUgoaaXfF9M8Ax/xQncxd37W0m2XbGYc4zxzQbldwBSPvl3/2zrxv6a9aDoZMozjTvMT1Zm9BTLbEXEclNbrf7WI+PXUp6DkeGjOmiChBTY+sSimi8tsC7SGZ+1ZEMdR9/IsTG+Gw0qllxoVDvXzbvhQSnr5REZK6Z20N0WjiJhHvdCHy9aSTtNU9dQM9R5xKM/hWoW+iCsZnrKe0KsUNp4S58o5q2Y11G9Yt1ud4nFtprwiZcSmGbc1Sx2HRRa/0oZVa+9OKfJFMCq0Boq+6//ToQ== 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=tI0Uj35XvUXg7O0gnppLUGBkCW0jxdVGCXxfQH+Ks2A=; b=bwRcnb43dpk7tQFaAiKtZJ3MacwB+iLAzvkEvGQxHr1DG/tmQiWsWu5JYzgMi8mHW4LFfcvvNK6jvUP/kC1woT9kQUAMFigKGR3ZW/tMM8pvC7942rLBo9Q16kZvruq/ipxtwd7R2heEtRD5jQmKo7mgM9PLQUdCOSqOlTaZEsI+3TJbVwpbMSroOrq8uYUIatQh4d0e0N7JTv3APQok5M+UcQUSfB7ryFgTTLyjktL3anFrzjsA/HRWxPCqLmQx7BLU47508vK1iL6CD/CC7JkJ6EF+MsQW8AzorqJXybnP16SDrGW8fJ0MkbCLsZA+HAjYzLqyLGzKtUzDx8HwOQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PA4PR01MB9140.eurprd01.prod.exchangelabs.com (2603:10a6:102:27f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 23:28:56 +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; Thu, 28 Apr 2022 23:28:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:23 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [LHMVQqANlshl1ZcgAe0C1NcIrhaJMacl] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21fb4fbf-4129-419e-b7c5-08da296edb8c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVjun0oR/i13GVUp6sVtsqgr8bEm3AYfcuecs7cOLvflrXXLYoZdztbGQXGd2PYR4k8EeH0jIMYZA/GxCASfCHP9WeT5gUYgzjWcgtBLmJcsNb+I39aujQYwLGdjz3Ctl8gFVgNwhiHjhZ9qIB065sSoYYY66XCyktC+DrfqHCGcNc7o+Epe7DD6JPIKdzMyFVQYuEVhLk1vw3HJGNeLFwAeqyc5K8qCdLJfiBTcyqzRy5+ntSve8WaO2zpoXT5AoXUP/hAaMxaRUwlId8mOlo3dbtK1JDRJCC1VPhAaniKO9iHBPNPplFRJXs1hXj4z9DXi2XjAIpLcYUfTMjTyGitvzEQ2znM2WWyND1/+kDu+BTlQz7tbo7OZSOxZZ/6uOtKm4UhLZ2rHr3gNdZ3sqVGpFP1QF1k+xlNgVy73WN5d74IV0w0Vzw0/ziQPAAXXebeOAo1XPRfF66aqRrzcvaJdsJfs8XWublbp+/7IalcSD9LAv8B5by2JTkx+xrAUrURyUcifi0+5646HLd66jbOGoXx9Hu69vnOodnHWV1ENzDsdPEwSh4yDvDlBij7r6QxfO7N2aqw0KtDIwqNjaqrQRU3k2PpsWEGNP0cSaZ+EAoSq7gZC+qwwIu6d3vnxmuuRX9Gt1dOTfeKvEr6EHxeA8Rqqjt4U9vD51QRB24AGHZXGkb+4P45wZMae/TS/dkEcv1xN6noMuZIXPw4wueGxpc+LUl0Cto= X-MS-TrafficTypeDiagnostic: PA4PR01MB9140:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4ULpUtutlCKNeDMawBhKlJpmwugL8xfI/PB+YF4O5E2RCOoDwNik/t2Q/sjhmlVCyekWymFPULLT1Ym2tjH6QEN0BKpl4+HlScnZOvpaolgwLBezoI2H7aC5AU3pJ6nODH20s6t9MpHlxV4TABKwAN+pbNIqyNyovn3W/KuXc+5qK4LuGIvoT4DdqSsu+EIhOwRb0WoxMB3zRHjlkrB+sFxFEK4Gn28K2Li+xpFSMJqUNggIM0zdDCufmiP3d/7CyULRLlwd7C1+c+zGAch7hQMzh/BgiVAx4ZcIyWuM8cSl7sxRLYUP9tHqyQKVobj9SeMnCaU77bWKo78zMFQMd7qz+73dH9XPPviEQZT7EMAAT3Z+SBPVxxjxeDJLgaUcbclXl7wiggEUDOe8CuN5NwXge2zftSKVt1hnp3EIuwzG7cmsedLLtoUveJitJ5PYCfujzK1BoE8PRjCMnMSWl+hGgX+Y4RgtiBtkTwsvNe2c1edqpUnFc5GodoZ6ijcYITb5ClWbGPPYuX3bfYdzSadHFLQwCkuBd7V8WFNzY+iCihBiW1VDewVrB8s6IpU8gY+P0bT3ktXXrxj5G7hx+A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DU76nZk14EcgOVNcTHh1DVFLMMolmpYIogm85miQJrK3Qy9/rKv0B5bPfkwbiNgv0QXyBkiMu5rY6p74jeEU2gZGsqhcz8JBVDKK0h3IoLBJqjLRnxyUQwsiUU0G8fEVy/n6I6Dt0Q73EnfwQSOhvqpJgaZ9XMkGRmJrkUqVme/PvlOZin2J2p2gdo3//1pU6RIkSX+NnYPdaNLIzlf/cESdiP+H+9+JIYqHRWsFPnhKEpRpvUnuvT62MHQcgdbX4+yuqMoaG1DjJnCFfsHHZPLU1ks+cThm19UT8kFIzFbpXfk8wuVgLk+6nCq0taja9yCcYHDMBDeVrHAsfT/WlOQJm98ISfqqsemjpUSyuvcqsJRJHG54zaIGMzTiCN25v0kWsGTOiai4p1lCwW4MMugxcGhVVBOPl8/4Wszpr3QFXm+o/Vu22fRJ0gy5IvhIykqmJFmtcgURr6gx3IxITl9A3QrvuVsCL1894YQ6JEkCuIkVvg096ARc8Jr7l0djr8Z45e6mywajOgHDBoPuLQlzMt0LUTRhM8B/M/9OfklG5mZbAOU5N2nGCOY4KVWNBKn1NRf4bRy89VpaSB+9fydpy/ROaNhGImJ/2IvHr6CNa2UW+gTHrfjkvvRPLZX1NJGo6/mvDt0vcxw57MOBH51A4lcy+NGgmc0otneR4p+9KYsCaExajuPUejGIQne2FNP+enUpBW0LJJFJGP0s9tH6UPBYG1p5UCIgXzUs95HtqOHzv0wKJzIzc8I5D2iA01TpUs587y7KyOgLpI6smUwZ9FGqu1M25MEVDKWTAwOEHr00tLWSU6/MiehTFDmdn1K0gUeNWW6BHAgZZ+T06RZGMejVejinJ/+Uvy09vwz7uvgVU/CaJG1d3+pUd/AxJc2JvdpjKYGg71vbjnIZE/kNexXgEKM4MxWt13TzTOkNFVECjB+HtfNYEzABev8M7cKACvBdKzOUjEHZ4BsHk2YAhllh7QAtqRa11NS0BpWLZMHxNsXITUQbM5f/t3uTxscweq2g90Xih3LCXGgyyOTBEJHtx1sYxI3UcD4tcdromlv/e33dsVjl9CkhDB4Mg/EqY9rnzgbcFKMXoS3tFEKiBpGFPB+7D4syojLLQHOn1ZIN3L0fKyMhw7JxbrrVhQKQgwirCRwiK3sypJQF9IKNbCZk/Myjagk44Nj/+QypT9Cw3Hclnii26SbMfrBw4ozU3JAqe+3bQmKEquHhMCxxy4TsiGEeAaLlhzGSdnRuCqQC+eBE8HE3J8irlSu9lmaMWFz2bugMphIDF2O8f2LaetMfC7YAVlilZboEE1ewZ//Xa6/VZ+R4sW2dTjfFo7FSq7+HsB5s6uRhR9hFRXTBvtpZFJzrwT45qxaQiFMyB3Zh8GjdUXnYgVVUu2WeEQfYXyB2QNmXT0Mys5wUBw/b69N2BUvY8L+wkGEWX7kdjUQbMQ2l6bTd/I0R4w18n0dMhOc27NpniH7Sop+7gw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21fb4fbf-4129-419e-b7c5-08da296edb8c X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:56.4807 (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: PA4PR01MB9140 Subject: [FFmpeg-devel] [PATCH 12/13] fate/gif: 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: 0D6KD2R8Klqa Signed-off-by: Andreas Rheinhardt --- tests/fate/gif.mak | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/fate/gif.mak b/tests/fate/gif.mak index a5147c0e38..bf604464aa 100644 --- a/tests/fate/gif.mak +++ b/tests/fate/gif.mak @@ -13,18 +13,17 @@ fate-gif-gray: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_ FATE_GIF += fate-gif-deal fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -vsync cfr -pix_fmt bgra -auto_conversion_filters +FATE_GIF-$(call FRAMECRC, GIF, GIF, SCALE_FILTER) += $(FATE_GIF) + fate-gifenc%: fate-gif-color fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@))) fate-gifenc%: SRC = $(TARGET_SAMPLES)/gif/tc217.gif fate-gifenc%: CMD = framecrc -i $(SRC) -c:v gif -pix_fmt $(PIXFMT) -sws_flags +accurate_rnd+bitexact -vf scale FATE_GIF_ENC_PIXFMT = rgb8 bgr8 rgb4_byte bgr4_byte gray pal8 -FATE_GIF_ENC-$(call ENCDEC, GIF, GIF) = $(FATE_GIF_ENC_PIXFMT:%=fate-gifenc-%) +FATE_GIF_ENC-$(call ENCDEC, GIF, FRAMECRC GIF, SCALE_FILTER PIPE_PROTOCOL) = $(FATE_GIF_ENC_PIXFMT:%=fate-gifenc-%) -FATE_GIF += $(FATE_GIF_ENC-yes) fate-gifenc: $(FATE_GIF_ENC-yes) -FATE_GIF-$(call DEMDEC, GIF, GIF) += $(FATE_GIF) - -FATE_SAMPLES_AVCONV += $(FATE_GIF-yes) -fate-gif: $(FATE_GIF-yes) +FATE_SAMPLES_FFMPEG += $(FATE_GIF-yes) $(FATE_GIF_ENC-yes) +fate-gif: $(FATE_GIF-yes) $(FATE_GIF_ENC-yes) From patchwork Thu Apr 28 23:28:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35492 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp235363pzh; Thu, 28 Apr 2022 16:30:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTZzc3mADjXb4whF9RGFLo2DYwXwKgbCREP2hFwSJer/P2N/fi6WjPA5JQ6j4Vcgr2y0Vf X-Received: by 2002:a17:907:3e1d:b0:6d7:1031:7e0 with SMTP id hp29-20020a1709073e1d00b006d7103107e0mr33008152ejc.580.1651188627453; Thu, 28 Apr 2022 16:30: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 cz27-20020a0564021cbb00b00425c3a32938si4469852edb.145.2022.04.28.16.30.27; Thu, 28 Apr 2022 16:30: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=GTsolj7h; 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 95B0C68B261; Fri, 29 Apr 2022 02:29:03 +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-oln040092075090.outbound.protection.outlook.com [40.92.75.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A572568B379 for ; Fri, 29 Apr 2022 02:29:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jg+HhRJeKTfwMHsl4ePGLW6HFWU6olCy3G6K8R2DcUaleSTAqDO0mJ0SGwOPl3N6KRPxgLFvJ4gZVrDudsFy323TyqrG2mWdp0Rb9+G+mPrhfN53ZgnU3zTAS3+BHUgCMkJZxRGLfjBDgNdoKtUDjnAWhmcTTKN7wOpaqeAwmhjYRdif1Jzfel8Zheyv1vkDkYJD12NfIO9USqQFN8jDHYu8DwsOYC0J5Twau/2ivAgPZNeCwTiXzu184CdUc72/lcORNQ0iyk2yecQEG72wl79moh6vg6vvajGITJgy1M5PD0XjyWQaJaIC1EvjIwKv8b5j5S0QW/ayub+l5Rtipg== 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=RGtTwJE9pFrTyodOL8VY+Nk1yOIcHefUigmgQ+v8Nf0=; b=HpCMhpLaiQPn7cpgqLh31OzCwhIfYVzPqt3VvBHkygkjYfOveBi0LqMSNz6mLe1U/TvPREj4NBDrgESZyVvRwf892GzsJj5FrYRBFWko7aQb8bXpd/UpOU5drBWOs2so4WwW6+N7K6OLNRIX5FRbCrE1Xl5iEHhR5k58ngwxSOVskyvJhEXjozf6gxJOK8zRLWU+qlifG/azOf1HSxIz/DSJBbEW9GUjBcG26l+AcXpMNLRPuGey6IVlIvBVYfxk4ab71VcahaPYkruNCZ4Iz1GbzM35VLY1NoLib7Cc+S1QQi73DeW78TTJMaXq4MMdyM0vSCCwlJG+t9JIgmD3Zg== 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=RGtTwJE9pFrTyodOL8VY+Nk1yOIcHefUigmgQ+v8Nf0=; b=GTsolj7hFAjlJ8e0Q0jKVMAYd1ySsROqrMYgsFRGkqIMBaiWQm9mIAEpIOB6H87RAaiZa5ne5ayO2Pa/p06YN5bgVNI1/rzpxWIqEbLBJohIbEqBkEDmSGXEAK3O7B/xtH5Pyt3lhkxsbH+xwRckNKbSyTXZuloRM99SsfG//lSn5MA4QqPo11IC/VqvOzl3LU3kdQCneDEBUbaImJo8r3BH8E27tYTlGDnkNNryxvBPCpdjBCwqfGjUxnQvMyNa0X/aufKJG6Pdd/hecHRQX+YP1h16M0VrpfctFAQEAv6UbqiLUNvn2PdOwr1gjOX1POFFh/OjhbjetjIVIGcrLQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PA4PR01MB9140.eurprd01.prod.exchangelabs.com (2603:10a6:102:27f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 23:29:01 +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; Thu, 28 Apr 2022 23:29:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:24 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [c0wPSvRSsC9Nfkd8hANTHxteLaMUQ516] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 248ef94a-a7f1-411d-0af6-08da296ee020 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xMPmmlLre7nmSb1T6dSUV8T9VO1DE7bJRt+idCcvHfrMcFCHi0XSkM4mKzJvZndhG01r2xKMiDcPc5DbIVHnA96vhy+62oU21kRuaVb0O2CaExXWg15Nwxp6WUjpbaa5HR7UzUVzM8cRLvJhGTgeMjmrKIofN1of70obsssoXneocQ69Yoo1fdk7WE5jgXuNb8LTW5/u6Cu4hqXjhAB3QeS96nd0fNl9QtSE/5MQxRSmqZDXOUKf3nM9kW8fpwc7OqAQ2LhyUUqjbJXy242GBZo9S+gVo6IAYuiI6rCfl3S16TOq8v39a7z4KB1GBJlu8FNX0f7pU0KU5kspLT3U5OrZrrVpNPMhQrQGrRwuorCKU5VYrLEVU5sukEa4n1tS+HV3nFUz5r3aR5rSkOmdoMqsWIKOTr9QLSBguF+5Pe4WLneUZRVviMahc4L0BmQ9QUAzUPEcejtQ8D1vV9odhNUlsQopvfqWuzJwZsi30F+qsEBqjBFgp7vtDUwD6J4Cta8/Og/GUXf1NVer4Vx+NPBwnBo1UisTAcqv3S2RoukwQMQ79UeCwa/zLySfGGvfvNJg1FNW26jb8YTJmkQWV3fNdQtQdOi7wpsnfA9dt1Kr9/LfHBtWG7UvqnxVBanRxaaMPXmdxrtbD0Hj2sOAA4KyQN5IpIm4xeM8SMEdh0QfdwK2wmXgG/KJNr8aJkRczPItd9ipLyth9hLlpZ7xLsMlDUSZJSJalVDLhmjElksck= X-MS-TrafficTypeDiagnostic: PA4PR01MB9140:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tSbpQIUZrY4frcIsl+Lk8TcamJo/0U9+iC/ldNptf1XSR65nYOplg5zTimGS+hydYAgzSzyAF35uBlWMhmfOuPSqu4GRfTNfEUWEwapD3I5FBgBE1ghBvMGrzAkb6n5Yla8D/PDZnqNssxnjiYoRJufb/1fZ8Q41IRmdvMRVqHpWnNi51GZbhvUP9zOBAU55kXKHyOqL5cvknn8ZEB5HQ4q05KK6DnjkyNcaiABN9MvIgHj0bgxVF4sMd0Z++SQccZKZ4lTOfSyoFHsCOEOsajj9Gq04jy0IbEOM0qwm32TxkBXZA/q7NaRHRh4BdulRs62hs8kHYRHGBznlhjZrXbwukOC2ML4ErPPWcSo3wOkz+vpT5dHyNdxyiwxrmnwWhZF2V6AAxznfJlIM30UwK0a4Bs+yaewPe7UalpD+Eti+cubpQknjsFzFYOci5sd1sYrIFcSXtlig+RI2geYFil1KyYtEl9LMQ+9o6iAUALbs33XeoVruyHJbVwfMn/5U5KficumHkCAHEuqKPd72XlhM/D5Wfi1kZvwCJOkCrGw+i/aG+DCVPhSDo/m/vvkJ5u5bqsQCcYivk/KiSyIbyg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eSdEW3Fr30NLALE1H95NFPOM3KmAns9Vl0CL+81ZSjAjB4iJ6vBTSEYv/z27PtmX0z60RMBHOcJnus0MlvWeeGldBSl9ycxqCmqbr5LQdE4MUAboHRhcJvLw+wiEYfZx1p2T2m9YRdVRLpiGnN7c7MsI+i0JgaibOsEnm+W+I5YRrcW+PGJH+aEtyNB0BRjN35bpZTi49iSvEAPZPEn0hV9GE0Fu9evhg0iaqjursznSWsvqndUN5zyu0OUashhvVip3qg83kyU8ZUWCSAiZQB/gPIqNS0iut4VokO23tG6qTxd88dAIrtC9P7iRoh9uAVBieUoWBADGh+lvpN9kj12Yxes1qIT0XJVitLgNVMpyfXMdNTVgT7QbLKq7n1siHKHuSYSgoof+9wvbg6djONnemWeyNjwzusN6RN3a/KDvXR8Y+5lQj7YeurWOhL8F6YGmeJYDgkkzHVm1Sx7Hlf/h87ihCkMrHvzZsirDvJs5dN5AV0ut6Y/qGHzS31mjQlWaRZWzYhRFeVQKbIqITMJHJlajeLIqWMfwl5lQ1XUJ3lepoYyvX6/fWZ/Uv8pMVHOXDJ5Ahw/ThyHyx887U8+g833qTJHBCj1Os8SAU5alGMqf0juspQ2JRUz7R1z/oCG2kZdVLAWHIhW/E0LkBOAfbrjf2K5RyoYs9rB58y2X57rOOK1vO6ldKP2MHus9ZVGu2ZSuwMWlh0ffvVVCGr7WPY6nWTIXGN/RwiToosj6trFOpF30Qwvl/6fnKAq46JMNA9SwpUJCNtm1GDk615E0+z/cCF4q/MhxJkQGZmjINfTE/LXrgMUQLtNQWbiTm2sTADeQpPQcelGk4sP/c/d1XbYcFjC0Mkarhcw5p/uFlfM6zKyND6M96LPlhG7lct8n5FQsPBz55zhlSrh+M2Xb9SIRmxW3uPD0aDSDpNnVTOLnmdU0/i4+3mkDu6X/VwNnoDqcFdvbL8bmPaO2iyGs6JsxDxcsF4cVlqeWGXKsbW5xEUORyhJi6U+T7Y99TljjL78SKhxN8UvdIr1J7nk5EW6s9t653MV6KaLjdQIs26bbon011iyvHocNQOqYbPl/tKsJaj3yt3SdrzY+h7/pMbDUSKm/dXv5g5qz41XOd8Ej2vJPJ1mWPJ6K+hQvDv2DccFFI0f/qXyFM4xEIEm9iQYdChqI5VSjFua7rPv4LBdxyY21JoF8kBrzgY+puQetRmC42VHa+OQjJaQM0FVB/v3oGgjPqNjaVHwPsyc+KJfF2IBTFH1aeJo+1deHOu9ZW5U6OBkwF5ZO0zB1YkCX+vu7M0tlCd8YTbJ5d+xpl3uULKiXQbAWDqxl520GAbzZWRIaEXgclP4ppH7a95kYwgo0/lHeUhaACq4LnavUrk4ss4PeWsonE+yP3IHeKXuCzfMbl9PFOxTQPxKlIQpoUstXZw+iI/IqBj3R4P21nzugMIn+v4VQfUnfkorcxIZUbNYw9w2BrT/iATD3qQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 248ef94a-a7f1-411d-0af6-08da296ee020 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:29:01.1863 (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: PA4PR01MB9140 Subject: [FFmpeg-devel] [PATCH 13/13] fate/gif: Remove nonsense requirement 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: /xydv47Q2DXg It seems as if it was intended to declare fate-gif-color as prerequisite of the fate-gifenc% tests. Yet the latter do not need anything from the former, so this would be unnecessary. Furthermore, given that this line has no associated recipe, it actually cancels implicit rules for fate-gifenc% instead of adding a prerequisite. Signed-off-by: Andreas Rheinhardt --- tests/fate/gif.mak | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/fate/gif.mak b/tests/fate/gif.mak index bf604464aa..1eef2a1026 100644 --- a/tests/fate/gif.mak +++ b/tests/fate/gif.mak @@ -15,7 +15,6 @@ fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -vsync cfr -pix_ FATE_GIF-$(call FRAMECRC, GIF, GIF, SCALE_FILTER) += $(FATE_GIF) -fate-gifenc%: fate-gif-color fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@))) fate-gifenc%: SRC = $(TARGET_SAMPLES)/gif/tc217.gif fate-gifenc%: CMD = framecrc -i $(SRC) -c:v gif -pix_fmt $(PIXFMT) -sws_flags +accurate_rnd+bitexact -vf scale From patchwork Fri Apr 29 20:22: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: 35512 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp500621pzb; Fri, 29 Apr 2022 13:23:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx49ShU36ddeCxLw8EvtnJ3YCvyEq8ZpU100Wm8o/1qKHLsSx85ztzDLIqhmJSSI3ddTC3y X-Received: by 2002:a17:906:a10e:b0:6f3:e70b:b572 with SMTP id t14-20020a170906a10e00b006f3e70bb572mr963838ejy.546.1651263807758; Fri, 29 Apr 2022 13:23: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 w7-20020a50d787000000b00423f9a0d0a2si6576465edi.431.2022.04.29.13.23.25; Fri, 29 Apr 2022 13:23: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=Poazm7lO; 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 D5E3868B2F6; Fri, 29 Apr 2022 23:23:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2028.outbound.protection.outlook.com [40.92.91.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6743F68B092 for ; Fri, 29 Apr 2022 23:23:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fQrvYDmKONVyLiyfwkzndBBOKeCzuZ0RurgvkSRi3BkV8fCHYtYwGi12C4jGT3i0RkwpYAnePy6zfoyKqBjQIxvIlzsXRhPhN7QoFGxu4YVykVmWtM+a9zsR0B0VssIbZkY3laqtfXXjMhjJAM8A6zDFggQIrTJiaoGOZZVO36U+d1rQwboTnMgDbMgegJjeP5pYs65I7C2VMYAVbwecCCaPd7Y1m51nTTJHXmeQ1rX0fn6VFAfFVUgsdJgreoaOuR/3Hq+6ktpJZmoXxq9ugjNusSPf7SVOYOu9AVLkzG+RKfoOCNOoMoiwBXwexZGgwxlTAr/HJQvUF6sxabXTYA== 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=M2x7A1w+LF04+mEXb0mp2hgpg9PkEt/90qA3fxUH5ZE=; b=ad4oIq0vhBxh1mew/Moaem8pl7RDuiq248RgCshJgbV5rAB3OS7CYHlNKgioAIouJJBnlE9TKCIHXfSm60WKNw4o46FBb7IljChpolYvuNew0uzHBVd+riS1AgxO+BkWfItLIaP7bxYQaYjqo14W3VuMD+gT7IPGiTv5vQkH6wbKKIjgI+o0drAQ7jQyAruproHdtwqrpSptOCBO4ZNMHqBW7JvSUAzTVvdcZHS+2YuaYzocj75PTjTCxZ8x5wDdDZO8pkJwbNy94zk8hAOM4QGBSHSGlNaHFYzpptZ5fVxrwifMuI09/lCO+tfX2Ug1qcY5fT/QIZ9YVuCCAtj6dg== 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=M2x7A1w+LF04+mEXb0mp2hgpg9PkEt/90qA3fxUH5ZE=; b=Poazm7lO0pZxikagMSb3EwKEPCTZhkWLyfG107a+ps7OfgNa13LnonpmlutJOlg+g19L+yLKBkB5Vriupgk2SQaassp6oeq09ihcjG2XbvCnLJv8ZVR28moA2wENvy+JskFJ+vsakstBGyUsZxC1ylhbC8PiyH8eZaLCUim3GN6QQlFkR9iWB9Li+sRtOgJaT5w9N3Nb0AHuYnd8aefvfqrr6hoyHEHgDTp+Ok0GMmBzNz3MIKlViUPsGJ11LuxNbUd2Un/RDChJVzwLCJkzl+RqKG4QOPOZJG1kswdZet86r9dFNz7T/J71AiwP28rvbgHc0OND1d3Ej8dBQUQpyg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AS8PR01MB7526.eurprd01.prod.exchangelabs.com (2603:10a6:20b:2ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 20:23: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.021; Fri, 29 Apr 2022 20:23:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 22:22:57 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [2a0xoafhoINxjkyd3zMyOcVsjzBu7YfQ] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220429202302.996974-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a693d6ac-a553-482d-ac02-08da2a1e144f X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEtk6g9GGAGcpWuYX6sSr8f+nDDDWSIOGevys4xzaSeWzcrbsUeZuOXzgHTNo9llolRK5cUezWqPWWp9Oq3Xyradez68Pa3tifDbKU/G38U5+wQ4ZWxsdS8zMcJd/9j9b2u8SrgZnwvh/N0cvrkDgKTfrOb7JjPx9EYevPrEwDUCeQGuYaDZqTjHqqOhZaWHUcPiTEgfA2scDKlNvi1MBDe0Sxotl2nNsa0I2PpLTsv65k0XfaYLgj601eP4km4bZ2cnz6JEFICpdyCxQs9+Ec3wUU9ii9Sg/WVf5/kJyVu5JL+QevdNs/thbz8w04xJFh1Y/ZDui7se9NukA/HAVXmDnaYnBZerHJka46nHKgVzJjtFcJjJZ9C9Yz3RdXLi7RfnpTfnWHIjbia/UhP5tYQbiul3K9t1cAZYEuCZyKQaRvb4/lh+23CGmFJA83Qm16tcXDWB0hldoHeER4+fLGQi6mliTvF5cPHNVakwWx1N6lD43SJAVd5VvMfjrUnOJII/w7+RDkS7yeMAfdY9L8ArbllstPbHxEzMBMXIpJZujNl9xmt+mVVhQcYxB3/jXMp+lz2rYLPk9hwJW5FoE2DdFmF2EMDRs/DEiSZvtvKBgttiHKMG1MiRSRUQJqYgWjljZtlj3SsmJauG4TAla7GiIBvgDknBDPXlw2lFn1BLVkwzw3LXoR6hciZ+C/AVnINZyRO743f0M/6nvq7Y1LaLNI9RYuBordohrhJxuORhjzcl48X4w0U5nDhmY5qV5SialWmpI9RCk9pfeIkV6vYS X-MS-TrafficTypeDiagnostic: AS8PR01MB7526:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TzV0Sv2y3ZPAkPCei3lclsPZx8smpGoeyST7whGkzl7FcoEhwTqWmuZWNp2V+U5ZCWzkxZLdQe/kPYYPvszp0zvTxe0NOC8xZA0qUFAIYbtaDUor0DFtGxWQgq0W6E2r2y8GlhtsZMUILtuvrDIO++5Stsuuu1pzQURpLg1qqHaUTaAM846gM6mEePLdYs30i3wMg+OCyT5MbHcTPcfgyMk8WZss4hYwugpnks0jWxwgEOX3MWo0DOrxnSYTFkzIF1wWQMOkQexIRnED0e0L4qi1HNhTkwxvpSGsNgKLhQIZ6ifd9tZoYfMFj/ZRsLi11mIJlfKxaf4h0m34Mttinog+dGbWYN3Z4shqNVl5kKm/b1cki2YitSuwFWgx5ha2+8EGacLRG55CRFM1/OtCwBguC7q3Oal/OTJf9/fDzGn7xDE907aW3J3N78wQTJV79l+2/+k1unKPpmN8sgEYZLW4Dycwe4p/TSViq/4kCXIEt7Iw9NwBIizR4aPEfy+FsHCqsVFtq3g7bOmWASiJrysrTjnC9XJz9PxddMRLTNUH/fI4rKgbfNfd+fhhZbj6JXU2t8KKDJctAbCrKHv5Xg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zh0pcYIGFPzUI99Pm2ONA/Zqb/uyX98gtFilHYa3lrK20dY4k3KHxYVqo2Lu3Pi914rashSQQiiW5WZiCjCNvkeQK1M2K/R0zSs4PnbEvZQh92/YbH0CZfqzsv5L0mbVKfzheynrMRCSg8FUDixGLO02wuhqOkeBH/9EPLfpWxQte4B7XF75Tpa0ZXjpyrfT4gy2qpQ77CP5bCEsH7XGDYG9WpV/nDxEz7kmSaCRqjc/oWatsvr2/Eu5eF1IQs4nYW3+cR5pPPbhCKr0pJr+CLiWtfTVKhp9c1GHOaKc7gbl/n4T5CA+Oxge6qZUtkNrBmnHtDMaeEjXcEHDgpkYS/Ui7kc3GLr9FD6H8J09c7INUl0+Lxg6naaF3eW5FzPOD9ccPk4gVoJMXpJc9Zrc/XJK0I8yDQeYDZ1A7h420TekBx2cwyGN1RbgTH8oIAOnVw3+V+/e0X2PC+6M5CIgWrY6KZzadeQ/lurHzHLwW1WTAV1yC25SAZRy8zQd1wwipRQlqxosYcXBnvFGMjpuWNoPjA66KE0zlcpuWu6bHF4W3yrsT4U4dFUuYANBhaZxmLWo4dW0U62wD7HURxtlhQZakljTRUxmTf3jHH6qraOcUydeNR+OrY1O6LhzqVAuoYs5z9if1i5BwKNO32YyWJZEjim3tUPkh3riI8gaZzFOA78Jl8Y3CkA5u9eu0Gg8utThRPv2M7xXLJ9hvoyibwGmIhClzT1hDsdXPj1VbTxTu7rla9QG7UAQFpwOQ2crckUP1h8RLlqVHTt8JZEZUj4oYxWYeuGFe5JD7CFbRFglUu4J8f90LELi9V2wN/BqNsBGxapkmVQEfXPy5kveFfi1gnCnBpL8A6fsbMZC1zI+py7IAnN4ob8l5YAor7uPqud/t3lbS/neRgeO4lbb2WAYUFYzNN+pCzCbCNWnrmMR/hLrrcV2Rqi8IcD4dnXGVUiWoA7O3iWNvUXJy/ud/3LyViQgXd5XORC8jqER9wg3kKfHwkAzrCLJxkkFEDQrCWX7IDjBIBB4XtYuNQXmFHFj7Y8wsBt3CJtQk3XVrJBxtMqqW45TUkVaxNkXq33qesL/7VB7wmKRjacjw7tPTGau7xYka16e7Dpjkn+JqjluMPPvHnpeuwfErd9TD8cVp4vreQJgyxPEzimbv0BK7PlxGgSVNCuIbd6shIst1vM3oRYbfPX1r+sC2ORH0KINDAi4ns6B9RL8ADMj7ALpW+5cBaKbSgMpVdMG5NA8bXqi21trCBurp4exwKul7eLPqHntBJkzqlbKPPOCsCA3aIspiZ1ZmBS3DOW8UHjd2ZbmRYzJLLtafPQ3msionF0YMic2DQtl9dGTGqtDgQrl7WnPe3fgOxs62oEAovTywWacGCBnFi9/bMBkZyzYi3kFGcs8Jo9v6sDzMAwXtd38eE8GrTmmZ307jI95+zIvvdCNY/6yA2ctPKNNpKPCCxc/5ZsiSnq876QQNMZz/s7sOw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a693d6ac-a553-482d-ac02-08da2a1e144f X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 20:23:13.6394 (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: AS8PR01MB7526 Subject: [FFmpeg-devel] [PATCH 14/19] tests/Makefile: Remove unset FATE_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: oVNgOm9orJ/N Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index ea5e939cf5..ca228ae897 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -274,10 +274,10 @@ fate:: $(FATE) fate-hw: $(FATE_HW-yes) FATE += $(FATE_HW-yes) -$(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF) -$(FATE) $(FATE_TESTS-no): export EXECSUF = $(EXESUF) -$(FATE) $(FATE_TESTS-no): export HOSTEXECSUF = $(HOSTEXESUF) -$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS) +$(FATE): export PROGSUF = $(PROGSSUF) +$(FATE): export EXECSUF = $(EXESUF) +$(FATE): export HOSTEXECSUF = $(HOSTEXESUF) +$(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS) @echo "TEST $(@:fate-%=%)" $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP)' From patchwork Fri Apr 29 20:22: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: 35513 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp500705pzb; Fri, 29 Apr 2022 13:23:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHD73ENEaGLSXrf3BRmLR++bcUkW9EAJ9yz7dVKbfJqcVHxnl3azNbJTN6bhvA8aSuv7Kn X-Received: by 2002:a17:907:7b83:b0:6e8:c2c8:1f14 with SMTP id ne3-20020a1709077b8300b006e8c2c81f14mr985444ejc.356.1651263818937; Fri, 29 Apr 2022 13:23: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 l13-20020aa7d94d000000b0042146612117si6578548eds.562.2022.04.29.13.23.38; Fri, 29 Apr 2022 13:23: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="bBES7/0Y"; 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 E4FD268B2F8; Fri, 29 Apr 2022 23:23:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2067.outbound.protection.outlook.com [40.92.91.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5760D68B30C for ; Fri, 29 Apr 2022 23:23:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hgfPLqK+h/8+3S59rm6iHfpOE+L7+QumkBWfu9T7CuY4hVWo2lArPT0hQdznRo3BD8s9PTjDIsUySVgS3MdYbjEUU1qcHYnKM69IUnt3hYUyOHQYgnE4xiatV9zMym3fWKD3zObhIBOjkTvx5y0+bJbDYCxGh9Asm2hncEGgRPsrWjnAPNv76rRSH3kcCSHV9CoFTMlEz+1hVTHAIeqBrksuVKgfkZ9dOP5PCZTwhpbchQt+N3WrFGiv7m2k8cX61ej7lzAGxvVORKvR46LHqwI85bjLY+298R3QSU0123pYEIXJeWaHCd/9/oHbIB//iFADyppqXgZ9KBZJnHkoyA== 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=+w5e4DiRhQFO+yE+4J+dy6xj5EEjhBIXYwQHyMoiilc=; b=HLD3vdKmAC1fu3wvBV5NdLVo68Ci2Sg0igwgG3kMtplZc8DXZLupOAtJVFnXBfcR4y8C15++aDb8og7tSRqFs87ZVlFYYTBctqthobE1wfaKmApeTaBcmexDDKoZYtbbA4u8sDNN2OrLHShzBAwEHm8K9lVcDPt9pCmBRSyKrVuv+mkAFu869upIYWqIp0rnt7X4wQ2C89PJTNVSaeJg7N85z3F8RID+mHDwsxaWvagzn+ASApzA8nn72LLLyF75MjRb9eIeHeozD8Lre9ZpSXhswGeolVReDlg+366AMPBsNZIbae9oftW4eW54sysvPw93w7ReOB3gd6h0gHUphA== 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=+w5e4DiRhQFO+yE+4J+dy6xj5EEjhBIXYwQHyMoiilc=; b=bBES7/0YIuQfOSVFHYHbM0emgtllmkXNAWaXSt2BPZvhT0pxhL2vi5A6DjnX09J0FdSfAabjW6DsnRgbOsdVec5VHBqGZ80zSnYkdKXJK7Yw0I41Sj4zR0QNo4wZ3NcnzjqsdQHehvO4Nd2VyQpAgfRv01CEVkssNTA2VHUXj4LK056peEZtg6j2YLQzuvJoyZRhGjXHSNMEZs3ilLvPwK9ZWbUSqDc78nbALD7xUmYDSC3cGbwX7IxArfU+ITHe5jvm0pfXBvCH4FE6zavdxU0LOvd5rEzM5hu3NyUkSJyf+OXt62xPFePaGO0CjvVBn4T2hWafBhsotdr5nQ3k6Q== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AS8PR01MB7526.eurprd01.prod.exchangelabs.com (2603:10a6:20b:2ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 20:23:28 +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; Fri, 29 Apr 2022 20:23:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 22:22:58 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [qwa/vZDHh+83gDfT8/o+DT+ZZYjfclAf] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220429202302.996974-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01998636-0d87-418f-baa9-08da2a1e1e9b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViLEfi+B1v2XXjcG3a0+vLxnyZqGUmlXwgt8sUTqdhmTi2K+76yI1EsMSyNJCfJASTVBp8GtUGlrwX2f/Zo2qOO+L78qfruZjBqV8vGB36wC7w9kZB0D0GkUcbx4aIJb1ZylsYf5nPEcPMq4YOiFiKYq6+7ntZes+2/XzGumnFPsgAqQ9THIueMhM7Dg+bQgXhAaXL4wz9XvNeaP65L6iPgcPvbJ9xHZ7+HvCyfc4Dc3MMWQMGPYuCc2jZHYy5jUL4fXES9RkKAJWwKOZeg26SyxbhGj6bTcY6f5Ite7QPK/LYVET1x/xt5cNAEsi4aXdaRi/DtDr/gdWJQ94rkmwaZsCBR2k3UWRzgVdwG7CYLidFZ2dD3v8Gy6UxT6ypGQzQcnNc/augjBHsUxiUjsSju2/igX/7v7eWwwstHxAQLnrkCDuQc9OsQyFcUdTL27cS4IP9P9WX9jtpAc6yKGYCCwsILsdHbcJCNQDO8PuaakHNtkikKythAKdn8Ji06SaOxS4hR5Xwa3skJ++Z6Xb5BhBtUz22AhhgkaadLjPcrgGRdllwO+qDkIsQbpmtUYJmiBiXAhkewAGjbJlfYPAMAAaJ2qBjk2jDrXRbNz66Tb4mrOEugBSBn++LvhLXaVJqS+ANS3wpE/YzRDqEPpdqJTevtx/bbL9a8U4zYbD55Ya9BQdJlr+8NJXoODA/9rG6VJ49m4GvVCH+Bb0hRFEO/TUsdxkokZw= X-MS-TrafficTypeDiagnostic: AS8PR01MB7526:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fP1aOJ5cfuCme8rY8rE7WDAdUcyysoVhW31j7gQUptC5ht7VzijdIztC7FEjKkz38edVrxtuwkXtuF3xxCpn7OjJBo7aQSkdozRPZO3PfiUz3jPqYCZunlFMZMbJhge8kF7ShQF2Z+nmZ3H4LF/kmIsOfS2hp1NO3565yZ2ALuwjzFKsjRGcjLCsXrZ60Y51c1A1apdaNMEzPudlHHZHd42SEYQ7TX7dG3K/SgqBR9XaEtXIguK4Oo2MbVSD6+H0rS33Y9aFyVXvwberWV4DmJeA1Dnyi4iDVi2yQmrKAag+ihDaYPRjB+15BzS+sEM3Lm6olyYYJYZkp9NCIcb/5HD51Z8NfR4vlDsyIhXLqj76pugBeTHOfjqk7s7BV0KXUkXw0wus8Gxuwl/1MGrWV4VquQuWNnKMPiZEvOVv3uqkmngNmFat4zhrYlIm2pdFWwnnRhC+Y/aBZz8sksOg320RMWPUnNIHs1SF1faf4ts5rjElPt1jXRUViheipITC8pe1pLKSdtfOJrNJrBE37QlL363KE3AMEjBqgSO0pV9entoeD/8TNwhYnRV8Qnfi68/K3VorrOWQA0/khU3Ouw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 33p2PjktkMPZPXDIsYF9HMaB7zurejKDyCFa86CFyL3dWvJPvCn0X2GmaLCpFkA9BLXpnqdGY6XmADzu+P1TQT7VnGFZEl8f/N06l8rzaZ/+1ndzaWArpfheO4WVdbSgeaHEBsrZbO3wVT/2/mwExGBslpVaOw4iiyiODTR14xSzj66vr2WbdTPPfAk34X42+SOOd9dRTg4N9Eynxx9pfv1qmWmm6DEqbENAooleRqWJYwtGU/cC7hDqhD41lPNQPwXax7S6Tj2qeIJ5xBnayqQC6upOcAVAYraC+WLmP2oosKLtI5u5DSPlIIJGg+ZKq7rlUGaov8O+Nlv14i7gWbeJuF/uqKQO7Pm8CknutLXhOC4Pf/UDgGYim+NZgcX9aWME/y9BoZdG3Y6QVkSl77Q/TW5+3g//+pEmH0MFQnScq1tnssWZsaCjSgOOunfws1IT8YSZU29Ffa3dgu8uVf7/O86JcUW7YY0zw+Fz+3oKyawn6sBTwLO/EzctUelAYbb6j0r9DC2+CTYGfFR+E3PJH8T/xz3n3QNKEFO6Ey/Ax0/hUgrQJfeK9pPfrgYnpnXxuVE/X8EHkdmy7vg+ym7lIoDQF5yxrOHaieIzh0i3yU3fkYC4DXFF02S04teTwMA1v5wuoY2Kq5ymebjJe6wz2MLDy+wQMZdeOnKvitSV23R55vhr2wyk6IakDi6R7G0G9GDiG4Kri+7ES+eJciGnKmKX4gV4DUhadlz5H9x7aeUjPUmPMPq5IdYQiQpBWAcRsUwU/ymxdl7RW1V2WCqvL4NJ22+3oRtEvH9SjGSNXV7I68OfolCLm4FeBiW6j1+dSmKB6AjgPkD3nARVVp7AkLSOJgyuG0T7kctDG5c61hsqg5+GVPGTLSQU/6bYNN9NhlG9CpitUyxsYm9FlN/N7+pteYyACoD6tS8JPEJmLGZGkA1GLPLcOLyyM9lcfGHp5ScUklnTynia6rq5cN8d6uhkpExytID+jkTrG30icnXF7hKme5XuE9vPLMA/8q4VKDJXmm8wBPctBchDqaPJokTdXeKWt6X7Yb2BWfGqhRvxHoxDM0E5Ly/QojfCS5H98M5wsxPYsjmvsAbcEz/vft24U1MfD/z5Y5T9mkTBtNOlYNaDJV574WyxjmTqpQY6zDt/UtDFZkGhaOiEfk2Nz892/mXQAFzJvC57y/4cpwPaLjkLrBQ56iAD86SI5tfNF+Lm28+m+TUkw1cVqOslZm5+/KgzRt/D6hTTZeD8gT5AeL3luUOD//FdxK0JS8ueWF5VEzAwJXn9aslU8zYtazvUJ809ese0yj3y2+FLrQnlIkdLfcTfnO4vQJZi6roRyXp+m8p/tPtCIZhpguyIpnddCzssUwO0Pbz5NJKrs7qrr10ODCecweOfXxiSeJXC7K9SsNOutYrLvXBSACfhyFJxY8K3qEznZ7VBi9O/cuUsvqtVleg2z9m4iRiW X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01998636-0d87-418f-baa9-08da2a1e1e9b X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 20:23:28.1784 (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: AS8PR01MB7526 Subject: [FFmpeg-devel] [PATCH 15/19] fate/hevc: 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: JYnYJTN+l6IU Also replace define/foreach with pattern-specific variable values. Signed-off-by: Andreas Rheinhardt --- tests/fate/hevc.mak | 102 +++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 68 deletions(-) diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 3adee59e54..2f16e3a29f 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -1,4 +1,4 @@ -HEVC_SAMPLES = \ +HEVC_SAMPLES_8BIT = \ AMP_A_Samsung_4 \ AMP_A_Samsung_6 \ AMP_B_Samsung_4 \ @@ -158,23 +158,27 @@ HEVC_SAMPLES_422_10BIT = \ ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1 \ IPCM_A_RExt_NEC \ -HEVC_SAMPLES_422_10BIN = \ - Main_422_10_A_RExt_Sony_1 \ - HEVC_SAMPLES_422_10BIN_LARGE = \ Main_422_10_B_RExt_Sony_1 \ +HEVC_SAMPLES_422_10BIN = \ + Main_422_10_A_RExt_Sony_1 \ + $(if $(CONFIG_LARGE_TESTS), $(HEVC_SAMPLES_422_10BIN_LARGE)) + HEVC_SAMPLES_444_8BIT = \ QMATRIX_A_RExt_Sony_1 \ +HEVC_SAMPLES_444_12BIT_LARGE = \ + SAO_A_RExt_MediaTek_1 \ + HEVC_SAMPLES_444_12BIT = \ IPCM_B_RExt_NEC \ PERSIST_RPARAM_A_RExt_Sony_1\ PERSIST_RPARAM_A_RExt_Sony_3\ + $(if $(CONFIG_LARGE_TESTS), $(HEVC_SAMPLES_444_12BIT_LARGE)) -HEVC_SAMPLES_444_12BIT_LARGE = \ - SAO_A_RExt_MediaTek_1 \ - +FATE_HEVC_VARS := 8BIT 10BIT 422_10BIT 422_10BIN 444_8BIT 444_12BIT +$(foreach VAR,$(FATE_HEVC_VARS), $(eval HEVC_TESTS_$(VAR) := $(addprefix fate-hevc-conformance-, $(HEVC_SAMPLES_$(VAR))))) # equivalent bitstreams # AMP_D_Hisilicon_3 -- AMP_D_Hisilicon @@ -190,103 +194,65 @@ HEVC_SAMPLES_444_12BIT_LARGE = \ # PERSIST_RPARAM_A_RExt_Sony_1 (rext) -define FATE_HEVC_TEST -FATE_HEVC += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p -endef - -define FATE_HEVC_TEST_10BIT -FATE_HEVC += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p10le -vf scale -endef - -define FATE_HEVC_TEST_422_10BIT -FATE_HEVC += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv422p10le -vf scale -endef - -define FATE_HEVC_TEST_422_10BIN -FATE_HEVC += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le -vf scale -endef - -define FATE_HEVC_TEST_422_10BIN_LARGE -FATE_HEVC_LARGE += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le -vf scale -endef +$(HEVC_TESTS_8BIT): SCALE_OPTS := -pix_fmt yuv420p +$(HEVC_TESTS_444_8BIT): SCALE_OPTS := -pix_fmt yuv444p +$(HEVC_TESTS_10BIT): SCALE_OPTS := -pix_fmt yuv420p10le -vf scale +$(HEVC_TESTS_422_10BIT) $(HEVC_TESTS_422_10BIN): SCALE_OPTS := -pix_fmt yuv422p10le -vf scale +$(HEVC_TESTS_444_12BIT): SCALE_OPTS := -pix_fmt yuv444p12le -vf scale +fate-hevc-conformance-%: CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(subst fate-hevc-conformance-,,$(@)).bit $(SCALE_OPTS) +$(HEVC_TESTS_422_10BIN): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(subst fate-hevc-conformance-,,$(@)).bin $(SCALE_OPTS) -define FATE_HEVC_TEST_444_8BIT -FATE_HEVC += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p -endef - -define FATE_HEVC_TEST_444_12BIT -FATE_HEVC += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le -vf scale -endef - -define FATE_HEVC_TEST_444_12BIT_LARGE -FATE_HEVC_LARGE += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le -vf scale -endef - -$(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N)))) -$(foreach N,$(HEVC_SAMPLES_10BIT),$(eval $(call FATE_HEVC_TEST_10BIT,$(N)))) -$(foreach N,$(HEVC_SAMPLES_422_10BIT),$(eval $(call FATE_HEVC_TEST_422_10BIT,$(N)))) -$(foreach N,$(HEVC_SAMPLES_422_10BIN),$(eval $(call FATE_HEVC_TEST_422_10BIN,$(N)))) -$(foreach N,$(HEVC_SAMPLES_422_10BIN_LARGE),$(eval $(call FATE_HEVC_TEST_422_10BIN_LARGE,$(N)))) -$(foreach N,$(HEVC_SAMPLES_444_8BIT),$(eval $(call FATE_HEVC_TEST_444_8BIT,$(N)))) -$(foreach N,$(HEVC_SAMPLES_444_12BIT),$(eval $(call FATE_HEVC_TEST_444_12BIT,$(N)))) -$(foreach N,$(HEVC_SAMPLES_444_12BIT_LARGE),$(eval $(call FATE_HEVC_TEST_444_12BIT_LARGE,$(N)))) +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER) += $(HEVC_TESTS_8BIT) $(HEVC_TESTS_444_8BIT) +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER) += \ + $(HEVC_TESTS_10BIT) \ + $(HEVC_TESTS_422_10BIT) \ + $(HEVC_TESTS_422_10BIN) \ + $(HEVC_TESTS_444_12BIT) \ fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync passthrough -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc -sws_flags area+accurate_rnd+bitexact -FATE_HEVC_LARGE += fate-hevc-paramchange-yuv420p-yuv420p10 +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER LARGE_TESTS) += fate-hevc-paramchange-yuv420p-yuv420p10 tests/data/hevc-mp4.mov: TAG = GEN tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -i $(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit -c copy -flags +bitexact $(TARGET_PATH)/$@ -y 2>/dev/null -FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb +FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_PARSER HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb fate-hevc-bsf-mp4toannexb: tests/data/hevc-mp4.mov fate-hevc-bsf-mp4toannexb: CMD = md5 -i $(TARGET_PATH)/tests/data/hevc-mp4.mov -c:v copy -fflags +bitexact -f hevc fate-hevc-bsf-mp4toannexb: CMP = oneline fate-hevc-bsf-mp4toannexb: REF = 1873662a3af1848c37e4eb25722c8df9 fate-hevc-skiploopfilter: CMD = framemd5 -skip_loop_filter nokey -i $(TARGET_SAMPLES)/hevc-conformance/SAO_D_Samsung_5.bit -sws_flags bitexact -FATE_HEVC += fate-hevc-skiploopfilter - -FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC) -FATE_HEVC-$(call ALLYES, HEVC_DEMUXER HEVC_DECODER LARGE_TESTS) += $(FATE_HEVC_LARGE) +FATE_HEVC-$(call FRAMEMD5, HEVC, HEVC, HEVC_PARSER) += fate-hevc-skiploopfilter # this sample has two stsd entries and needs to reload extradata -FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-extradata-reload - +FATE_HEVC-$(call FRAMEMD5, MOV, HEVC, SCALE_FILTER) += fate-hevc-extradata-reload fate-hevc-extradata-reload: CMD = framemd5 -i $(TARGET_SAMPLES)/hevc/extradata-reload-multi-stsd.mov -sws_flags bitexact fate-hevc-paired-fields: CMD = probeframes -show_entries frame=interlaced_frame,top_field_first $(TARGET_SAMPLES)/hevc/paired_fields.hevc FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-paired-fields fate-hevc-monochrome-crop: CMD = probeframes -show_entries frame=width,height:stream=width,height $(TARGET_SAMPLES)/hevc/hevc-monochrome.hevc -FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-monochrome-crop +FATE_HEVC_FFPROBE-$(call PARSERDEMDEC, HEVC, HEVC, HEVC) += fate-hevc-monochrome-crop fate-hevc-hdr10-plus-metadata: CMD = probeframes -show_entries frame=side_data_list $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-hdr10-plus-metadata fate-hevc-hdr-vivid-metadata: CMD = probeframes -show_entries frame=side_data_list $(TARGET_SAMPLES)/hevc/hdr_vivid_h265_sample.hevc -FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-hdr-vivid-metadata +FATE_HEVC_FFPROBE-$(call PARSERDEMDEC, HEVC, HEVC, HEVC) += fate-hevc-hdr-vivid-metadata fate-hevc-dv-rpu: CMD = probeframes -show_entries frame=side_data_list -select_streams 0 -read_intervals "%+\#2" $(TARGET_SAMPLES)/hevc/dv84.mov -FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-dv-rpu +FATE_HEVC_FFPROBE-$(call DEMDEC, MOV, HEVC) += fate-hevc-dv-rpu fate-hevc-two-first-slice: CMD = threads=2 framemd5 -i $(TARGET_SAMPLES)/hevc/two_first_slice.mp4 -sws_flags bitexact -t 00:02.00 -an -FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-two-first-slice +FATE_HEVC-$(call FRAMEMD5, MOV, HEVC) += fate-hevc-two-first-slice fate-hevc-cabac-tudepth: CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc/cbf_cr_cb_TUDepth_4_circle.h265 -pix_fmt yuv444p -FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += fate-hevc-cabac-tudepth +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC) += fate-hevc-cabac-tudepth fate-hevc-small422chroma: CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc/food.hevc -pix_fmt yuv422p10le -vf scale -FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += fate-hevc-small422chroma +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER) += fate-hevc-small422chroma FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes) FATE_SAMPLES_FFPROBE += $(FATE_HEVC_FFPROBE-yes) From patchwork Fri Apr 29 20:22: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: 35514 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp500772pzb; Fri, 29 Apr 2022 13:23:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypoGOnsjGZUs+TizR/ia4QvxzK3PmUSCo6xHUhFy292k+Z2mr9yIUURTfqyl3LL5uNTMuU X-Received: by 2002:a05:6402:1385:b0:413:2bc6:4400 with SMTP id b5-20020a056402138500b004132bc64400mr1073847edv.94.1651263828879; Fri, 29 Apr 2022 13:23:48 -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 cw4-20020a170906478400b006f3a070d863si9814087ejc.710.2022.04.29.13.23.48; Fri, 29 Apr 2022 13:23:48 -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=l0p2XhSs; 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 E775F68B353; Fri, 29 Apr 2022 23:23:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2096.outbound.protection.outlook.com [40.92.91.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F97D68B2E5 for ; Fri, 29 Apr 2022 23:23:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f2WHC+OuYpt8YvJthkqs136gsldzBnnm53+Lkt9CeIBivJDbZAicSRkIS6DX2lhQIFHb5pJCxSGghhusXKJYZ7d3Hi4EY2J8x5zJJjmxSv6vQ29dXOV0DXI6tSg/vx/QC4Iwv4qUanta8FT0hAOB5EwKuLKE9dtV6a8u5G371xH8BFyfBjwe2cL2FqlPFSVJwQlgXmdFVOarpRhTsdJYqXSFwRcv8qu8tWl20QqDK0ywiVMDQnZ+Ku8u1SOYLE/DpNFBhsAmM+FgPyY92gz0pgtnnUP9+Nn4r/7SgcHXTbdjKhflpwdv+ovwQqd1kSsbrKDKVDVXM5cfn2PYqnpfHw== 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=nZ6Uq14faCMmFl0xwGPDEMun7lJ2JM/RXikR5kAVP4w=; b=GoTdx0BK5du4086qzgPa84vLB1mulpGMxV5eO9FvE96qEpikYS/t1T7NJcwwqhY3wNIKkWth0JsGelbgnA2RvOxrDK1C2BLvUbPfUnvVmxfV6m93sBHvDcfvuJxEert5wCWY8i0SBjnL0uSvVjR3qR1J1Hp2f8+xmU+U21goftOlVFMr8nwmmm+ACJGx/IuDWjkNeSUDIpq6g5MzPCR9NnaG4xRv2ZA/ssfFFCpDagDHRY0ASx/G91K78VQ2F+InqXFeaZYOPhimQKJTa3GTjCN13fM3BudumEH8YNFN8SURHp2zpnpAkST0geqF7G2fXTbQ724AWkka7e/hjuGO/g== 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=nZ6Uq14faCMmFl0xwGPDEMun7lJ2JM/RXikR5kAVP4w=; b=l0p2XhSsE3sHnGUyFhqaQqO32uf4czjXooqclHu4yMDzFiJ6ViJonJ4RE8ywPL6qIu8o0kZqAFtq3TNotpwv1tj41MICMyUkCk+fWfn3yrd2nQIJOIMs6vmCBva9gxiq8RmJ9h4jK7GaZpyC5A8KHVcBSr3fr4Vstspqymcbin+UJevV3FQI8ZWirlX9hred5/TPTsvTT+G47Nf+V3PrfI8PsrB1MyozhUyHMEhx4D5iStoi3xYSF2yZEcs12QH8qj8C92GdHQgy4gBqmW8Wkif/pnwoAhYQOUDBHgJWohTAIl7VUFPzCVCvAJCmxM0jKAyJA6tw8GNVa8oG40KLew== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AS8PR01MB7526.eurprd01.prod.exchangelabs.com (2603:10a6:20b:2ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 20:23:36 +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; Fri, 29 Apr 2022 20:23:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 22:22:59 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [AMh+TOMdEJ9EnQBYxBe0P7k3Mc0KLpHF] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220429202302.996974-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f8bc3d80-8b61-463b-0dea-08da2a1e2355 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8lfVH3dIhk3L9KlsA3mdXGtwqLMhcdbG52EYCCm3+6EEuNHZul2jux+ztLLH/C8pHe2PlCXu8rfgLZnfV1SZAG8dtwaECWJo8I1Q8Hg4ChAQdSrPa4fk4gw01MG7fCp7pkl2K2FIZoO4nAa77jcDqiy7na73OJoXBM+RW0BAmGWt1YcswkDGnKCJHvrjncoTGvY+Kw9xYJnXVtvn9t6tprY8UPoprhogp4fz/09X+qmkJn7ThV7bCZg1HI8Sn34UwtmA+JMc2NekUeuI22mvkUC/P00mjDRPK7DpoWwXV5aRcM8xjZ62/FL4m8Ify1XFPgWQZlwqdri0GQuZil8yN5DD+XI0j1FLqX9nFal/HolD66pCy1asPOmNwVGShuZb3piQF53UKbVjvnAQP8x+b59ECjvBZZ/En5Tbd1ETwWcdFhDBNRRWNiOoRo6FVi/BFfApg1H0tzuMpJYNkw5tpl6i1kbgb3gWJLC9corgJ/JxKxJEtdyxzkrBtBfg+t0hvLnWr2IuFg4ecd6YzrfR6fs+tYDRTTWsayM675RTHRUMw5Fi4wZX0+6h85l5VDXmQKP1Wet+mZ8qLF97djJmcLgnu8ySV756gQ831YYT9hVMdI5sjxMH8l+dBWcGRodlq70g2NLidLzjIJUc8dsWnSXw2U6uBJFdGXyvwaTOK01XQ== X-MS-TrafficTypeDiagnostic: AS8PR01MB7526:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V0HNGotejoxVd3w8evpuc4WgVXFFw8vJtMq8hnuKC/Sk42hz+YXv8oYxxPJNQmgeyynSR6rQfrSgLadxp4+kQYg3IX60XjVME3vd6juZLLqJow7EkDbdOCAgfDUjVj4EvHX3va3zzjvWaEctbbAzpK5WWD5kUGcE4VHxyHj6Wjb+cJfwI+wiieEyoM+Zn8xAml91XZR+cszX+zWkaxFPbVLbMS09msy9Cdd8YMVAdD9Z53cIfKVyY0kR41LJbbxqcG8n0Cyy8QswfdKXqnupDpiaCXyOwb82vDLB9YDnojBxrXZqgpXaGgix8qL4YUDaLLVVEB/+ep2GNd11azxHNhIGLwdIJuw9WMvTsuNdY/wh7U/Nkbtlbz2IxxyjWuTwTg2OBvmxvzWPaN3Igo2dJis5ODmxwEz5PnjneVGDbsa2ubksQEBfrYKIQLDcmBS21fM1h+uL9m3SfE0wICyx57YwwqsLtxAwfoLgjSWpSMH/Q78v/kL9oyTHHgDVJVXmWOvIDz5Ftf1dxWXQ3q53ywwimr6sv/Zo7YO/zInbxquAMqXoifqFlRLcfNgaWPj7Z+XviRuerVz1wYFYZh8QqQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s4Ab/YjC5HGzYfml7Cz4UNiMzeL2j01HRa6JxSI5ASAV9Vlo+FbIyyRrvIW5aTFhC9TmascXMi3LVEa8v3GE8dC4vRG+8vdsCYrCp1ZN9CG5CkTsuxYfTFNmvL0Ys8HPMCFdzpn9mmZz7Z5q4+3USwyI5Ottu9eEBWFFgxQD1M88G8kliuv3fJjb/LYisb8nHIu2M1N9xsGXoJM+eq54SdrGEqhYjBVXDfhERl5bGnwnOvO1RenkHlWcsgx7BxWdFrb5PKwnJI4RIrGV3a5ozpsFJ9Pe5VERsk2b7X1mftMA/g9jsQM8MSlYAK9Wp8ATDJ9Ue35TKCqGY5zHf6HjCArtEhe5E/w+1xjcrFGmfatiwbU3hzTvWM6sDT+EIr6KicNyzP+1RpHAx20we3yFgvg2MziT9Xz32SH99r57ZnR+sPaTDJrvE4hNLHsJepIfhAINVqUm+IG9uOtfdOg//t8faAjkcxHrL8mjJ/CgjFRw5sQimvSSfQ9Kau3wDtxpVa52kCg9Wo5oALFcBEDQD6TnX9DvgzH/HumXSCJ9KTucnHr9gOLrr+adGsFrgvw5Ga2dCrkgTa1t/7LoFua2Uhin9XUoKkdurRNpMIGKUdpHEQBFMb68XiqIFa/l+PbWyozIa3wINo9BIT/Ch4myhfm39JRs4CRaXO/mA2tK0aEWjgnp1hDLYWQDfsshquUZm1upS9I5weZ8jPPyn7zh9Z9GMHXWAuNe2QV/6tKV2TpEqO8Bu+2schelcntXSyYsKNN6eV+6YZUQd2kv3Y/elgIsxD1fiSu4A73lfznS8twKnN6fxoXj9JbSFVa21yK/B1PdFiPjmfQ8XNTiGcZoh3tELLo5xjQhyjRscBU1TIWiXm5XKCbNuieXieeI9/BieSc4iB2qJEIacg2DJyjG9DQwKcbNt6Aooqj+y6jMi3rNfu8CwtJuDbxM0PB91OZMUuCb+OaDTMy8xuvjn96wbP0A8h159k9MbskK5qDUzH0hwxP4nt8CdXIvzbbtUO82sTRRttNkqkjFL2D2H9J9vo1fMqtZDrfjZ02jUbEZgCJCHsl2e8sE2K8yH2OFLVaVu5j6N0qvc1YhtHPpXklPFnTYU27tjji2QWLAYyP9KyHG41L0lixdX8qtdtFtsvojoZpZh34JzBTdCTvic7QRDEf1AG+T6V8SZTnORdr9uTf4FyCKK+y698ItcS6SMEMijPvPbdSVeLq9nzLUD3+Hpy6EaaD5qkATGFsXTR16bxwJl6wLbTHOY0quUpKeKOFsnslG4vL30J4/4KWNC394Att2twaJP4PMlHvYTMSVxHaCPRoOlEW6bMOUGJ07ESXLHCpDNYEmmHOMBkVNjZIxWHXb4F6O+M3w8QTigLqTDqKvJv0BQ0Nu8eQW9jftH0IozZ1ReOhKgGTcM1/TQeOoiZJaouYOm3FMowsN4Qfj5yTpDkv+PDKsv/fV+Hc6aufCrURxH2MSeiXh/fYwa/0RiA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8bc3d80-8b61-463b-0dea-08da2a1e2355 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 20:23:36.6208 (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: AS8PR01MB7526 Subject: [FFmpeg-devel] [PATCH 16/19] fate/lossless-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: mFdpsl0tsapt Signed-off-by: Andreas Rheinhardt --- tests/fate/lossless-video.mak | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index a81c6e9ab0..05a8ba29e1 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -1,7 +1,7 @@ FATE_LAGARITH += fate-lagarith-rgb24 fate-lagarith-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb24.avi -FATE_LAGARITH += fate-lagarith-rgb32 +FATE_LAGARITH-$(call FRAMECRC, AVI, LAGARITH, SCALE_FILTER) += fate-lagarith-rgb32 fate-lagarith-rgb32: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb32.avi -pix_fmt bgra -vf scale FATE_LAGARITH += fate-lagarith-yuy2 @@ -19,31 +19,31 @@ fate-lagarith-ticket4119-cfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/laga fate-lagarith-ticket4119-vfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync vfr fate-lagarith-ticket4119-pass: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync passthrough -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH) -fate-lagarith: $(FATE_LAGARITH) +FATE_LAGARITH-$(call FRAMECRC, AVI, LAGARITH) += $(FATE_LAGARITH) -FATE_LOCO += fate-loco-rgb -fate-loco-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi +FATE_LOSSLESS_VIDEO += $(FATE_LAGARITH-yes) +fate-lagarith: $(FATE_LAGARITH-yes) -FATE_LOCO += fate-loco-yuy2 +FATE_LOCO-$(call FRAMECRC, AVI, LOCO) += fate-loco-rgb fate-loco-yuy2 +fate-loco-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi fate-loco-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-0.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LOCO) += $(FATE_LOCO) -fate-loco: $(FATE_LOCO) +FATE_LOSSLESS_VIDEO += $(FATE_LOCO-yes) +fate-loco: $(FATE_LOCO-yes) -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSRLE) += fate-msrle-8bit +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, MSRLE, SCALE_FILTER) += fate-msrle-8bit fate-msrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24 -vf scale -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSZH) += fate-mszh +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, MSZH) += fate-mszh fate-mszh: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/mszh-1frame.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, VBLE) += fate-vble +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, VBLE) += fate-vble fate-vble: CMD = framecrc -i $(TARGET_SAMPLES)/vble/flowers-partial-2MB.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, ZEROCODEC) += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(TARGET_SAMPLES)/zerocodec/sample-zeco.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZLIB) += fate-zlib +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, ZLIB) += fate-zlib fate-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/zlib-1frame.avi FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes) From patchwork Fri Apr 29 20:23: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: 35515 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp500838pzb; Fri, 29 Apr 2022 13:23:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoV6q0r+NrB6EV9hYQv0wNCrO0lazqOp9g2Iti4v5a8FQnSwquUzx8oOFQ3B90071jVvbl X-Received: by 2002:a05:6402:d0e:b0:413:3d99:f2d6 with SMTP id eb14-20020a0564020d0e00b004133d99f2d6mr1007816edb.189.1651263838723; Fri, 29 Apr 2022 13:23:58 -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 fr29-20020a170906891d00b006efac6c0b7csi6214107ejc.7.2022.04.29.13.23.58; Fri, 29 Apr 2022 13:23:58 -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=SY6tuzmi; 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 EE95768B341; Fri, 29 Apr 2022 23:23:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2096.outbound.protection.outlook.com [40.92.91.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82D9E68B326 for ; Fri, 29 Apr 2022 23:23:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bzZoqo7XltNcUJFM4cI9u6T1mPPp9BmNVkAnLgC4Phi+EwAScVBiIlvAWlKTUiP4UmN+tO1o4HkqpJYc5O4jm6a8SJKF1fZ7DWqUpzNMeFSzkRprO4Pbko/zBU4EkbfNhWPc2HDjxq3XFfEtpq6ECF4im5Lt3PTkM8kmu9S8N36kw03giyYTUo44+qrI2vzyYiq3RF8hUleyUxxfYet6MYBN7OjIpPdA+8l/ZjPxNBBatyhi9bkyOXvF9VB/TmarDi0+5mKqPKnMUIkAlvVST1TrX5N2QkMR1B3CtLTfkrUhrod3oM80wwM2K5Y+PBKbfyKJwJQYToK+fA3dZmlNsw== 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=AwH9fc/S7CU5Q6j1LkMLyHM+oW7keV/qNOn0SwOFUgE=; b=YYJ/YlvH65CbTx/1B2inG2/9tCEXlj1xaBsojW/N7tYVZEzJ15HHQdCNUduQ+LSV7ANO7imLgodK+xxPfNPyb7kBwWhOiQOsOgLo2YuZOEzD3rz+qmuZaGo8c7fEjCGwKTva12KdXy9SzX4XaMifd1wlJ2NH28GaqXDP4MHbqGtpNLK8BFFbQu6IsDWmrV5flqX9s512fnZE6JJrOx+s6BYR82sxaEUfSGrSIvGBPFB3m7KBEa8McxEe5uIdgKoNFMdB6hZ62p0RlziDCvK5iZnENIbY4ntIogNFJbFwiXl8OSTzS+BZ9sP3UsKJqxNVNw0kh/tCi9y1hpHU9S//vg== 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=AwH9fc/S7CU5Q6j1LkMLyHM+oW7keV/qNOn0SwOFUgE=; b=SY6tuzmi3O/rmuZgWq3AlxxnPZZqWI6WUqalinIX+IYc14rEvZdpDx4jQ1fwME1U90d83HO9SKCm0nQpGyXidKs0M/WCUxwLdU2/Ak2Y7ZpnndwJkKS7Y/G8KRjaUdGTWd1ZhcmudfyEBR2iVY+TRx5YtTtIt2RLgnHxct+R6b2wYaFOmNqKmyOLFVMoqWOhQ4VCVS8yaEvzqAb3oAvsi9OLm2ejJhRXk8C8TrEPAX0jbpUtnm8JqS1PAm7tPjVGwcj18bQdDESEZCjB3MEiZR+4Y1krHvv4eDm9iOPUKpKRtzWp+Zgs+6IbuP8DXzIi0vSgnruFDXZJ17xoRofuNQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AS8PR01MB7526.eurprd01.prod.exchangelabs.com (2603:10a6:20b:2ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 20:23: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.021; Fri, 29 Apr 2022 20:23:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 22:23:00 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [fuCko/YPH9fkHNIZ5AZu9xLpJMkuVMd4] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220429202302.996974-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee068844-3827-4db9-c6f2-08da2a1e2580 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8lfVH3dIhk3L9KlsA3mdXGtdzS6EHmGo6usID5QhLsfOT8KBcC0VYwkOMV34+jB2ig6Rn26zDobpFZdGcrHqYRZNgDuRIKStX9ic1LO8RpS3SAhPs4TAu1uljoAG3APFp0TJDN0Wf2Ig4LP7WprXjpXytuRerL7zLGkSQckAqmu5+1ifKr1b7FyWp/2prvrfO4z3rkiQH/TeFAzYpc7UuM35dB9I25SJ3DdkwkM9xOVJaEyRx8muieUlG02Uhn2uv7ysxOx78Z3H4l/zq2y8AgNAvmR0vZkm0GZluB46g5S7YEY8lnWYAfbNhFPwxeFQhefCKyOeXau+ku/A/CQcgIM0eYKMah8YiEhYwlUakOmoDCG9cmJCauU53Jat1F9Fz6zxSewHVBF0GqUhIE5f6tEtNI/Au+ILWV4ABnTvYkfrP8WEk3I6lesPsjF+K5rxfBYbl2ukkP0ADopfyvntLzimoMQxCDM3rAmJ7lePBvJWC0vTwQgasJ1Wp9815iWomVa9rdYJnHjglIWR2c3kbZj/32qV2lM8C/vYZ6OTEkwFZannvup1JTpZgMBD+LyFV0L8E5zfYPY8oBoMV3DNROlZqQVx0b66XKJLkV2IENC9G0maKVxs0+L6ZR0E78jIzBxR0xdixXFBLuuHm5hcdcR1PNPbTm6SMWIIF+2pkDIVA== X-MS-TrafficTypeDiagnostic: AS8PR01MB7526:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GokcXvvPHBA+qUikn5l+otoJV4B1KBunELPfJE1WxK9Ca3zgav6debbUZs/Lk8quP3KOe1Smm6h0bcUONb7gLq2MBe6Mni2CO4Y7KB95iEXcegCFfQFjHDvw7DIOMhFT2ojnIWlXx5UGfQQiL3kdP4OkpledGDOSH+jo2/CTv0KQpS5THrhE7bqrT62Nl8mpSeplqO2UDZ/wPtKvgKqc6R+2dboY/MQwiWZ9cQxsu/lLUciXz9j6Ng9dYcjxXXayNbQCPbNqXVEEdUkuWTEuUIZCIh31lzuCw10IRXtz2EjrTxL4EGdUyUUl1uj9FzbeAA8lndigmy58g+E/p5pJ078X3dFUy7mjjc7TinmRvAEl2JQ0I79UI5uSOlgIlohG0kLZXAqhDt9by4OpF9QUdE34VkeJFA2bBBOoGkG4/mbKrpyiXb7TbQVRPPPRSI18CrPEdN8ZU/9ucmD/v/zeeveLkOLgZZsBixOoINEMRdyE2Q6DpFvAvPk1eCFtc6V0HTcm8uY6y8M4ZQt16b6W9UQXQ6nkqKzoKZ/qc+AciUvNXd4n6Pe8crOab+4ts907XL1AIie//7Bw/k+RDaKqXQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1SPSPfsV0dDBRXyWfSUXV4o539eb8B/1UPt+jQO6N/nYUuyFJuVPM+eEndQPB56WyvcW5v7fLTdAep3A0b2PQitjyxkORJxd0VML1smSCTYMrDIZq3QXmuYdtfKoi0Fc6Vf+GQsEDJA67cgCdywWoyCi8LvNH0oBoM6UMHsEzKrz6TUuoac3dah8uGyIt0C4k/l2Qmdn/W7eitzsWbaXD+EikP1nbXFw331Rxkp2O15E69SQU9no8aeWdenUlKQfrTs1Xz4H1MVTxXWQNg0z78tIZ8PK0N8lqN5JJy2AwIXbsiUakvQv8oShfC5lhhMQJEHQFTZo4XWhZ/KPGpqyMov/8NfktPJsnq6bfivkLriZ56fp2nkyYYHgtBk3WGV+LMiRqFe6qFKYPy9EJstO0vlsYV8KEUlFo8SG+h21QhbqgNcNOTURTPefe9ntrsHgPDBbLvyT6PXSnOAp0xFGcMpjAn4O4DnmOC/CQ/y7OJ2AfjIrqBGdUxaZ0WFdMPkMjdNQ7sg2Xmaos31XO+NOo2vfe8xuf5bsUEF6tV0hkMo55KEInDPMfCcEHgwz6chDFxsNZhJF3jZ1Gnwho4xgXCYonv9krk9Cfl8cgOuBUqPE3fOcrxTrUSl2hb5KsWrepu1PR84ccbKg041I6tfScKs6V48Mh8IwKylhXPS/6uAqcWZHXt0QoUpt13Jp4iN1r+/U3FVDstk2/KurvOp7yNaPwBz/C5IVmqK0r/uxywCr5YLwNYMPVfqCBIckkZMlfNeQ0GVPbx4dNNr1t7hfw+njnYZ2de2mGG+YZZdg60Dr67/LnayeZCNGYsQrpVAumEMnG5hLpeZfCt1qunAYZ4bj2oyzu11VBaz2Nvb1WBsrwEb+O6U21vgwhug9BmKOFZAeKJrzn1XS6/tqekkpjAmrf6DFjJ8sWV7RIS5HdoWkl8H+RPxt/WcBmWPeHgsYkrwt+U21uE1/inc399Lam4xTJjYIYmsyLrlDO+obvAwV4GzrXc5E9vwfEKicoBjOXtx9k9sQOCyq+geik8uqatz+Ml6pqjpTL6Sb4PVlxglvD9opm50SeUyChvT2R6wNZtOpwgYhrM+BTD45q37jbKNKnV4XY5gDp90SwvHfSuapB4tIwrLvrfX/eyYQsK/VYke5XZMj5GYdGeZC3WC2hagxpuNgjZckOJF+STQfWUeJ0jgxA8bShoBzLYpHN4tWCpzFNybZLEITNHZMLfl+aVJEaqQheLbk3NM70OIIehM1kvUuEaTmIeNDoIprmzcz4dGr1/hQAXdr/Cmv5g1ctUdILJBSi+REu6Y4oYYtflgfkuZ3giher6unNOkZFAy0Pn6ARkZwNgJoMC9P6M/CeWrCS1ysPEM+ZabGBZD0Lhotus9k6HwtatgMIYCFPSPmc9OrHpgOrarYZ4HW2+jY8d4ER4GxK1ldFOZpOtb5PK29QxfiLd6cTMPz6ekdk8rS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee068844-3827-4db9-c6f2-08da2a1e2580 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 20:23:41.6547 (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: AS8PR01MB7526 Subject: [FFmpeg-devel] [PATCH 17/19] fate/microsoft: 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: PsQQRzRhgEfX Signed-off-by: Andreas Rheinhardt --- tests/fate/microsoft.mak | 68 +++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 639757880c..ee1a062425 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -1,7 +1,7 @@ -FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1 +FATE_MICROSOFT-$(call FRAMECRC, AVI, MSMPEG4V1) += fate-msmpeg4v1 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += fate-mss1-pal +FATE_MICROSOFT-$(call FRAMECRC, ASF, MSS1) += fate-mss1-pal fate-mss1-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv -an FATE_MSS2 += fate-mss2-pal @@ -10,80 +10,76 @@ fate-mss2-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepal.wmv FATE_MSS2 += fate-mss2-pals fate-mss2-pals: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepals.wmv -FATE_MSS2 += fate-mss2-rgb555 -fate-mss2-rgb555: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555.wmv -pix_fmt rgb555le -vf scale - -FATE_MSS2 += fate-mss2-rgb555s +FATE_MSS2-$(call FRAMECRC, ASF, MSS2, SCALE_FILTER) += fate-mss2-rgb555 fate-mss2-rgb555s +fate-mss2-rgb555: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555.wmv -pix_fmt rgb555le -vf scale fate-mss2-rgb555s: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555s.wmv -pix_fmt rgb555le -vf scale FATE_MSS2 += fate-mss2-wmv fate-mss2-wmv: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/msscreencodec.wmv -an -frames 100 -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS2) += $(FATE_MSS2) -fate-mss2: $(FATE_MSS2) +FATE_MSS2-$(call FRAMECRC, ASF, MSS2) += $(FATE_MSS2) -FATE_MTS2 += fate-mts2-xesc -fate-mts2-xesc: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/sample.xesc -pix_fmt yuv444p +FATE_MICROSOFT += $(FATE_MSS2-yes) +fate-mss2: $(FATE_MSS2-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += $(FATE_MTS2) -fate-mts2: $(FATE_MTS2) +FATE_MTS2-$(call FRAMECRC, ASF, MTS2) += fate-mts2-xesc +fate-mts2-xesc: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/sample.xesc -pix_fmt yuv444p -FATE_MSVIDEO1 += fate-msvideo1-8bit -fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 -vf scale +FATE_MICROSOFT += $(FATE_MTS2-yes) +fate-mts2: $(FATE_MTS2-yes) -FATE_MSVIDEO1 += fate-msvideo1-16bit +FATE_MSVIDEO1-$(call FRAMECRC, AVI, MSVIDEO1, SCALE_FILTER) += fate-msvideo1-8bit fate-msvideo1-16bit +fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 -vf scale fate-msvideo1-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24 -vf scale -FATE_MICROSOFT-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1) -fate-msvideo1: $(FATE_MSVIDEO1) +FATE_MICROSOFT += $(FATE_MSVIDEO1-yes) +fate-msvideo1: $(FATE_MSVIDEO1-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += fate-mts2 +FATE_MICROSOFT-$(call FRAMECRC, ASF, MTS2) += fate-mts2 fate-mts2: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/ScreenCapture.xesc -FATE_WMV3_DRM += fate-wmv3-drm-dec +FATE_WMV3_DRM-$(call FRAMECRC, ASF, WMV3) += fate-wmv3-drm-dec fate-wmv3-drm-nodec # discard last packet to avoid fails due to overread of VC-1 decoder -fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129 - -FATE_WMV3_DRM += fate-wmv3-drm-nodec +fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129 fate-wmv3-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -c:a copy -c:v copy -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV3_DRM) -fate-wmv3-drm: $(FATE_WMV3_DRM) +FATE_MICROSOFT += $(FATE_WMV3_DRM-yes) +fate-wmv3-drm: $(FATE_WMV3_DRM-yes) FATE_MICROSOFT-$(call DEMDEC, ASF, WMV2) += fate-wmv8-x8intra fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an -FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040 +FATE_VC1 += fate-vc1_sa00040 fate-vc1_sa00040: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00040.vc1 -FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00050 +FATE_VC1 += fate-vc1_sa00050 fate-vc1_sa00050: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00050.vc1 -FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10091 +FATE_VC1 += fate-vc1_sa10091 fate-vc1_sa10091: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10091.vc1 -FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10143 +FATE_VC1 += fate-vc1_sa10143 fate-vc1_sa10143: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10143.vc1 -FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021 +FATE_VC1 += fate-vc1_sa20021 fate-vc1_sa20021: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA20021.vc1 -FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_ilaced_twomv +FATE_VC1 += fate-vc1_ilaced_twomv fate-vc1_ilaced_twomv: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vc1/ilaced_twomv.vc1 -FATE_VC1-$(CONFIG_VC1T_DEMUXER) += fate-vc1test_smm0005 -fate-vc1test_smm0005: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0005.rcv +FATE_VC1-$(call FRAMECRC, VC1, VC1, VC1_PARSER EXTRACT_EXTRADATA_BSF) += $(FATE_VC1) -FATE_VC1-$(CONFIG_VC1T_DEMUXER) += fate-vc1test_smm0015 +FATE_VC1-$(call FRAMECRC, VC1T, WMV3) += fate-vc1test_smm0005 fate-vc1test_smm0015 +fate-vc1test_smm0005: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0005.rcv fate-vc1test_smm0015: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0015.rcv -FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism +FATE_VC1-$(call FRAMECRC, MOV, VC1) += fate-vc1-ism fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an -FATE_MICROSOFT-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes) +FATE_MICROSOFT += $(FATE_VC1-yes) fate-vc1: $(FATE_VC1-yes) -FATE_MICROSOFT-$(CONFIG_ASF_DEMUXER) += fate-asf-repldata +FATE_MICROSOFT-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL ASF_DEMUXER FRAMECRC_MUXER) += fate-asf-repldata fate-asf-repldata: CMD = framecrc -i $(TARGET_SAMPLES)/asf/bug821-2.asf -c copy FATE_MICROSOFT += $(FATE_MICROSOFT-yes) From patchwork Fri Apr 29 20:23: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: 35516 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp500931pzb; Fri, 29 Apr 2022 13:24:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrdqSFhOVZiP8IVh5HFMsB/AFJxBrYiBirPu0rFBlcMMREz2EgmLEZirLnEhfOlL2JKiSX X-Received: by 2002:a17:906:4fcc:b0:6e0:3269:2054 with SMTP id i12-20020a1709064fcc00b006e032692054mr929827ejw.117.1651263848478; Fri, 29 Apr 2022 13:24: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 la17-20020a170906ad9100b006f3916bcfc8si6624180ejb.142.2022.04.29.13.24.08; Fri, 29 Apr 2022 13:24: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=mWYAfRqD; 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 D0BEA68B374; Fri, 29 Apr 2022 23:23:49 +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-oln040092075065.outbound.protection.outlook.com [40.92.75.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89B4168B341 for ; Fri, 29 Apr 2022 23:23:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wa056T65cPD/hZT2V5ahyvxFWc6JXUESdi6xJ7oBwsJKVqCdjVD7rnHfDiuVIjdFA3ypQxG5yvJ05a1AIT/n5YnvtoOxefu9p4vVTk8FwmbWFUe+623W19+vGwhdVGEVS2hH+b9HO3PkBT8NteqpWC+Tv+W+VAmwpSN6bfJvTby0vazhuAHtwMlgg0Ifcdk+wWuMS+c2Bhr5Qb8AVmw1kwMpEr9045HbCUmQyM/yvFaU8M69XdNm6Lw2rrxK6Pyx6xhiJX8SEgKic1ki9Xmhg9UOhre5ueaUkD2AgB/9wDw5EgP5Wp3Ko6ffJPr7m4mGHTIBG1apq7JVlOPiDz43vA== 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=RuuHaS7+wHAjc3ls9uksun+xtojMkaFaHfiIzeXyKq8=; b=O3bkmsHWBlVCtDGXfh7jLJYEiADHHtEZjxyiLPZwA5ftP8C1fRu2B/yEPBZwr+IB+BG90ITn0e8Eh6+z/kqNhgSSXJl7BKfEsfYx9GBf8zK1UCJFwW31SPyyf4+OMAdTYXfbrDeKPFY8x9ref+UB6shIuG7IBjRNKKLL4l3FpBtGHr30UUbabximKBpW0XU7rGEYhu0nFWvR0LN8j7pdUhTjTEcOO9D3p9A0UZXCgT1yhIavRzOfg3qUa4X3LpV8GmP6HOHLRWrsmLBd/qv0esflOMu0qSLIy3xxa+zCQyMN5n96qbPmEMIijnc7GaFmjkXZaEG+3GB4ZikzkKgNlw== 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=RuuHaS7+wHAjc3ls9uksun+xtojMkaFaHfiIzeXyKq8=; b=mWYAfRqDjCS9bor1iqgPyNY+rEkfouzKEwNogKFmMc/aJwj3mmVlFkpxRijsMSGROpm7iFjH8dI4YmhM/qePit625L+PiBPrU4FvnSOqjEDeDYA753ywISIA/Ss0i3H1NO3/A4lytWzms2rNsVAr7pX5uC+qKxDQiFI3VIk6v6n5zhC2snbpu5GjirOyrW+ecQNoA1ruRLLb2ub+Bj4EQHw7fQf68RcXyNh35Mau3e3DLx/8CE2BuiF5RBzMRp4M8FsoT9Aj2+dj5iacBDoU5VX7p/4/rV+1fqg2VXRzB3p8UOnIc9u3iZvUGlV/MBJ53Qg+UQfEJBKSaAIorxxB/w== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3077.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.20; Fri, 29 Apr 2022 20:23: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.021; Fri, 29 Apr 2022 20:23:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 22:23:01 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Xj93EDg8ffyxyCQH3tcIE/GsT2uvHStB] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220429202302.996974-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0e4337c-cf5a-4038-c486-08da2a1e27d7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViLEfi+B1v2XXjcG3a0+vLcIbNHUJGmPYWu1Apvl1N/MMVxskr44FvRP+6zCX+voRzHAPTkmoMoixpEHZe3OFeaDUa1yx6frWu8KO6vPwAAd9hR0bhmhSyReJzZ1RK72a5r0oJE3/cNNl1lPgjz8Rbr/93NFwWHTvVD2jmJXWdoyOKLDSS3zvRyI+iLR4qXTw0toR5lUGjQd2khbxYa6THslQRH1QX6i5+qXBwVsusEslUSEFSVtDmNSNfTBLRDKic8p+p76jquejd0XN/YCkmDc9WKV1D1vZzBx/iBTug+OCiddaniSY20823ff9QXiM2AiotnGNWFDcNmv+qwtmktBsTHk0ju031TBDHtv7dbZIwhj1OPYGRiJa4XFd6vd135UCq5VdvitDbQ16xs/+Y4t0w1TozVYw7+A4ui8cv1gO+kaMGtB2nkVeWLsWhSeyjN3nkEp+7nvo4Pip6eG8JaAvjuSo/5bMlt1yWSAcj+RHM5uGIY45GGbSqDS1PgCdFFqdov/LzQHbxX/897SqBtjTNqPzJf9+IM5fYRZ+GrN+wY8PI1NiNpoaulNjN30sgXTQPu2qZb7WTgPqfVWyUBU2LBixoidqPUZ9eGdOKHkgu2ibQvHY9AIwfsVCoLk1F43Z9fyLpZGk6wF7Q3fW96PQTR2r49ZCYca0PhefimMbV+UjX94sqBFrV+uDx94CZPqcDw3N18CtpXSaLUa43fXfovTfgeDY= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3077:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t2gizTp5exqUMDGfsUDQBMtgiT32tK3hw/rrJZImcXSosRYm36EZ6+pLalDsDuoqYFLkKK4drwud6S2ez5kqf7W7s3yoQf7nyU7OrGAcwsVaXiSUmkwNy9OPgGH+JPRnl2smvQ+ykKTufsbPizqEOb7fkm1RYYFj8ZdzlApVZO6NsJdo9epNaAqR4ERQvi4Q++oadwC7GNXxWKlNmX/DiY/8bR54Up+PwOKIwraOw5y9YzrqfRj+sv7K4zu5Ch+HnHf/n7YgRbrwaQk4UatvPU0LCEWTvJ8vMv66V+vRQnO0eh1QScexYqU+tDXBTcH1sqzv3SLQ6lwr4zqrXohwqAbbB0GJs8Nb+RCi4REsu3ww8mdB3UCD411MPHCyQjpYYMgJiNv5cbFSgoT9xQoznNKveq0SizLhPJxdAitUn5Jo1c/NCIeJngWcn5Ca4CASXG06+KVZX2LX1xce4trUF+1i5jwTeSahNOKWHk80ZaaQ7k6FeOCDSb1RSy2/v6KHigzz/NDia1NgnYikFkmGE2G2sw2kesBB1VsUYOZmR2rwfN+KW7G2n4NAC/Ms5xrbU+GZuZcvoqbf3nvvYh/Pqw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VrH7PKfHjrpPtOYuT6U7+5PGnj9FlviNyqDcZWts/08E4iu5Q1amdaGKwQJd72fkJOyIQv9uXP79ULF6KXemfHGJ0C6EZqkNy64f9dSB89zgFX56bOcsOinqnq6CzBrF4hhGRCEbpTJ34IjOHIKEpELTjp+sro7FGmuAEgIHKuGdhLulWZWO4LqNGGwakVPphj9/2nzcFA7wZOBj5v2KhnLBhCM/ZjNpLXkAvlBHcod46RQpHaktLkFy4eWwNCZQXOPe0LISK+Uru1wza87CvfLMVqSHRmI71brvFzQ6kmGsgCD4hcXLNDKGlKq6L8kpeypG666MNiX9fOyIoOD4mu+hBNQy4zlb9oFuvFiTdAiUb1o6sqYhnCg0UakPdJVgMSUVV5xKOB8ZTEB4HaSD4vkcy9JBQnWEeSX1IOnVW+1MUs/ywNkH9mmY7Cpll+JaNxAcTSi9nz2eg1QBVkZ4YYp7O61b5rUgPoAp+7WkSNcHjWBRR439qqHmA2by0y8qxEK5pAq8AXzIVjIordPdQsQNjPHNqpaEIzv293FCqO8efgUQupHyMItmw7+ZMl8Bve98y3ZAea8Cmjc2qDsJrI439jsILYXgL992rDB0RoYQoE1ibdRnEivfI/mQvefBdmNWTpMi1hiF3IfVxRWr+EpEvG9E1uU82M1iFRFxlLVaJBmBmRAjy/7P+ipoc3xOsEA6y7IqWUvBJi8vWq+z3Zet8j257+KqQXsVckqtDYzauvU11sgnDUBDvEtVonRgJStHEJFAz5W4ZwQKzs6AtIuKKtWbdmCm7hraHDIGbeTmfirUHHVd4+zQ/LB+v4uvdqe7OQfcGNF1+7sQNSknUAtJjQuEvjoII6V0x//tqGyHgoeupmqsga3XyH4h1jW88/CVn3HFVSGomnT6AzHtYIZUrl0FCREmzLrLYYIdmaJB0KdGhaUMQrRPj5h3cYK7lbFAhzMC1//FI/4uWGRbwOJbRpQxj4N5QcTODX+6cWgoaLOfrCfjJ7X8TiG/ZMeRp4IgqQAkkpnJ8gNE3j/remJu3BwsHble3bRXFBJWGRQeP+OEvTil9da0WhtS7y+lDwbtTCyQTEUIsAcyCgZSC9xz381snpHmcDMOi8ikzLN3sGV6c9GbktWk/Y4dYutn+pgO/cwalcCIaLsw19qM6eAXwlwrgi15ZkXqYzbY02LH9Dn9ePnUg/GP00yfVP1EKZWpH0GUnzylhnm8AgkLTDw8WLbzaTlY9UKh7sV+U0Am3vw/w1aycz++4OebqqUkY76ACL9ImRMVVmxFCBUv0hCLXO3wCcYbr8Jee0KPS9EkddCT8a9fNiIzu0ojYKSPvIXgHbdIaltutu9VgWkNl2y5O5K81CbH4lqEtK+PERCt+ixCCV2Sw1ONp/YoFvyOBGr+VO3JCOO3PDHquuVPE8woooMJ4/NKkn23DgxZvRD/4KFqLHRuP2JIiKrySwN6 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0e4337c-cf5a-4038-c486-08da2a1e27d7 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 20:23:45.6873 (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: AM6PR0102MB3077 Subject: [FFmpeg-devel] [PATCH 18/19] fate/mpeg4: 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: PaIMcl+liaZW Signed-off-by: Andreas Rheinhardt --- tests/fate/mpeg4.mak | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/fate/mpeg4.mak b/tests/fate/mpeg4.mak index 05c26b9be5..4cec21c547 100644 --- a/tests/fate/mpeg4.mak +++ b/tests/fate/mpeg4.mak @@ -3,21 +3,23 @@ MPEG4_RESOLUTION_CHANGE = down-down down-up up-down up-up fate-mpeg4-resolution-change-%: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/resize_$(@:fate-mpeg4-resolution-change-%=%).h263 -sws_flags +bitexact -FATE_MPEG4-$(call DEMDEC, H263, H263) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE)) +FATE_MPEG4-$(call FRAMEMD5, M4V, MPEG4, SCALE_FILTER) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE)) fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi -FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_UNPACK_BFRAMES_BSF AVI_MUXER) += fate-mpeg4-bsf-unpack-bframes +FATE_MPEG4-$(call DEMMUX, AVI, AVI, MPEG4_UNPACK_BFRAMES_BSF) += fate-mpeg4-bsf-unpack-bframes fate-mpeg4-packed: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -vsync cfr -FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_DECODER) += fate-mpeg4-packed +FATE_MPEG4-$(call FRAMECRC, AVI, MPEG4) += fate-mpeg4-packed FATE_MPEG4-$(call ALLYES, FILE_PROTOCOL M4V_DEMUXER MPEG4_DECODER SCALE_FILTER \ RAWVIDEO_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-mpeg4-simple-studio-profile fate-mpeg4-simple-studio-profile: CMD = framecrc -bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/mpeg4_sstp_dpcm.m4v -sws_flags +accurate_rnd+bitexact -pix_fmt yuv422p10le -vf scale -FATE_MPEG4-$(call DEMDEC, M4V, MPEG4) += fate-m4v fate-m4v-cfr +FATE_MPEG4-$(call FRAMECRC, M4V, MPEG4) += fate-m4v fate-m4v: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/demo.m4v + +FATE_MPEG4-$(call FRAMECRC, M4V, MPEG4, FPS_FILTER) += fate-m4v-cfr fate-m4v-cfr: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/demo.m4v -vf fps=5 FATE_SAMPLES_AVCONV += $(FATE_MPEG4-yes) From patchwork Fri Apr 29 20:23: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: 35517 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp501005pzb; Fri, 29 Apr 2022 13:24:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3HFHs2FJLoBne8QJuVQwd82ZasWlTCwaiWUOAxseKDbruwPHps6XSJt1TCZgKYJySogCE X-Received: by 2002:a17:907:a412:b0:6f0:1071:25ac with SMTP id sg18-20020a170907a41200b006f0107125acmr954216ejc.261.1651263857483; Fri, 29 Apr 2022 13:24: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 cb16-20020a170906a45000b006e8689abd08si6617681ejb.317.2022.04.29.13.24.17; Fri, 29 Apr 2022 13:24: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="K/7azgNA"; 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 CCFE368B37A; Fri, 29 Apr 2022 23:23:56 +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-vi1eur05olkn2056.outbound.protection.outlook.com [40.92.90.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26CE868A3F4 for ; Fri, 29 Apr 2022 23:23:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HaIFD6F2RXyf+ZN/5T6EqmDl8qkf4m7jVpLNQqom3faYgLPm2ZUe77KgPK5m/67BHd2t9nO2d9LgF2ExWfX6bTamkp1jsNt5MAjI8+X/oVD8uUM2VDXhF2ZO+o8qh9ZsU561Ltrp6V43tWMSVYcTDDaKrk7b5v68XafBYNVNz+rNFUCkm7Xcj6ehwDbu10rUlN3CFUGFUW/zaenG4UoVKK8yuZOj9q+v1w98gWFMmgET7lMSn9bpJ/jZw7PZE3UKXENh7TAWudNm56GawNwamPTubQvEZJFX5IvzVRG/Hm0WHn7avnfTmdmWaH+sHIsuIhFqIQJ9chTfSTCp1d2fAQ== 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=fzkdXun9/vWOCP7mtGXbzNkglPWtE5OSI+XjsmiS/P0=; b=F+qbO4TUF+HhhnUuAH1cZSs+bMuOJ9LyKtpMhRxhY/XvKnd2TFYQgw0IbwFMVD9gDKN+0kx4lgjGXxIsQjRHHjHMjgMM5qv8drbZj1oTJTFGdzxyOeJxeywB4rOnwojdKjR6W6MLCKfcxouFDRgQs8wWFPHRSPBxXoFYExLCz72N/d61jIO1TZewO9hlfcFW8nh03SgtbdPWbJ9hmYS6EWOgT6Sih4UmLHNB+gOfEocm+Swsh74TpMl6cMRR1V3i5d5AIWbuor4RPwSIGJvbJ7uTFAAqrcBHIf5jZL5/EPdjvJglsXOe6xm9sN4aqD5/VbCeF4i0qPUYJfi8Oz0qRA== 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=fzkdXun9/vWOCP7mtGXbzNkglPWtE5OSI+XjsmiS/P0=; b=K/7azgNAnUGDJwBrZCXRnHF0FD/8hbspb6nLJIJhJm1UUJ5mCh1CRXQ5Jr+0QQU0c0kWsM6t1BorTXhMTZnA3nHFsPNjOBdtDX5UiMoHLMBQQiCDR4aTZ8z7HMOyJmTvzsAAkoi4Lgn75AV25/FVJJ9fXvIJhFfQGfnIyvwTGOMOGohtKc7TG2ldDlV09rAav67t7XsxuNEEhQgCouqMQF6Zej7inFHImm6MgTJ9AlwgKXW9X4qWbV3HpRTP82DZMwpXu9KbzFo8zugvXc6H1cgQD5gGBt7C6/JiC4O1u/nUR4Q/AJvmZKFHAAU30qljAt/OWbWZSSRnrhRRlOysQg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3077.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.20; Fri, 29 Apr 2022 20:23:48 +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; Fri, 29 Apr 2022 20:23:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 22:23:02 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [W8E/Fxz1whZ1JPIZfJ+i16JyhKYIFWRs] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220429202302.996974-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47529fa2-e7fe-486e-c0a6-08da2a1e2a8d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKyXKd2WJknYgDHtLeAPD2SZSPeTY+Zq8pyL0VD+LM4xUY2Bbp8kq0HxGDAqa/C1SgIhrbenSmyNeSugpK64gQnDg7rU/3ISwnPC1zLDIigLPS/qqz8rK73p2TtFp0KJ/2MRqOIAVHT5x4k/k3b/HLNHCVCkfuevLlKdT4B7oJ3jhMd8wn+Sswb1aGbe/hapDqcZ7f26ajaGOP5uU7Z3yWbj47MI0/xWajOelKUPmcoCzYWf6aScrZ7uyMzMZoPCBI41xJ6y/0OSsZYDZUGvi0V6nb8VAoo5q+hqHJsJ0V2K8/TasaNAuRIcTOP5SWB3ul+HTxoSjr3HFEBHY48uLwGafJ6HogqbEB36mdIObYoZcPk7K9gyDBqw25HBS50tIq/x+SpARlL73rfTEyauhnpICsIkJtjN81D/JRqhXAjyFKMbbgxMZvO01zmbmswwCrPVNETzQY/UhbtF6JjKMm52++UTDyx8MO/O/QP4HjPkdduYZ5AaB+HT8qFQilvvwENtYOInk6Q1CSjVWbUFNTFGSNoLpJWeSQnWn6VlKriFplSqPGaaDtlilk551FLSW4stdnFAZMg2VyJfsYb5dF73drnw2XZGABtwN+JzN+nW/ZSjrmYsdZwCDIcEVJ/MtvYIT31Wq91Thvz4KMS+mHIFyNoVpSQTGhZPIos25Xu+Ie/Hf7+unBQTEZIcybItli/olChtNuBsg== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3077:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: av5DJ0SD8kDO87Kjj7pKN7wCjm/enrk8R1gaF59Pkpe6UKd2SJHxiv3jzlpsURjMC44bvIW2Vkdcb8H0lOaPYx7pkN1a/BpowEz2wr7ju9I44ej+uZEG5UFbWSypolDH1Bwm4O400kXxxuSKKl0FpKRo229zELjiJA9HwGXh+jZE5uYbmZ1hJ+soYwgtfRNKYZK/3KVVDTpQOz5tiWlwaP2Hn7nRQqlaNjfGjIcfdeFtGHRtlHPe5bFqCP2WLza31esyAHVIJgUMEiLVW+FJMn2fdyeduLg3ur3MX3Y8gE4VWGCRvXioIN+wFf3K8GF2pii9seCIfCqcIND6LDD/MEOFWJfXHPGkkek3YWquKGkmtFFZz/ZHdGDiLcS+1zWYZtXReCfZMrEE0RnxskXN/EL22Qa1EabZKDZ3HKqN6D7+knFjJjeKxp/bgTL5IjVzB4z0K4s3akIN+b0bsDtgCCAxUr0GdAaTkc/tU9AWjriLpWF2UwbtMPjyGshXudfpXC+tYJ82BRh5ivtqf7jbR0gorIiQDXPMpC4HRSNmnvPACsOP9lwQPmguas+uAY0gnwmfcsxgES5uJdV1j+JsVw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2ZQVi+PQwr2uSSp7aH9JrdVQko+yemAd9mpXw+F1jLDAlgbSx/X2Du/SDtYY9ItFVt432flEWUqgGOuAxKQSe1LgyG+CkYBN4pJ80LGJqmO4EC3Gln++36zaxFXJVnPjAeihHMatue70U8G57kpQvnQG13gmS8hMvBRpb8WaJ24jKg4SxRSDDA06keo7ZS+/53rB52uayt/hve56jQUUI/QxcztA1HY4vaJaQuZbuMODWv0TjHRLfoyFk7bSM6o4uyQOG2oxUcjNT6M+efx95dhYkKHB44XdPINHxeCtoD5GAw9s8NcksNuhXSXkNU+N2B3pUAuvy45BhWJBchpC6TpvwTEBg58Q1BSMm+zAbDtFsXDR2BhhoinbdV4P/d0jVSNaUZMLMiwZT/wCFEyG+j3VJrUVkMJcZ4zpVGSw7SlBp84NBTY7hCeNyU5BQzKf3x2jYEXgc/rkTlqO/kLzaKcKzXWycHtq0cfN27Vrcx7LgtkeIQuqeX8zE3VoallVR7bw3eZvi2YhezBDRU9pwG+X1CGusC2m1/KDItFzwvwaVFf0cff2zL6CfDijfxR24BQRxKTPYYTArMIBmL4FNlxaU4yWZdSRJdShSPvJSN753wHcyKb3FvMjfvRAy3AB3ImHjHJY8QYA8GCXR6zHwCCpf+iJZOr3ucePAe+izDS1+3y+h0XQ6MgqAcwVQTDldOlAwsIWZYofN1QMnV2aK0yy6vpme3bi3ABKtJnkt3JxKXE8fZqYZCkSURHIRdsIcCvFt3NQWBhs8R6+E0XYnEHBuBohPyu/Z6kfr2NSeIHD7gzWCjdc1jegf/aEjzbPPWux8fSZnqZS62314/wv/O3max6EkXEaIisLbDEUTAqojvr5a55ZhpFm8BMEiPWkMd/htBQW3TGO4IZDRAng4bjGgK4mCd3XroGbcmBbtv4KRAjCZjOFRYlmb6XAB0XLDEfvm9wdWABTaX++9BVMBo9kFQE8X3980qeEDHeCD1rFg4FwZh2rkzfevg1kmQBrcKp+qqzGJR+qZ+hBeBOmev2IqhCeQIpLq3EXLx8e62/MjsW14YlpS6QJ0BD3azkWtbgIhYmJmPzK6nF0fwoO7qbbruGc4nXC1Ux/XGRUbqu1RcxWfhzMtNYbnmhKddqkgqUj7ytE5C/tHoQKkhfa2ls9orN5k4R5cO7amhWfc45tUF4+92fkECCGmZy2TINSoB7dswC70W2Qw39Pf26JHIdFFhg1ghMhmPpNhPTkSbfglf7jUKkeDDxj2OH632+llZycZPWBSYq0gSdtPQoXCM6EBVy6NVLKpgjFaMv2W2oH95rLg3onKZHpAsBZgmfSLkYy+oNuqYN0umq5vZHhXH/WwD8hR2KOH3Bakvyw3V+yx62PQc32yeMWaz65pKa4mplSfVtbsQk9zgsL+a2JGY4wZGPBwaMko3oLza32HRJyWmQ73bp4LHWTez/vWhESkHOo9ryP4BgM+IQl0Z1vHQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47529fa2-e7fe-486e-c0a6-08da2a1e2a8d X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 20:23:48.6585 (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: AM6PR0102MB3077 Subject: [FFmpeg-devel] [PATCH 19/19] fate/pixlet: 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: ZcUzk5t5GaQM Signed-off-by: Andreas Rheinhardt --- tests/fate/pixlet.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/pixlet.mak b/tests/fate/pixlet.mak index 7c4604cc08..524a8797c0 100644 --- a/tests/fate/pixlet.mak +++ b/tests/fate/pixlet.mak @@ -1,5 +1,5 @@ -FATE_PIXLET += fate-pixlet-rgb +FATE_PIXLET-$(call FRAMECRC, MOV, PIXLET, SCALE_FILTER) += fate-pixlet-rgb fate-pixlet-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/pixlet/pixlet_rgb.mov -an -pix_fmt yuv420p16le -vf scale -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PIXLET) += $(FATE_PIXLET) -fate-pixlet: $(FATE_PIXLET) +FATE_SAMPLES_FFMPEG += $(FATE_PIXLET-yes) +fate-pixlet: $(FATE_PIXLET-yes) From patchwork Sat Apr 30 06:25:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35520 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp707989pzb; Fri, 29 Apr 2022 23:26:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiF8efBe+rFytRaf6Xn4w13l3AHz1vz7PzDj1FOoNihpiYD1NDYhCpAvZR7jwLpp+lJISQ X-Received: by 2002:a17:907:9493:b0:6f3:9be8:237 with SMTP id dm19-20020a170907949300b006f39be80237mr2661543ejc.598.1651299964463; Fri, 29 Apr 2022 23:26:04 -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 y99-20020a50bb6c000000b00425c2de7c41si7898630ede.506.2022.04.29.23.25.53; Fri, 29 Apr 2022 23:26:04 -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=rfGxSiBN; 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 4A6A868B2D2; Sat, 30 Apr 2022 09:25:49 +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-vi1eur05olkn2032.outbound.protection.outlook.com [40.92.90.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4DDFD68B0F6 for ; Sat, 30 Apr 2022 09:25:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nYFsMUjVF5PWybaoI/P0mR9vB70u1pSHHfg2VYxCSelBu9znowC4+4oaJp9gDn7/585jeBWi6M4w3ntAvkrpgo+52uiyBj+PmntkIx4WiQV+YsYsaf7I0rfCNqwc3f+XESbn7EwbGCOipLr7rBXRzZ6ULKhM/zc+G8lILmJZWQwMZ3gj5DcLMNWGDa7EAfyrH19cANKMlnGyPRFTZnTWIr7TDV0i9VjNCN2/67iDloAavZ0CmR7GAo8HPvTRgsyF5eBEIZTkvoR0mEhiCDwROlwB7hdO5NBVQkyAxOjLnvKes6AEyacAIyJ82toRfIl7W0KAEwEZMWKE6valVBp5Aw== 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=zrLICwQyLTgTEauircI4iQnsOHZVB97quz6Fs/yHVgA=; b=O+/KhXtXuaw8KBYLvRYTBV3fZBwJMFgbhFslkIPdHr+alb00yF6aYdiUSLnalecM7fnrURjQJel+G11uoluKDvVdfKkDQJjlbOWZ+w1JDhTjtftodjzQVAhuxqkeMKNGo4a1DCh/kiZm090RCi4VtMKrAInfDcbOQcSP56qIS2b//m5CZiARkAReTbu+vvMnLP2exzvHEYk6usmy5JUa579OgzBq5uIVHVXznVkJGRXnl9Bj/DEsutqA/mGHJcjJDjSiKrpSUFSmtGj/l7lWqS3ftdcWRl/PfXZfIPN8dGIvhCeVY7AuRCYIf+0aadiL6+vGk1id/8+gJRbMgwZvpA== 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=zrLICwQyLTgTEauircI4iQnsOHZVB97quz6Fs/yHVgA=; b=rfGxSiBNcpUaFL0XJpl/LzesnbMkqADw2ivaqoDpvqVMXC4GmozYEFkI3Gf0Bw4FUwr2Cft8VslcUaqpfnkShhfyMCWA73Gi2kDii0HjSSpRUXmwlKMCObMGlzRGDb25xL/UIBawgDPjkBXQaSnj2lA37R7B38BD94MkBz9n2aIp7tBiqLQUPqmD8+LFcRRqA0DnScJfgGsXyfp6sLWXJ0YRDpuCbqEAAJxG2HqweSTiEK3MFRrhOX9r4E2otpTkOU1JZU62BYiDTGSxTm5OMz0IIx+3t+H8XwiAWAfKQrjgvBiPQ8n1UNu+YJnkfEh/rUTcMEHbCN/AP3RoFxeSQQ== 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:25: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.021; Sat, 30 Apr 2022 06:25:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Apr 2022 08:25:19 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [BrPw81kZ0+k9ZBF/fbvi8fEdlHKa5hvN] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80bbeb91-dcd7-4a75-cc15-08da2a7239ec X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSp1XYbE3vnwUBkebNAZYX6UALY1zVyxz4updc1LfeqR2NV0F9KZ07KrBD2c5Fv2hw4n4uwEKwGah/m0cYWu7vcBYuHUfU3YGSXQ0QEviXemYLtcAPJbciFCEOwiHaLULDIYLPDjZkDHqpRmuZQalSbjbSY0ak03yu+0gAO97nirWj/NX3HvAlFNk73p9xePmAlS8NfMSgM/Dng6kLhp4aObV9TMnTx61AFGeq1dyjDUAb6uweWwV+3ZYBKC6y2Ih5FS42Zet+yvb7PPeU/jvVSE1YMcILF/Ou+8czck2W3SuS3bzUz8yh7HTuDb/6nxvX/GRswv1w9m8/QX+MQrbavT0/R2LUlFcs0bLAzpvYn6s65FcBb7WomF56uGPusGVy5bdqxfSeDsI9vncQIl3ZTAs6iyhczlweQDnWtQBX3d81KGCVITWaL7is73B3pCUwfb2ZauVt9LACqnXvGBaiTOXwEDfwJE4Z6fTNZ5rQ4jP4BJn08C1K2U2WF2OaY1xjqS4LwxVAeBOkZKpqGQpWALEbmvLPE2GW8PRxVVVHzv1rX8yxIZi38RXKZXCriO0b35ntvrIsqBvtkV2UC+GM6Um9vKsuIWCNewCqX1KE8vJmX/Tx44n4RBvJy10oG5BGX/7NRzqkrr04LGqipX1m/5zS4tnTCKnq2IV/sMPG3IvWKeM9yZlHba6ClwUWJfr++GzriqztLHSXTCOthLfZ0zGdYiNy6jl8Rohe/vdfmiRaw5t5VkXrgO/K5LJmC2Tw= X-MS-TrafficTypeDiagnostic: VI1PR01MB5406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RbWTyT66Fu/N7+wQVzVzBPeZEf6JZ+GxoN7AUKVfBbAy2Hx/s++B6GC/pS79Uisiw4Ia8KBzu2l5kIAR8Gof9EK4VEe71BK4wVjvExzV4r19lpifp/JRqVvCVeXUg1F5Ng7ZsT33etZJ33V/OHPEiuN1iwVkUTGpIOSPaCVWHG+Y8UOeOjyq4EG0GSVgDt1AGPMIrzR+YNTLsinUfgzuC8co9v8hKg30/Mw8wDeth8mHGvHHR13Q5/JNxk16bQYHKuVnUoJLMtIpURfw8uan2HhxeRdXSvfK1XcdYHfNStgj77JpSeuYJWLsAVkkpzZDqQR5MnKZ4pk69GXQifekDTNf+OtpeMdwoXMY8ck3YFDALOqSYylu8KHo5hJp+tMdZwjU1soI13fk73s58V8/7kkMTR4X413P1D9qzKVBvx0j9nL1jRIZWaxJ7dsEcG9XNkypJsUHZro7dZhIgggXZAXjpRrMb1cbTa0+P3OjDPQX/pht6jcApK4KNOZhhAufprbqIcaMBV0KBOfdq79lei4WhI/pGcww+wAHXU7tOVfemyVKULItFQKfdRcVQV41sLuIy9erVtNvwBKEnLWoUA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nXNeTiklPDMj6cuI1FAXcpo80irtncuhm4FYXNAY+XCb8+h2VhZdH9zbGMhIhU3TLu2OaRHgrDqMORSk+wQ+Uwc5LiDlsaraObhRxSrlCz3eu3Q16B4bc67FUnlnfaCtJUmJi7fXgpe4wX02wecUf16YVx7XqkOK/EjYRqS5/FHtgy6UOOOlCK0YylYIxxMYrMMuhGcv9H93qmDUZBU1sfA6KGeVDM3qbxThdJgd64UuY7cTuNEQ+p3WDq6KMu6Mr4QlpXRzkOFV2Dmo34rbPv2A3/M3jjuNTF1KxvVu16Yud2SvxrmV/rKTvY0aSXv3J+QsErHHe5tTRGe8pwmIr6JalkJwnW6UeN3Tr8uwBvaZG5x86Ze2k3mQwHWK7+/+Xv0exSTbBz5iLVF3jncV/pfAUIpG1bMKMcD0+tdI2l+uCCwX0QKTCkwYx8n8E7XkCMGdM6MmcfZvwOHk5m/HZe+wL6DLHrGvXtMKJ1pb58QqFDLJSIPYPUN1Eo9VEtxB66DW/fVKdJ/QgWr30TBvNd12JxvGMxq/12tzqpvMNBF61apVVNgWOej/0pkS53h7Zpx85qhM0IjCqzBZnra8G1Yq+vKllO0bABmLplrvUSVPHltKUxMDWjmcxc+Yjpgs0Onb8wc4y5AHQSntBUnJhT/d/eiLe2X7NFDYI3HNOvisb4hipF2tY2onTVHeGflYdjCpmYn3mHOaJFhyQ7zcg73butmqeWVfbRvFseYo8UVyDeDmNzr7aEGr2ZrGfr/TH7Y5eSmke+6B3UGnsSTNQA+aYEq1zCsTYc4DHs2eBaPUVSUgFeCOYrtxA2y3QL5rROHtOtrJ+jPrngbOtgylJQizttVfSqNNxx3VGC6BJWN/LzDAuMp8MSGnHqgKFtruBZ2rx7qa3RFojEE1UXMPLbXyFxemXV058p2APqdo53FnCfd6LdFfs9/SEDyYXtz7FlNEzna3cnzvA+IAHom1ZAulVODXb7hvUXlQAL6md7nPmMMtBpPex8b9R1VpPs+Gy1+LPeT23Kl98D4wHWKny/Mr9qHdB4kaQdpTAhGoC5qAcSC68HzK72itYBLsmmviscruyEDKOkqegHAFb2cST1LQKC4wbkMQdnKHZSEop993ZvNbDSa/UjmMFq0uEcUBc9/tlEK2OoBlc0x2UK2LzYKypoW72w4/OmkJiMapGzxvIMJ96oS6Or2BUl291UfXPMmilokOX7FfDf0NyNWPv3HiPxeQhXOTqEqp6IqpZROdQkF3+hzJ5r+KZjh3H2d2rofckt4aXIJnp78QrrOM7QAqtZ5ajSBI43VCDFd18l46IOPi0e0XNFMnwiHatSRw4VRn4JfRvHsnICeIfmo05fiD5GW1xAhe6QTE8v7PMrn3eMLGqkljMZC//prtPPhuwG5rNbzR2ueKp4rCwGh7n3SM3dMn82EfcGTs2R7cpyv7H/p3IiGT5x0+y2fisnFv2rmaeZPsV2VrBUuwte7BdA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80bbeb91-dcd7-4a75-cc15-08da2a7239ec 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:25:39.8648 (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 20/24] fate/qtrle: 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: /ppxztewvkUc Signed-off-by: Andreas Rheinhardt --- tests/fate/qtrle.mak | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak index 3dd0afbd3f..3adefd2009 100644 --- a/tests/fate/qtrle.mak +++ b/tests/fate/qtrle.mak @@ -1,23 +1,26 @@ FATE_QTRLE += fate-qtrle-1bit fate-qtrle-1bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-Monochrome.mov -an -FATE_QTRLE += fate-qtrle-2bit +FATE_QTRLE_SCALE += fate-qtrle-2bit fate-qtrle-2bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 -an -vf scale -FATE_QTRLE += fate-qtrle-4bit +FATE_QTRLE_SCALE += fate-qtrle-4bit fate-qtrle-4bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an -vf scale -FATE_QTRLE += fate-qtrle-8bit +FATE_QTRLE_SCALE += fate-qtrle-8bit fate-qtrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/criticalpath-credits.mov -pix_fmt rgb24 -an -vf scale -FATE_QTRLE += fate-qtrle-16bit +FATE_QTRLE_SCALE += fate-qtrle-16bit fate-qtrle-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24 -vf scale FATE_QTRLE += fate-qtrle-24bit fate-qtrle-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov -FATE_QTRLE += fate-qtrle-32bit +FATE_QTRLE_SCALE += fate-qtrle-32bit fate-qtrle-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt bgra -vf scale -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QTRLE) += $(FATE_QTRLE) -fate-qtrle: $(FATE_QTRLE) +FATE_QTRLE-$(call FRAMECRC, MOV, QTRLE) += $(FATE_QTRLE) +FATE_QTRLE-$(call FRAMECRC, MOV, QTRLE, SCALE_FILTER) += $(FATE_QTRLE_SCALE) + +FATE_SAMPLES_FFMPEG += $(FATE_QTRLE-yes) +fate-qtrle: $(FATE_QTRLE-yes) From patchwork Sat Apr 30 06:25:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35522 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp708222pzb; Fri, 29 Apr 2022 23:26:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgSlgFRzPDt8zgdg7btrOm1SLLhwxcvZtfNUhZiUUfh3XMjr6NvLk/8feTD0lwnOU4qgGj X-Received: by 2002:a17:906:9747:b0:6f3:75e4:e099 with SMTP id o7-20020a170906974700b006f375e4e099mr2773556ejy.586.1651300014688; Fri, 29 Apr 2022 23:26:54 -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 w1-20020a170906480100b006e7fd5bfca6si7932013ejq.703.2022.04.29.23.26.36; Fri, 29 Apr 2022 23:26:54 -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=UsW2GRQ6; 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 A99EF68B326; Sat, 30 Apr 2022 09:26:29 +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 6487268B2DC for ; Sat, 30 Apr 2022 09:26:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fJMDVzdl2a9l7lUOdzchw07UxG/G/Br+WddLuUA/+wUughRmuV3Nyq6xaTOXAUou4go00VmxEYaHkdHLMR0Fgelu9Jzcj2Bkeat09yLAakAEaeEtzBKTuBQ3Hjm9LsoO1PURgiONbUaZ2RkMBIlPKxMFMupolnriZz2ZkuX5/iNd5jkw95tRE37mhTMSKyvGOXVt3TTvcaIJONDqAi1uG8wT466QoixKOG91yVViEopktrqERU+UXdy1pgMit7R2HYLVhyyB5NqqqK2xH+2gavzgq/q4KdTresJGa26mAZxP//9LteFIggttIaNJyNw1lmQEdjzvCEYlzsOlB5LS/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=myTuG2uEuE6/wGU9N5KdFRcroe0yW/8GhI2yW3TBPlM=; b=ZtoJ6pYho6kT7BaurbTwPzRojD1+QhPxuPa+/18Kt9nw6UszaxBjpBT3+VxY/NS706b+4LFpT///toTpe0WdN0M6WeTWQI4uvi95FyZswheeHcog0nc94W0XudML4yfOIeq0YE0tGMaHYrNqkezBwxq0JEJ0Ra+bB5RuE2ByKmeWlSIkpvcW5UA6SyXiZR23U3cOlNWc4+9794A98lg2IgGU6h7QyOkLCwFo3T9Epk+aulrSu2Qtzp6ADMuSd9d0eBR46+lPDaP2HVrzsV6IXdOxYA/Fco1CYy7lE/deeM+eR0T/bHgRYMY4AjqF3fuCSz6lfuXEFkZrVrl3k0pSTw== 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=myTuG2uEuE6/wGU9N5KdFRcroe0yW/8GhI2yW3TBPlM=; b=UsW2GRQ6wDcuMS71u+DBL/xjm7vn2D3COMBtFFwdidKgWx8BIzPtj6v5GMArMYxadWNk4VjeS1M0vXLhL0u8u4QvaaYNwK3fr7nm8VRAUOzPI4XFtZxtvHrJib1fVQC4Lf5aDoHb74yKMGWsTALtAcOk/dIb12hmZhTOut7j1G3+HjTTW5Ssu5IdB0PwpB8eeY3W7GYUgfDO6ZsMWVCyqonYkJNnRYy2w2P2OBN/ZMAxWVFIRQz4aqrBq8c2sqCCvd/bWOXsUV1Mob11cRNClMS+gS4yXiY+pZshH5WBzxNclxrw+nMPZrXFW1tvqBlW0MtoJ3cecfOLcdbONryIUQ== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Apr 2022 08:25:20 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [pRi73q2wmgvBJ/UJQavpCs1y817x/O/3] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77fec49c-6e1c-4619-255e-08da2a7251e8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViLEfi+B1v2W1R2oBej65dLIA5kKqBLZQ+ePWUKgFK1aYK+LhKNmgWsiYK2obud/8yMEZJ/FLP5ZYXLz0hEs5mEabV0E8WMmoliM963s6Qd8im9JvkSKofUn+lUXGiypfaG2fFyiwiYxB6BF/q99y3HcUPA3N1JCyzPZTR5EIb+eWqyo+Mtkii3RWn8ARvTxHu92asZAuIcvlEOxf2BbwRtXnti7QCMBGTDduxeHi1XO3lUikXJyTNn5mu5av1h8PukX9FWWudYElYLnLagl31i4X5+t7W66VaSsYvKLTui6dBMrRByETljVm+rY80WRwqDNbQZwHpnQvi0Qir854J3+Nrs1ag4XDTwN2cTsmMtt8PS6tuUm0ep+EDP9y2AzKEA3K/eAZ4Q6A3J98XFc9cvve38VUKGsH1W+afQFTxcsnwprcABx3GCOwVEI4uvKWosbEndg7xJ3wqJT8Fo0IIfflUMYwiNSISLk5KYV4tXy54JVmKT29PTTy9aIaGgP/pfIiPqs8dtwoWlYswgHVqye4OoWYrkOGjPZmNNpZehoR10HOUGCnwLc9cVGwiJA5ofbliYrZ6d+5wvIVmNpDEaD7pGwVBDYaq6gj6pv5c2Gqf6aFmqMp/Sdgagc2kLMPYh82JPiHue5wyQm/h7xSHdfyeNDTbUVJ/2amWnD/O7M73MIHT9OLx7JvpSAJOk7bj0QbP0Cyxb3bOzV4jFG2peGIraha9/JI= X-MS-TrafficTypeDiagnostic: VI1PR01MB5406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cspx5VuvILTBgQU6NWTjzgKWbryPdL9kI5HVEt2lYEVpzYFU5/QUkCc1J16sh8vCWZhwL1K628R5IOTP4NPupC/ifsrCwWamGq/Qa0MOtJPH7hRfscQ2ev2QxDYAzSPJAU71nM58O74svgZmEkM+B+u3VKj7EksAOODFPAaPjcKOuFdMvmYN2IYEhAU9gvhatQiPSSb2RYNVzTDIaK+QBBVLt8rwLG8F9qs4hNKnVJdjiHxizi+M+6BkY1Z/gshP36LdYtwunDlv0t7h4IDBw+1BMNypF5FJoq6FEuS1TMzA1kIjK756rD3uMi6flWjKPNUOhEhS6HD1t+80+WLK97/wwBRUYdBs/2O8aU60DtDBYPQh0jVuT2/aXk9Zjk22jik9Z5aMFgQ4/kYP3VV35Ot+F7JYbqvk+tQUBd8atd9myxQUW7vmuLrPFz+7khALs6dB+OkFMcNwbA0ga0l735krC59b+5HFxKVcycaeIHk2kOy9+tanq4jWPrtTEnQaQr+ULehbMsVK8eE2Rna0+IsZgNzRtEUcfJx4pMoS7kTfaPhiFJhMCiDFtgmAyuZP3Bx6nJYgitOwN5tUywTv4w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WDqnDWICfwkg3myEqVbamg919sZrsUAg6OzqEi0YkQ7cQPFhiaIHWV41WLrc+x+uwupZFV3FZ4gRoX61LpyQBQAXMorju5fgEoq2gRSyo7fbsr8YRNWypYnWZTlT5w7p33FMoPljivomplnowhRCviqmNLChbwRfOw+NhxC4eSOeh9+Q8EcPPFCrJrFH3URvV6wTCKS/1F5C2RU8PPTVKuD59yNY57uB7KQMhrnCj8T3non1yQr8T+M3czzvPBXxl9E8pjUXifG6nPsNxsTgyGok1xKacCSPiY2HEM93hF3ezLFShbx9pmQwW0uknxs/butvmn0oYB6Ze+ySwe72aw1LBuMDNBaYJaEUzFSIC14EmbDbCFaF/CbN8J1+LBaZrlaQLRfn0E5coTCpL84AnomTVpZrZJN5d62VX/TbTJfCZFgHPWbFfpAqUKkW0FQVHaYI4pEPHjUCg2Zv5emQ2h/V7F6H3X65ec2eLFqS14HNIWXqHbsnW/f5r9ikhRyQrsh52P71BLpx3iX2olYwiuk3ZCnOwENv/czjtIf5zSPIh2p1UEbm7gq2nWrn6XDd7tl82vIDAiyImC6MlE2dZHz17Pr9Pw2ivtgb8iFyyub0qaaJONYTOK6QwoYNvuWsfVkYitmrnWrNjYOXbOOwu6T9rjrF9ZlAozL0VFZvamOW1ZJFaGtLSyaoKjEkseztpu9tEQohJ7JMMWPf8x8wzcRKI4BicIWlReRWp3M0pzt0wyyPdvFYyanAmYGJlXEKGVghH0hS/GhFwwRrMbpTrZCH2j9vXq51bRlJ8KannrjlTLgesvC9MusFHKY0qsKDFBHjQgM8Kz2dUJ5u7UEfkA6ev079jsQog1QHynF99b1qfX1XhNlzdfZ8hUl3TuiM2jSekCKFCgOtFfhljLxByEUDBirx62oKGmRb60mNBgkCcqaKOpfnDi7OommnvO4AXhVh6vinMWBOQKuDytH+uGxieuA/HMhjwexS1BViOwTnRVuE0Wl3bP+doVsfS96kCW3doIxvyV8sGdaY9b12+00JOC70JM63hepbQXcFGgTy3Y7t68zSDulKfqRgJ5PrWdOZdwiYCLlePbUFPN2VZIwg8t7OvykdKYdjK16/i0q1xqCKeVoIwmt+5FiDZ+XbUbRCG05nnBQJzkANDt4vQCBui3WeiUAJtxBwHRiZVk8dLyHjbShEyOb015DzgWuEXmmwfo1AF5v3hh2EQN9j+naMKWqNUhowsVmrYPMNUR0pzWW4G6uiNbw08jfSyR/kspfKS6+I8PWiFEjANe9DSdN4o/ln6pv8pvpKAKIeMA8tI2dlzmUCudYWiZrVg7/3Yyhp7Ku9THy74fv0YC+n2aYlQntZ+YR/s/31xZ3xMEisxLDYdsBRvSriTO/RaT7fib4gjB5VmC98csa4uM8cfhAqbmXRP4mYyEJ3TYYDuvbooyMvJt6HmVp6OKWpyQrchtjCJXtjmugTqgY+aotR7w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77fec49c-6e1c-4619-255e-08da2a7251e8 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:12.4696 (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 21/24] tests/ref: Remove unused reference 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: ZVEa3jh3U7L3 Accidentally resurrected in fc49f22c3b735db5aaac5f98e40b7124a2be13b8 and 7711f19eda40a7fd1c8a327f1700ffdd115e1667, forgotten in 6ebc71847e21a8abaf7ff3d902cb1cf63511e7b4 and 1a6a088f7c7b164042ad16d43d05543ce1bacfa4 or never needed (filter-aemphasis). Signed-off-by: Andreas Rheinhardt --- tests/ref/acodec/adpcm_ima_qt | 4 - tests/ref/fate/acodec-aref | 4 - tests/ref/fate/filter-aemphasis | 526 ------------ tests/ref/fate/g729-0 | 1000 ---------------------- tests/ref/fate/g729-1 | 1000 ---------------------- tests/ref/fate/hapenc-hap-none | 14 - tests/ref/fate/hapenc-hapa-none | 14 - tests/ref/fate/hapenc-hapq-none | 14 - tests/ref/fate/smjpeg | 425 --------- tests/ref/vsynth/vsynth1-dnxhd_1080i | 4 - tests/ref/vsynth/vsynth1-dv_411 | 4 - tests/ref/vsynth/vsynth1-zmbv | 4 - tests/ref/vsynth/vsynth_lena-dnxhd_1080i | 4 - tests/ref/vsynth/vsynth_lena-dv_411 | 4 - tests/ref/vsynth/vsynth_lena-zmbv | 4 - tests/ref/vsynth1/cljr | 4 - tests/ref/vsynth1/yuv | 4 - tests/ref/vsynth_lena/cljr | 4 - tests/ref/vsynth_lena/huffyuv | 4 - tests/ref/vsynth_lena/yuv | 4 - 20 files changed, 3045 deletions(-) delete mode 100644 tests/ref/acodec/adpcm_ima_qt delete mode 100644 tests/ref/fate/acodec-aref delete mode 100644 tests/ref/fate/filter-aemphasis delete mode 100644 tests/ref/fate/g729-0 delete mode 100644 tests/ref/fate/g729-1 delete mode 100644 tests/ref/fate/hapenc-hap-none delete mode 100644 tests/ref/fate/hapenc-hapa-none delete mode 100644 tests/ref/fate/hapenc-hapq-none delete mode 100644 tests/ref/fate/smjpeg delete mode 100644 tests/ref/vsynth/vsynth1-dnxhd_1080i delete mode 100644 tests/ref/vsynth/vsynth1-dv_411 delete mode 100644 tests/ref/vsynth/vsynth1-zmbv delete mode 100644 tests/ref/vsynth/vsynth_lena-dnxhd_1080i delete mode 100644 tests/ref/vsynth/vsynth_lena-dv_411 delete mode 100644 tests/ref/vsynth/vsynth_lena-zmbv delete mode 100644 tests/ref/vsynth1/cljr delete mode 100644 tests/ref/vsynth1/yuv delete mode 100644 tests/ref/vsynth_lena/cljr delete mode 100644 tests/ref/vsynth_lena/huffyuv delete mode 100644 tests/ref/vsynth_lena/yuv diff --git a/tests/ref/acodec/adpcm_ima_qt b/tests/ref/acodec/adpcm_ima_qt deleted file mode 100644 index a50c30a27c..0000000000 --- a/tests/ref/acodec/adpcm_ima_qt +++ /dev/null @@ -1,4 +0,0 @@ -23cbae1182e150ebf28e0abfb9cba127 *./tests/data/acodec/adpcm_qt.aiff -281252 ./tests/data/acodec/adpcm_qt.aiff -b0fafd002c38fb70acaddfda1a31ed61 *./tests/data/adpcm_ima_qt.acodec.out.wav -stddev: 904.76 PSNR: 37.20 MAXDIFF:34029 bytes: 1058560/ 1058400 diff --git a/tests/ref/fate/acodec-aref b/tests/ref/fate/acodec-aref deleted file mode 100644 index d70876d9d9..0000000000 --- a/tests/ref/fate/acodec-aref +++ /dev/null @@ -1,4 +0,0 @@ -64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec.ref.wav -1058446 ./tests/data/acodec.ref.wav -ce524631c2ad0a40aaab46e3a80a1176 *./tests/data/acodec-16000-1.ref.wav -192046 ./tests/data/acodec-16000-1.ref.wav diff --git a/tests/ref/fate/filter-aemphasis b/tests/ref/fate/filter-aemphasis deleted file mode 100644 index 143a434972..0000000000 --- a/tests/ref/fate/filter-aemphasis +++ /dev/null @@ -1,526 +0,0 @@ -#tb 0: 1/44100 -#media_type 0: audio -#codec_id 0: pcm_s16le -#sample_rate 0: 44100 -0, 0, 0, 1024, 4096, 0xb9c5fefd -0, 1024, 1024, 1024, 4096, 0xb2ae0a90 -0, 2048, 2048, 1024, 4096, 0x97e6e9f3 -0, 3072, 3072, 1024, 4096, 0x5837f26f -0, 4096, 4096, 1024, 4096, 0x71500376 -0, 5120, 5120, 1024, 4096, 0xb4650378 -0, 6144, 6144, 1024, 4096, 0xd261f5b1 -0, 7168, 7168, 1024, 4096, 0x3038f3fd -0, 8192, 8192, 1024, 4096, 0x8e1908c6 -0, 9216, 9216, 1024, 4096, 0x1d6bfd33 -0, 10240, 10240, 1024, 4096, 0x7036f23f -0, 11264, 11264, 1024, 4096, 0xaf73e9a1 -0, 12288, 12288, 1024, 4096, 0x0ba70404 -0, 13312, 13312, 1024, 4096, 0xd34bf249 -0, 14336, 14336, 1024, 4096, 0x0c88fc2b -0, 15360, 15360, 1024, 4096, 0x55ebf9cf -0, 16384, 16384, 1024, 4096, 0xc16df0bd -0, 17408, 17408, 1024, 4096, 0xa635eac5 -0, 18432, 18432, 1024, 4096, 0xb41d059e -0, 19456, 19456, 1024, 4096, 0xa905f4d3 -0, 20480, 20480, 1024, 4096, 0x2736f1fb -0, 21504, 21504, 1024, 4096, 0x1a89f007 -0, 22528, 22528, 1024, 4096, 0x81d1fdab -0, 23552, 23552, 1024, 4096, 0x6156f97d -0, 24576, 24576, 1024, 4096, 0x1971ec89 -0, 25600, 25600, 1024, 4096, 0xdca1ec4f -0, 26624, 26624, 1024, 4096, 0x116ffcf5 -0, 27648, 27648, 1024, 4096, 0xc391fdc9 -0, 28672, 28672, 1024, 4096, 0x85e0ef45 -0, 29696, 29696, 1024, 4096, 0x81d3012c -0, 30720, 30720, 1024, 4096, 0x403ef11b -0, 31744, 31744, 1024, 4096, 0x3ca6f16d -0, 32768, 32768, 1024, 4096, 0x6775feb1 -0, 33792, 33792, 1024, 4096, 0xb2ae0a90 -0, 34816, 34816, 1024, 4096, 0x97e6e9f3 -0, 35840, 35840, 1024, 4096, 0x5837f26f -0, 36864, 36864, 1024, 4096, 0x71500376 -0, 37888, 37888, 1024, 4096, 0xb4650378 -0, 38912, 38912, 1024, 4096, 0xd261f5b1 -0, 39936, 39936, 1024, 4096, 0x3038f3fd -0, 40960, 40960, 1024, 4096, 0x8e1908c6 -0, 41984, 41984, 1024, 4096, 0x1d6bfd33 -0, 43008, 43008, 1024, 4096, 0x7036f23f -0, 44032, 44032, 1024, 4096, 0xabb8fbdb -0, 45056, 45056, 1024, 4096, 0x8980f03f -0, 46080, 46080, 1024, 4096, 0xc5a0f4ed -0, 47104, 47104, 1024, 4096, 0x04ac0314 -0, 48128, 48128, 1024, 4096, 0xfdd0dca7 -0, 49152, 49152, 1024, 4096, 0x799bf1fd -0, 50176, 50176, 1024, 4096, 0xbaa9fdfd -0, 51200, 51200, 1024, 4096, 0xeb7cf571 -0, 52224, 52224, 1024, 4096, 0xe33b0e5a -0, 53248, 53248, 1024, 4096, 0x8017f117 -0, 54272, 54272, 1024, 4096, 0x5fccf35b -0, 55296, 55296, 1024, 4096, 0xbd69f9cb -0, 56320, 56320, 1024, 4096, 0x4d09f905 -0, 57344, 57344, 1024, 4096, 0xfa53f185 -0, 58368, 58368, 1024, 4096, 0x35b907e4 -0, 59392, 59392, 1024, 4096, 0xf639fedb -0, 60416, 60416, 1024, 4096, 0x1e58f771 -0, 61440, 61440, 1024, 4096, 0xb13d18d4 -0, 62464, 62464, 1024, 4096, 0xc7930842 -0, 63488, 63488, 1024, 4096, 0x1b4702d4 -0, 64512, 64512, 1024, 4096, 0xad75dd27 -0, 65536, 65536, 1024, 4096, 0x9a1ceb7b -0, 66560, 66560, 1024, 4096, 0xead809ac -0, 67584, 67584, 1024, 4096, 0xbdaf1b5a -0, 68608, 68608, 1024, 4096, 0xa90a00a6 -0, 69632, 69632, 1024, 4096, 0xb39f0d0a -0, 70656, 70656, 1024, 4096, 0xbaf60950 -0, 71680, 71680, 1024, 4096, 0x57d3eb53 -0, 72704, 72704, 1024, 4096, 0x8a77f7ff -0, 73728, 73728, 1024, 4096, 0xd2bfe3b9 -0, 74752, 74752, 1024, 4096, 0xd4c5e287 -0, 75776, 75776, 1024, 4096, 0x8b940480 -0, 76800, 76800, 1024, 4096, 0x63a9134e -0, 77824, 77824, 1024, 4096, 0x2215ee4d -0, 78848, 78848, 1024, 4096, 0x8777f743 -0, 79872, 79872, 1024, 4096, 0x633e05ac -0, 80896, 80896, 1024, 4096, 0x3b1ee685 -0, 81920, 81920, 1024, 4096, 0x57d30238 -0, 82944, 82944, 1024, 4096, 0xfb241180 -0, 83968, 83968, 1024, 4096, 0x733aea25 -0, 84992, 84992, 1024, 4096, 0x1677ea57 -0, 86016, 86016, 1024, 4096, 0xdf5fd6d7 -0, 87040, 87040, 1024, 4096, 0x36520bca -0, 88064, 88064, 1024, 4096, 0x1e860a06 -0, 89088, 89088, 1024, 4096, 0x3305428c -0, 90112, 90112, 1024, 4096, 0xe1a8008c -0, 91136, 91136, 1024, 4096, 0xd81ff15f -0, 92160, 92160, 1024, 4096, 0x0ccad2e7 -0, 93184, 93184, 1024, 4096, 0xc613bf29 -0, 94208, 94208, 1024, 4096, 0x5411ef73 -0, 95232, 95232, 1024, 4096, 0x51f7e01b -0, 96256, 96256, 1024, 4096, 0x23d1ee5b -0, 97280, 97280, 1024, 4096, 0xbc9721e2 -0, 98304, 98304, 1024, 4096, 0x0d49c94b -0, 99328, 99328, 1024, 4096, 0xa102d963 -0, 100352, 100352, 1024, 4096, 0x5fd8fe95 -0, 101376, 101376, 1024, 4096, 0xd8c738e0 -0, 102400, 102400, 1024, 4096, 0xa9882686 -0, 103424, 103424, 1024, 4096, 0xfa30c4b1 -0, 104448, 104448, 1024, 4096, 0x76ecdb31 -0, 105472, 105472, 1024, 4096, 0x540ccff9 -0, 106496, 106496, 1024, 4096, 0xb365cf5f -0, 107520, 107520, 1024, 4096, 0x3ab51dcc -0, 108544, 108544, 1024, 4096, 0x266fd553 -0, 109568, 109568, 1024, 4096, 0xdac42f58 -0, 110592, 110592, 1024, 4096, 0x3ab23628 -0, 111616, 111616, 1024, 4096, 0x94c9a8bf -0, 112640, 112640, 1024, 4096, 0x7ba5ff41 -0, 113664, 113664, 1024, 4096, 0xc6bfd5db -0, 114688, 114688, 1024, 4096, 0x6b9ef98f -0, 115712, 115712, 1024, 4096, 0xe5621a02 -0, 116736, 116736, 1024, 4096, 0xeedd28ec -0, 117760, 117760, 1024, 4096, 0xddf5e045 -0, 118784, 118784, 1024, 4096, 0x49f0e0a9 -0, 119808, 119808, 1024, 4096, 0xd18f0ca0 -0, 120832, 120832, 1024, 4096, 0xa0fa00c6 -0, 121856, 121856, 1024, 4096, 0x9e406e6c -0, 122880, 122880, 1024, 4096, 0x1a3f23bc -0, 123904, 123904, 1024, 4096, 0xcbf409d0 -0, 124928, 124928, 1024, 4096, 0x499b3ac8 -0, 125952, 125952, 1024, 4096, 0x2ef93980 -0, 126976, 126976, 1024, 4096, 0x83092bfa -0, 128000, 128000, 1024, 4096, 0x4838093a -0, 129024, 129024, 1024, 4096, 0xd1bff209 -0, 130048, 130048, 1024, 4096, 0xdef04f12 -0, 131072, 131072, 1024, 4096, 0x130dd787 -0, 132096, 132096, 1024, 4096, 0xc8621030 -0, 133120, 133120, 1024, 4096, 0x1b2bf867 -0, 134144, 134144, 1024, 4096, 0x01220341 -0, 135168, 135168, 1024, 4096, 0x7c8dfdb1 -0, 136192, 136192, 1024, 4096, 0xe81df813 -0, 137216, 137216, 1024, 4096, 0xf820fe8d -0, 138240, 138240, 1024, 4096, 0x1f9dfe49 -0, 139264, 139264, 1024, 4096, 0x2f84f144 -0, 140288, 140288, 1024, 4096, 0xab9deec8 -0, 141312, 141312, 1024, 4096, 0x7d7bf5b9 -0, 142336, 142336, 1024, 4096, 0xbecff5ea -0, 143360, 143360, 1024, 4096, 0x2872e5c0 -0, 144384, 144384, 1024, 4096, 0x6e2ff713 -0, 145408, 145408, 1024, 4096, 0x0b2df757 -0, 146432, 146432, 1024, 4096, 0x5030fa0a -0, 147456, 147456, 1024, 4096, 0xb5b5f3da -0, 148480, 148480, 1024, 4096, 0xce4cf9a6 -0, 149504, 149504, 1024, 4096, 0x9eacf61f -0, 150528, 150528, 1024, 4096, 0x3bfff549 -0, 151552, 151552, 1024, 4096, 0x4eeae60a -0, 152576, 152576, 1024, 4096, 0x188ef258 -0, 153600, 153600, 1024, 4096, 0xb546f30d -0, 154624, 154624, 1024, 4096, 0x0a84e6f8 -0, 155648, 155648, 1024, 4096, 0xe7b0ee27 -0, 156672, 156672, 1024, 4096, 0x04d0f6ee -0, 157696, 157696, 1024, 4096, 0x09fa042a -0, 158720, 158720, 1024, 4096, 0x5a3cf418 -0, 159744, 159744, 1024, 4096, 0x89d8017f -0, 160768, 160768, 1024, 4096, 0x64eb0320 -0, 161792, 161792, 1024, 4096, 0xe40df279 -0, 162816, 162816, 1024, 4096, 0x4dc4fd25 -0, 163840, 163840, 1024, 4096, 0x466af97c -0, 164864, 164864, 1024, 4096, 0x7306f4e2 -0, 165888, 165888, 1024, 4096, 0x9782eda4 -0, 166912, 166912, 1024, 4096, 0x3635fad8 -0, 167936, 167936, 1024, 4096, 0x3344eabe -0, 168960, 168960, 1024, 4096, 0x9143fda0 -0, 169984, 169984, 1024, 4096, 0x33e7eb7f -0, 171008, 171008, 1024, 4096, 0x4ca0e947 -0, 172032, 172032, 1024, 4096, 0x5b1bf80d -0, 173056, 173056, 1024, 4096, 0xbb15eab7 -0, 174080, 174080, 1024, 4096, 0xd800f7cb -0, 175104, 175104, 1024, 4096, 0xd3d4e960 -0, 176128, 176128, 1024, 4096, 0x2fc30f2f -0, 177152, 177152, 1024, 4096, 0xb410f092 -0, 178176, 178176, 1024, 4096, 0x4350fddf -0, 179200, 179200, 1024, 4096, 0x477a07c6 -0, 180224, 180224, 1024, 4096, 0x9d48ed59 -0, 181248, 181248, 1024, 4096, 0xd6ae02a8 -0, 182272, 182272, 1024, 4096, 0x206be433 -0, 183296, 183296, 1024, 4096, 0xf465fc54 -0, 184320, 184320, 1024, 4096, 0x745dacb9 -0, 185344, 185344, 1024, 4096, 0x3783e765 -0, 186368, 186368, 1024, 4096, 0x479feb48 -0, 187392, 187392, 1024, 4096, 0x34f2050f -0, 188416, 188416, 1024, 4096, 0x9df1f441 -0, 189440, 189440, 1024, 4096, 0x1864f225 -0, 190464, 190464, 1024, 4096, 0xebacf084 -0, 191488, 191488, 1024, 4096, 0xaa14f082 -0, 192512, 192512, 1024, 4096, 0xbac10f8b -0, 193536, 193536, 1024, 4096, 0xa4520210 -0, 194560, 194560, 1024, 4096, 0xfee4f8c3 -0, 195584, 195584, 1024, 4096, 0xadf5e4c2 -0, 196608, 196608, 1024, 4096, 0x7bf20584 -0, 197632, 197632, 1024, 4096, 0x541debf5 -0, 198656, 198656, 1024, 4096, 0x9a350796 -0, 199680, 199680, 1024, 4096, 0x1388fa83 -0, 200704, 200704, 1024, 4096, 0x9839b0c2 -0, 201728, 201728, 1024, 4096, 0xfc9afff0 -0, 202752, 202752, 1024, 4096, 0x73100a7c -0, 203776, 203776, 1024, 4096, 0xb56df070 -0, 204800, 204800, 1024, 4096, 0x71d8efa7 -0, 205824, 205824, 1024, 4096, 0xde800412 -0, 206848, 206848, 1024, 4096, 0x7bf7f840 -0, 207872, 207872, 1024, 4096, 0x1480044d -0, 208896, 208896, 1024, 4096, 0x60201217 -0, 209920, 209920, 1024, 4096, 0xb410f092 -0, 210944, 210944, 1024, 4096, 0x4350fddf -0, 211968, 211968, 1024, 4096, 0x477a07c6 -0, 212992, 212992, 1024, 4096, 0x9d48ed59 -0, 214016, 214016, 1024, 4096, 0xd6ae02a8 -0, 215040, 215040, 1024, 4096, 0x206be433 -0, 216064, 216064, 1024, 4096, 0xf465fc54 -0, 217088, 217088, 1024, 4096, 0x745dacb9 -0, 218112, 218112, 1024, 4096, 0x3783e765 -0, 219136, 219136, 1024, 4096, 0x479feb48 -0, 220160, 220160, 1024, 4096, 0x34f2050f -0, 221184, 221184, 1024, 4096, 0x9df1f441 -0, 222208, 222208, 1024, 4096, 0x1864f225 -0, 223232, 223232, 1024, 4096, 0xebacf084 -0, 224256, 224256, 1024, 4096, 0xaa14f082 -0, 225280, 225280, 1024, 4096, 0xbac10f8b -0, 226304, 226304, 1024, 4096, 0xa4520210 -0, 227328, 227328, 1024, 4096, 0xfee4f8c3 -0, 228352, 228352, 1024, 4096, 0xadf5e4c2 -0, 229376, 229376, 1024, 4096, 0x7bf20584 -0, 230400, 230400, 1024, 4096, 0x541debf5 -0, 231424, 231424, 1024, 4096, 0x9a350796 -0, 232448, 232448, 1024, 4096, 0x1388fa83 -0, 233472, 233472, 1024, 4096, 0x9839b0c2 -0, 234496, 234496, 1024, 4096, 0xfc9afff0 -0, 235520, 235520, 1024, 4096, 0x73100a7c -0, 236544, 236544, 1024, 4096, 0xb56df070 -0, 237568, 237568, 1024, 4096, 0x71d8efa7 -0, 238592, 238592, 1024, 4096, 0xde800412 -0, 239616, 239616, 1024, 4096, 0x7bf7f840 -0, 240640, 240640, 1024, 4096, 0x1480044d -0, 241664, 241664, 1024, 4096, 0x60201217 -0, 242688, 242688, 1024, 4096, 0xb410f092 -0, 243712, 243712, 1024, 4096, 0x4350fddf -0, 244736, 244736, 1024, 4096, 0x477a07c6 -0, 245760, 245760, 1024, 4096, 0x9d48ed59 -0, 246784, 246784, 1024, 4096, 0xd6ae02a8 -0, 247808, 247808, 1024, 4096, 0x206be433 -0, 248832, 248832, 1024, 4096, 0xf465fc54 -0, 249856, 249856, 1024, 4096, 0x745dacb9 -0, 250880, 250880, 1024, 4096, 0x3783e765 -0, 251904, 251904, 1024, 4096, 0x479feb48 -0, 252928, 252928, 1024, 4096, 0x34f2050f -0, 253952, 253952, 1024, 4096, 0x9df1f441 -0, 254976, 254976, 1024, 4096, 0x1864f225 -0, 256000, 256000, 1024, 4096, 0xebacf084 -0, 257024, 257024, 1024, 4096, 0xaa14f082 -0, 258048, 258048, 1024, 4096, 0xbac10f8b -0, 259072, 259072, 1024, 4096, 0xa4520210 -0, 260096, 260096, 1024, 4096, 0xfee4f8c3 -0, 261120, 261120, 1024, 4096, 0xadf5e4c2 -0, 262144, 262144, 1024, 4096, 0x7bf20584 -0, 263168, 263168, 1024, 4096, 0x541debf5 -0, 264192, 264192, 408, 1632, 0xadd02d39 -#tb 0: 1/44100 -#media_type 0: audio -#codec_id 0: pcm_s16le -#sample_rate 0: 44100 -0, 0, 0, 1024, 4096, 0xfd510c8e -0, 1024, 1024, 1024, 4096, 0x09dcf895 -0, 2048, 2048, 1024, 4096, 0xd8cbe29f -0, 3072, 3072, 1024, 4096, 0xefcffb51 -0, 4096, 4096, 1024, 4096, 0xa3840ebe -0, 5120, 5120, 1024, 4096, 0xfcf0f60f -0, 6144, 6144, 1024, 4096, 0x3d82f4ad -0, 7168, 7168, 1024, 4096, 0x17960344 -0, 8192, 8192, 1024, 4096, 0xdecbf6f9 -0, 9216, 9216, 1024, 4096, 0x783d000e -0, 10240, 10240, 1024, 4096, 0xea4607fe -0, 11264, 11264, 1024, 4096, 0xabc7f8ad -0, 12288, 12288, 1024, 4096, 0xda22f07d -0, 13312, 13312, 1024, 4096, 0xbcebfc6b -0, 14336, 14336, 1024, 4096, 0xc7020a20 -0, 15360, 15360, 1024, 4096, 0xfa28f94b -0, 16384, 16384, 1024, 4096, 0x926ee3b5 -0, 17408, 17408, 1024, 4096, 0x161cf985 -0, 18432, 18432, 1024, 4096, 0x40e909ce -0, 19456, 19456, 1024, 4096, 0x1bf8f2ef -0, 20480, 20480, 1024, 4096, 0x322fe983 -0, 21504, 21504, 1024, 4096, 0xead2fe3f -0, 22528, 22528, 1024, 4096, 0xcb51fb99 -0, 23552, 23552, 1024, 4096, 0xd430e117 -0, 24576, 24576, 1024, 4096, 0x3d72f74f -0, 25600, 25600, 1024, 4096, 0x12b1f269 -0, 26624, 26624, 1024, 4096, 0x0469e035 -0, 27648, 27648, 1024, 4096, 0xd164f5bf -0, 28672, 28672, 1024, 4096, 0xa6f803aa -0, 29696, 29696, 1024, 4096, 0x3569f3e9 -0, 30720, 30720, 1024, 4096, 0x8662ec45 -0, 31744, 31744, 1024, 4096, 0x92fdfeb7 -0, 32768, 32768, 1024, 4096, 0x915f12ce -0, 33792, 33792, 1024, 4096, 0x09dcf895 -0, 34816, 34816, 1024, 4096, 0xd8cbe29f -0, 35840, 35840, 1024, 4096, 0xefcffb51 -0, 36864, 36864, 1024, 4096, 0xa3840ebe -0, 37888, 37888, 1024, 4096, 0xfcf0f60f -0, 38912, 38912, 1024, 4096, 0x3d82f4ad -0, 39936, 39936, 1024, 4096, 0x17960344 -0, 40960, 40960, 1024, 4096, 0xdecbf6f9 -0, 41984, 41984, 1024, 4096, 0x783d000e -0, 43008, 43008, 1024, 4096, 0xea4607fe -0, 44032, 44032, 1024, 4096, 0x3e840b8a -0, 45056, 45056, 1024, 4096, 0x45d30e80 -0, 46080, 46080, 1024, 4096, 0xc31bef4f -0, 47104, 47104, 1024, 4096, 0x8b1302e4 -0, 48128, 48128, 1024, 4096, 0x0b21144e -0, 49152, 49152, 1024, 4096, 0xb873e7b1 -0, 50176, 50176, 1024, 4096, 0x914e07ee -0, 51200, 51200, 1024, 4096, 0x7e9dfc37 -0, 52224, 52224, 1024, 4096, 0x8255f9b7 -0, 53248, 53248, 1024, 4096, 0x98a7ebeb -0, 54272, 54272, 1024, 4096, 0xf438eeb1 -0, 55296, 55296, 1024, 4096, 0x31f40542 -0, 56320, 56320, 1024, 4096, 0x5fb7eb35 -0, 57344, 57344, 1024, 4096, 0xe9220582 -0, 58368, 58368, 1024, 4096, 0xf1a80e3a -0, 59392, 59392, 1024, 4096, 0xe8ff0f14 -0, 60416, 60416, 1024, 4096, 0x48980ac2 -0, 61440, 61440, 1024, 4096, 0x98d9ffdd -0, 62464, 62464, 1024, 4096, 0x6db8f2f5 -0, 63488, 63488, 1024, 4096, 0x892f06fa -0, 64512, 64512, 1024, 4096, 0xa8defbcb -0, 65536, 65536, 1024, 4096, 0xd39d0f38 -0, 66560, 66560, 1024, 4096, 0xe9bef09b -0, 67584, 67584, 1024, 4096, 0xa930fd67 -0, 68608, 68608, 1024, 4096, 0x78cc1e42 -0, 69632, 69632, 1024, 4096, 0x7a2eeeeb -0, 70656, 70656, 1024, 4096, 0xdf660c6a -0, 71680, 71680, 1024, 4096, 0x00ff0240 -0, 72704, 72704, 1024, 4096, 0x421dd4a5 -0, 73728, 73728, 1024, 4096, 0x7abdd0a3 -0, 74752, 74752, 1024, 4096, 0x172e2578 -0, 75776, 75776, 1024, 4096, 0x24b5e26d -0, 76800, 76800, 1024, 4096, 0xaf3e136c -0, 77824, 77824, 1024, 4096, 0xb1ccf1dd -0, 78848, 78848, 1024, 4096, 0xd08ef9f9 -0, 79872, 79872, 1024, 4096, 0x76c415f8 -0, 80896, 80896, 1024, 4096, 0x0269f63f -0, 81920, 81920, 1024, 4096, 0xe65f07fe -0, 82944, 82944, 1024, 4096, 0xc9831ccc -0, 83968, 83968, 1024, 4096, 0x6907f72b -0, 84992, 84992, 1024, 4096, 0x9cfae861 -0, 86016, 86016, 1024, 4096, 0x2ed7fbbf -0, 87040, 87040, 1024, 4096, 0x3b1718f0 -0, 88064, 88064, 1024, 4096, 0xe066fe41 -0, 89088, 89088, 1024, 4096, 0xf4fee887 -0, 90112, 90112, 1024, 4096, 0xc0220baa -0, 91136, 91136, 1024, 4096, 0x32abcc4b -0, 92160, 92160, 1024, 4096, 0x96dbc677 -0, 93184, 93184, 1024, 4096, 0x1b72dd23 -0, 94208, 94208, 1024, 4096, 0x2ae0eaef -0, 95232, 95232, 1024, 4096, 0x3218fc25 -0, 96256, 96256, 1024, 4096, 0x5ed8f2a7 -0, 97280, 97280, 1024, 4096, 0x4df02c50 -0, 98304, 98304, 1024, 4096, 0x50e3a51d -0, 99328, 99328, 1024, 4096, 0xaf52dc95 -0, 100352, 100352, 1024, 4096, 0x60a101a8 -0, 101376, 101376, 1024, 4096, 0x01c20386 -0, 102400, 102400, 1024, 4096, 0xb017e893 -0, 103424, 103424, 1024, 4096, 0x5a39f907 -0, 104448, 104448, 1024, 4096, 0xbf05e505 -0, 105472, 105472, 1024, 4096, 0x1797d237 -0, 106496, 106496, 1024, 4096, 0xb06bc281 -0, 107520, 107520, 1024, 4096, 0xb49f0402 -0, 108544, 108544, 1024, 4096, 0x4bfdb3a3 -0, 109568, 109568, 1024, 4096, 0x601302ae -0, 110592, 110592, 1024, 4096, 0x2dad13ac -0, 111616, 111616, 1024, 4096, 0xe95ed0a3 -0, 112640, 112640, 1024, 4096, 0x8df2dfe3 -0, 113664, 113664, 1024, 4096, 0x4183e52f -0, 114688, 114688, 1024, 4096, 0x23f1ecad -0, 115712, 115712, 1024, 4096, 0xb40c20e0 -0, 116736, 116736, 1024, 4096, 0x11bf2d2c -0, 117760, 117760, 1024, 4096, 0x85f8f2cb -0, 118784, 118784, 1024, 4096, 0x7961e007 -0, 119808, 119808, 1024, 4096, 0x63a9207a -0, 120832, 120832, 1024, 4096, 0x7383e583 -0, 121856, 121856, 1024, 4096, 0xa3e36e6a -0, 122880, 122880, 1024, 4096, 0xd2803f22 -0, 123904, 123904, 1024, 4096, 0x11a70252 -0, 124928, 124928, 1024, 4096, 0x4cfe20f6 -0, 125952, 125952, 1024, 4096, 0x2e66307e -0, 126976, 126976, 1024, 4096, 0x87c9229c -0, 128000, 128000, 1024, 4096, 0x8ecdfddb -0, 129024, 129024, 1024, 4096, 0x7e41e4b7 -0, 130048, 130048, 1024, 4096, 0x568d46fc -0, 131072, 131072, 1024, 4096, 0x3c97b403 -0, 132096, 132096, 1024, 4096, 0xe04105c2 -0, 133120, 133120, 1024, 4096, 0xe8d6f531 -0, 134144, 134144, 1024, 4096, 0x9a410079 -0, 135168, 135168, 1024, 4096, 0x12631511 -0, 136192, 136192, 1024, 4096, 0x530ff27c -0, 137216, 137216, 1024, 4096, 0x41f0f3ab -0, 138240, 138240, 1024, 4096, 0x6985f567 -0, 139264, 139264, 1024, 4096, 0xffc80074 -0, 140288, 140288, 1024, 4096, 0xc6c21def -0, 141312, 141312, 1024, 4096, 0xf5ddf852 -0, 142336, 142336, 1024, 4096, 0xf61af464 -0, 143360, 143360, 1024, 4096, 0xccabfbd1 -0, 144384, 144384, 1024, 4096, 0x466e062c -0, 145408, 145408, 1024, 4096, 0xec68ee08 -0, 146432, 146432, 1024, 4096, 0xead4f61a -0, 147456, 147456, 1024, 4096, 0xb3feef14 -0, 148480, 148480, 1024, 4096, 0x8f03e128 -0, 149504, 149504, 1024, 4096, 0x0c54fd08 -0, 150528, 150528, 1024, 4096, 0x1ae6f4cf -0, 151552, 151552, 1024, 4096, 0x34bae7d5 -0, 152576, 152576, 1024, 4096, 0xeefc1293 -0, 153600, 153600, 1024, 4096, 0x0c2bfd50 -0, 154624, 154624, 1024, 4096, 0x432ef6f5 -0, 155648, 155648, 1024, 4096, 0xd0f0e4a6 -0, 156672, 156672, 1024, 4096, 0xdeb4fe78 -0, 157696, 157696, 1024, 4096, 0xa6eeef90 -0, 158720, 158720, 1024, 4096, 0xad6701b6 -0, 159744, 159744, 1024, 4096, 0x9865f521 -0, 160768, 160768, 1024, 4096, 0xd7c301a0 -0, 161792, 161792, 1024, 4096, 0x3e82f05d -0, 162816, 162816, 1024, 4096, 0x09d1fe12 -0, 163840, 163840, 1024, 4096, 0x5b3eeab5 -0, 164864, 164864, 1024, 4096, 0xa8f8e69d -0, 165888, 165888, 1024, 4096, 0x7b1efe94 -0, 166912, 166912, 1024, 4096, 0xb65dfae6 -0, 167936, 167936, 1024, 4096, 0xf90ffa31 -0, 168960, 168960, 1024, 4096, 0x62e805fe -0, 169984, 169984, 1024, 4096, 0xe20cfa8e -0, 171008, 171008, 1024, 4096, 0x1cbdf820 -0, 172032, 172032, 1024, 4096, 0x79e8e729 -0, 173056, 173056, 1024, 4096, 0xfa8bf6ac -0, 174080, 174080, 1024, 4096, 0xe294f8a6 -0, 175104, 175104, 1024, 4096, 0xa4800572 -0, 176128, 176128, 1024, 4096, 0x8a0e1b32 -0, 177152, 177152, 1024, 4096, 0x00bcf36c -0, 178176, 178176, 1024, 4096, 0xb3a4eec2 -0, 179200, 179200, 1024, 4096, 0x137a03bd -0, 180224, 180224, 1024, 4096, 0xb8770bf1 -0, 181248, 181248, 1024, 4096, 0xcc66f90a -0, 182272, 182272, 1024, 4096, 0x66be04d4 -0, 183296, 183296, 1024, 4096, 0x80a40461 -0, 184320, 184320, 1024, 4096, 0xe4a2b95d -0, 185344, 185344, 1024, 4096, 0x2537edf0 -0, 186368, 186368, 1024, 4096, 0xc3e8e74f -0, 187392, 187392, 1024, 4096, 0xd2a40021 -0, 188416, 188416, 1024, 4096, 0xb366f18a -0, 189440, 189440, 1024, 4096, 0x1d3a0b8a -0, 190464, 190464, 1024, 4096, 0xac40f416 -0, 191488, 191488, 1024, 4096, 0xc90bf16c -0, 192512, 192512, 1024, 4096, 0xd6931f86 -0, 193536, 193536, 1024, 4096, 0xf9170265 -0, 194560, 194560, 1024, 4096, 0xb024f8dc -0, 195584, 195584, 1024, 4096, 0x31cdf143 -0, 196608, 196608, 1024, 4096, 0x1fe1e5e0 -0, 197632, 197632, 1024, 4096, 0x0f1ef3af -0, 198656, 198656, 1024, 4096, 0x3c86ee15 -0, 199680, 199680, 1024, 4096, 0xf151ecf2 -0, 200704, 200704, 1024, 4096, 0x81fbb354 -0, 201728, 201728, 1024, 4096, 0x88c903e8 -0, 202752, 202752, 1024, 4096, 0x1f480608 -0, 203776, 203776, 1024, 4096, 0x15f4f3cf -0, 204800, 204800, 1024, 4096, 0xb1ed0d3d -0, 205824, 205824, 1024, 4096, 0xa074ecfe -0, 206848, 206848, 1024, 4096, 0xc38100c8 -0, 207872, 207872, 1024, 4096, 0xd43000d8 -0, 208896, 208896, 1024, 4096, 0x59e61b3b -0, 209920, 209920, 1024, 4096, 0x00bcf36c -0, 210944, 210944, 1024, 4096, 0xb3a4eec2 -0, 211968, 211968, 1024, 4096, 0x137a03bd -0, 212992, 212992, 1024, 4096, 0xb8770bf1 -0, 214016, 214016, 1024, 4096, 0xcc66f90a -0, 215040, 215040, 1024, 4096, 0x66be04d4 -0, 216064, 216064, 1024, 4096, 0x80a40461 -0, 217088, 217088, 1024, 4096, 0xe4a2b95d -0, 218112, 218112, 1024, 4096, 0x2537edf0 -0, 219136, 219136, 1024, 4096, 0xc3e8e74f -0, 220160, 220160, 1024, 4096, 0xd2a40021 -0, 221184, 221184, 1024, 4096, 0xb366f18a -0, 222208, 222208, 1024, 4096, 0x1d3a0b8a -0, 223232, 223232, 1024, 4096, 0xac40f416 -0, 224256, 224256, 1024, 4096, 0xc90bf16c -0, 225280, 225280, 1024, 4096, 0xd6931f86 -0, 226304, 226304, 1024, 4096, 0xf9170265 -0, 227328, 227328, 1024, 4096, 0xb024f8dc -0, 228352, 228352, 1024, 4096, 0x31cdf143 -0, 229376, 229376, 1024, 4096, 0x1fe1e5e0 -0, 230400, 230400, 1024, 4096, 0x0f1ef3af -0, 231424, 231424, 1024, 4096, 0x3c86ee15 -0, 232448, 232448, 1024, 4096, 0xf151ecf2 -0, 233472, 233472, 1024, 4096, 0x81fbb354 -0, 234496, 234496, 1024, 4096, 0x88c903e8 -0, 235520, 235520, 1024, 4096, 0x1f480608 -0, 236544, 236544, 1024, 4096, 0x15f4f3cf -0, 237568, 237568, 1024, 4096, 0xb1ed0d3d -0, 238592, 238592, 1024, 4096, 0xa074ecfe -0, 239616, 239616, 1024, 4096, 0xc38100c8 -0, 240640, 240640, 1024, 4096, 0xd43000d8 -0, 241664, 241664, 1024, 4096, 0x59e61b3b -0, 242688, 242688, 1024, 4096, 0x00bcf36c -0, 243712, 243712, 1024, 4096, 0xb3a4eec2 -0, 244736, 244736, 1024, 4096, 0x137a03bd -0, 245760, 245760, 1024, 4096, 0xb8770bf1 -0, 246784, 246784, 1024, 4096, 0xcc66f90a -0, 247808, 247808, 1024, 4096, 0x66be04d4 -0, 248832, 248832, 1024, 4096, 0x80a40461 -0, 249856, 249856, 1024, 4096, 0xe4a2b95d -0, 250880, 250880, 1024, 4096, 0x2537edf0 -0, 251904, 251904, 1024, 4096, 0xc3e8e74f -0, 252928, 252928, 1024, 4096, 0xd2a40021 -0, 253952, 253952, 1024, 4096, 0xb366f18a -0, 254976, 254976, 1024, 4096, 0x1d3a0b8a -0, 256000, 256000, 1024, 4096, 0xac40f416 -0, 257024, 257024, 1024, 4096, 0xc90bf16c -0, 258048, 258048, 1024, 4096, 0xd6931f86 -0, 259072, 259072, 1024, 4096, 0xf9170265 -0, 260096, 260096, 1024, 4096, 0xb024f8dc -0, 261120, 261120, 1024, 4096, 0x31cdf143 -0, 262144, 262144, 1024, 4096, 0x1fe1e5e0 -0, 263168, 263168, 1024, 4096, 0x0f1ef3af -0, 264192, 264192, 408, 1632, 0x70682eea diff --git a/tests/ref/fate/g729-0 b/tests/ref/fate/g729-0 deleted file mode 100644 index 36c6634fab..0000000000 --- a/tests/ref/fate/g729-0 +++ /dev/null @@ -1,1000 +0,0 @@ -0, 0, 160, 0xbb6d5aa0 -0, 900, 160, 0x91563d8d -0, 1800, 160, 0x10a7535b -0, 2700, 160, 0xa4f35594 -0, 3600, 160, 0x7f8e54e0 -0, 4500, 160, 0x85275000 -0, 5400, 160, 0x00734c7b -0, 6300, 160, 0x8a2d544d -0, 7200, 160, 0x97dc533c -0, 8100, 160, 0xa7064ec4 -0, 9000, 160, 0xb7984a3c -0, 9900, 160, 0x28334db6 -0, 10800, 160, 0x5838521f -0, 11700, 160, 0x2337502c -0, 12600, 160, 0x4a1e4599 -0, 13500, 160, 0x0d3858a8 -0, 14400, 160, 0xa0974b46 -0, 15300, 160, 0xc3254b93 -0, 16200, 160, 0x42b75231 -0, 17100, 160, 0x93634662 -0, 18000, 160, 0x11674fa1 -0, 18900, 160, 0xf2da5414 -0, 19800, 160, 0x97754dbc -0, 20700, 160, 0x40a24d94 -0, 21600, 160, 0x26b34ebf -0, 22500, 160, 0x7730542f -0, 23400, 160, 0xb45254aa -0, 24300, 160, 0xd8d752c3 -0, 25200, 160, 0x655c4a81 -0, 26100, 160, 0xa5da4f35 -0, 27000, 160, 0xd43551a1 -0, 27900, 160, 0x72a74e7d -0, 28800, 160, 0xdb2150b3 -0, 29700, 160, 0x972852a1 -0, 30600, 160, 0xbae14c07 -0, 31500, 160, 0x23b54d57 -0, 32400, 160, 0x2d9650a5 -0, 33300, 160, 0xaf755107 -0, 34200, 160, 0xdb054f0e -0, 35100, 160, 0x9f084cc0 -0, 36000, 160, 0x64ca5760 -0, 36900, 160, 0x3ea24be2 -0, 37800, 160, 0x93ea503b -0, 38700, 160, 0xb6694afa -0, 39600, 160, 0xf94c52e7 -0, 40500, 160, 0x2b7156b8 -0, 41400, 160, 0xbbdf414c -0, 42300, 160, 0x10cd4ac8 -0, 43200, 160, 0x39885453 -0, 44100, 160, 0xa1505568 -0, 45000, 160, 0x86124ec1 -0, 45900, 160, 0xe2ab5489 -0, 46800, 160, 0x406254bc -0, 47700, 160, 0x09044629 -0, 48600, 160, 0xb2ed5702 -0, 49500, 160, 0xd9ee5188 -0, 50400, 160, 0x59f7592a -0, 51300, 160, 0x8f144c08 -0, 52200, 160, 0x90394e61 -0, 53100, 160, 0x79524df7 -0, 54000, 160, 0x58044674 -0, 54900, 160, 0x73b24d90 -0, 55800, 160, 0x80e257a1 -0, 56700, 160, 0xe8ff4caf -0, 57600, 160, 0x1db84e3e -0, 58500, 160, 0xd7db59d9 -0, 59400, 160, 0x43244c15 -0, 60300, 160, 0x1f63558f -0, 61200, 160, 0xf0d851c6 -0, 62100, 160, 0x76484f3a -0, 63000, 160, 0x5746551e -0, 63900, 160, 0x83b54cd7 -0, 64800, 160, 0x97f550a1 -0, 65700, 160, 0x77c45340 -0, 66600, 160, 0xfd7b520a -0, 67500, 160, 0x989a4e13 -0, 68400, 160, 0x9a8551c0 -0, 69300, 160, 0xa0cb4f93 -0, 70200, 160, 0xc568536f -0, 71100, 160, 0x6fa74a95 -0, 72000, 160, 0xd550568b -0, 72900, 160, 0xf88f4de5 -0, 73800, 160, 0x91285517 -0, 74700, 160, 0xdb675270 -0, 75600, 160, 0x606c53f9 -0, 76500, 160, 0x43f64601 -0, 77400, 160, 0x28b94b45 -0, 78300, 160, 0x7f2347f5 -0, 79200, 160, 0x84ba55db -0, 80100, 160, 0x3ca3477c -0, 81000, 160, 0x57d158ba -0, 81900, 160, 0x2c3c506d -0, 82800, 160, 0x59b34e5f -0, 83700, 160, 0x014f530a -0, 84600, 160, 0x877f4f76 -0, 85500, 160, 0x97a65c5f -0, 86400, 160, 0xf643516d -0, 87300, 160, 0x6ccc5242 -0, 88200, 160, 0x895450bd -0, 89100, 160, 0xe246570e -0, 90000, 160, 0xbb9f4a0c -0, 90900, 160, 0x60e646fe -0, 91800, 160, 0x546f515b -0, 92700, 160, 0xc59254f0 -0, 93600, 160, 0xcad6551f -0, 94500, 160, 0x14e14fac -0, 95400, 160, 0x3cf94c52 -0, 96300, 160, 0x99b14f45 -0, 97200, 160, 0xfdb14dc7 -0, 98100, 160, 0x48f359e7 -0, 99000, 160, 0x186153e3 -0, 99900, 160, 0x047d4a78 -0, 100800, 160, 0x992f462b -0, 101700, 160, 0x4a0e504d -0, 102600, 160, 0x1f245275 -0, 103500, 160, 0x026959a9 -0, 104400, 160, 0x648846e7 -0, 105300, 160, 0xcac94cb3 -0, 106200, 160, 0x55e551a4 -0, 107100, 160, 0x767a5315 -0, 108000, 160, 0xbfde4d2b -0, 108900, 160, 0x29bf4613 -0, 109800, 160, 0x8a8d5394 -0, 110700, 160, 0x36f94dae -0, 111600, 160, 0x4cbf50ba -0, 112500, 160, 0x9af44d8b -0, 113400, 160, 0x6e8a519e -0, 114300, 160, 0x496348b7 -0, 115200, 160, 0x95324eb2 -0, 116100, 160, 0x5bfe5118 -0, 117000, 160, 0xa1ff4c88 -0, 117900, 160, 0x86c2500a -0, 118800, 160, 0xc53353c5 -0, 119700, 160, 0x062f52ee -0, 120600, 160, 0x11cf522d -0, 121500, 160, 0x054f5855 -0, 122400, 160, 0x8c4e44e9 -0, 123300, 160, 0x4d514fda -0, 124200, 160, 0x5726568e -0, 125100, 160, 0x281859ad -0, 126000, 160, 0x3f3344f8 -0, 126900, 160, 0x2cbb3ee5 -0, 127800, 160, 0xa075551c -0, 128700, 160, 0xafb25528 -0, 129600, 160, 0x9221478a -0, 130500, 160, 0x6cb15634 -0, 131400, 160, 0xb5cf4523 -0, 132300, 160, 0x8a7a4f2c -0, 133200, 160, 0x278e553d -0, 134100, 160, 0x49054ad3 -0, 135000, 160, 0x5d7449bb -0, 135900, 160, 0x67c346a0 -0, 136800, 160, 0x5d915bf8 -0, 137700, 160, 0x671355b2 -0, 138600, 160, 0xdfa84ee6 -0, 139500, 160, 0x4c3552d0 -0, 140400, 160, 0x63a1483c -0, 141300, 160, 0x14c151ba -0, 142200, 160, 0xf7434d78 -0, 143100, 160, 0x1c3652c9 -0, 144000, 160, 0x035b51da -0, 144900, 160, 0x2bf6496b -0, 145800, 160, 0x50a14f14 -0, 146700, 160, 0x518948f8 -0, 147600, 160, 0x7e784331 -0, 148500, 160, 0x73384dce -0, 149400, 160, 0x11015066 -0, 150300, 160, 0xacc5525c -0, 151200, 160, 0xf75a5431 -0, 152100, 160, 0xa78e4b8a -0, 153000, 160, 0xd07955b0 -0, 153900, 160, 0x63164a03 -0, 154800, 160, 0x952f519e -0, 155700, 160, 0xe5764f77 -0, 156600, 160, 0xa9255738 -0, 157500, 160, 0x65d64ce5 -0, 158400, 160, 0x8ab7507c -0, 159300, 160, 0xf5265251 -0, 160200, 160, 0xa6a84d74 -0, 161100, 160, 0xc2594fee -0, 162000, 160, 0xdfae5056 -0, 162900, 160, 0xa5a74c11 -0, 163800, 160, 0x5fdf4a21 -0, 164700, 160, 0x11014f8d -0, 165600, 160, 0x08d0553f -0, 166500, 160, 0x3036520e -0, 167400, 160, 0xee3a464e -0, 168300, 160, 0xbfd94949 -0, 169200, 160, 0x21625176 -0, 170100, 160, 0x6c714e8d -0, 171000, 160, 0x055a4c05 -0, 171900, 160, 0xc7f35347 -0, 172800, 160, 0x82344b60 -0, 173700, 160, 0x99854ce4 -0, 174600, 160, 0x95504ec3 -0, 175500, 160, 0xe245502a -0, 176400, 160, 0xb0e14a4c -0, 177300, 160, 0x09835b86 -0, 178200, 160, 0xe9495220 -0, 179100, 160, 0xce9b514f -0, 180000, 160, 0xbaf85695 -0, 180900, 160, 0x69aa3f1d -0, 181800, 160, 0xd6a551b8 -0, 182700, 160, 0x4eb956e6 -0, 183600, 160, 0xdd6d4e58 -0, 184500, 160, 0xba1f4814 -0, 185400, 160, 0x4a604f48 -0, 186300, 160, 0xa8995890 -0, 187200, 160, 0x3a80616b -0, 188100, 160, 0xfb796013 -0, 189000, 160, 0x8eba5c12 -0, 189900, 160, 0xd37859b9 -0, 190800, 160, 0x19a857c8 -0, 191700, 160, 0xec0e5a16 -0, 192600, 160, 0xd5335159 -0, 193500, 160, 0x560f4de7 -0, 194400, 160, 0x06d354c8 -0, 195300, 160, 0xdade5860 -0, 196200, 160, 0x093a512c -0, 197100, 160, 0xb37b5098 -0, 198000, 160, 0x3eea537c -0, 198900, 160, 0xf5c94f06 -0, 199800, 160, 0x552c4bb2 -0, 200700, 160, 0xea9a5a79 -0, 201600, 160, 0xd2645494 -0, 202500, 160, 0x5ba958ea -0, 203400, 160, 0x54b559cf -0, 204300, 160, 0x86bf5bba -0, 205200, 160, 0xb89b6149 -0, 206100, 160, 0x1e825314 -0, 207000, 160, 0xf0d250cc -0, 207900, 160, 0xc7ad53ba -0, 208800, 160, 0x320c552f -0, 209700, 160, 0xc62756f7 -0, 210600, 160, 0xa41351f7 -0, 211500, 160, 0x27ed4e78 -0, 212400, 160, 0x8d6047bc -0, 213300, 160, 0xa45c48d0 -0, 214200, 160, 0x14da5400 -0, 215100, 160, 0x48514dd2 -0, 216000, 160, 0xec395318 -0, 216900, 160, 0xf3c85e4a -0, 217800, 160, 0x657a63ed -0, 218700, 160, 0xcc975c4d -0, 219600, 160, 0x86125dd4 -0, 220500, 160, 0x6a3f6019 -0, 221400, 160, 0x84c05aeb -0, 222300, 160, 0xe68561f7 -0, 223200, 160, 0x7ec763ae -0, 224100, 160, 0x91bd5792 -0, 225000, 160, 0xb9365c8e -0, 225900, 160, 0x42d7587a -0, 226800, 160, 0x80a45453 -0, 227700, 160, 0x9ecf50c2 -0, 228600, 160, 0xc8de5173 -0, 229500, 160, 0x776952f7 -0, 230400, 160, 0x45f856c0 -0, 231300, 160, 0x729c4d73 -0, 232200, 160, 0xfd364a18 -0, 233100, 160, 0x709e587d -0, 234000, 160, 0x288240e5 -0, 234900, 160, 0x16a6493f -0, 235800, 160, 0x76db596f -0, 236700, 160, 0x16c24a51 -0, 237600, 160, 0xc55b5a8f -0, 238500, 160, 0x19024a2e -0, 239400, 160, 0x16514d1b -0, 240300, 160, 0x48bb5b82 -0, 241200, 160, 0x5a6e4d80 -0, 242100, 160, 0x6d404b0f -0, 243000, 160, 0x57bc4e4a -0, 243900, 160, 0xc10c5381 -0, 244800, 160, 0x34bd51d9 -0, 245700, 160, 0x5dcf52b7 -0, 246600, 160, 0xf61f57a7 -0, 247500, 160, 0x4e204934 -0, 248400, 160, 0xe18b4a3f -0, 249300, 160, 0xb81256e3 -0, 250200, 160, 0x294047b2 -0, 251100, 160, 0x3ad559df -0, 252000, 160, 0xd28d4d86 -0, 252900, 160, 0x67b75895 -0, 253800, 160, 0x191357b0 -0, 254700, 160, 0x8016556f -0, 255600, 160, 0x62475c86 -0, 256500, 160, 0x0c975bc9 -0, 257400, 160, 0x901c5909 -0, 258300, 160, 0x9909567d -0, 259200, 160, 0xce715b99 -0, 260100, 160, 0xae5062b1 -0, 261000, 160, 0x5bd056d6 -0, 261900, 160, 0xe3d3555a -0, 262800, 160, 0xc4b1555c -0, 263700, 160, 0x39c95649 -0, 264600, 160, 0x50145d11 -0, 265500, 160, 0xc0ba5307 -0, 266400, 160, 0x182455a3 -0, 267300, 160, 0x36c24e98 -0, 268200, 160, 0x1b5b52d0 -0, 269100, 160, 0xd38352d1 -0, 270000, 160, 0x6a1d5d2a -0, 270900, 160, 0x50f05c44 -0, 271800, 160, 0xb2365dc1 -0, 272700, 160, 0x10825934 -0, 273600, 160, 0xcb4c61c2 -0, 274500, 160, 0x578252ab -0, 275400, 160, 0xed99596c -0, 276300, 160, 0xdfec6305 -0, 277200, 160, 0x97e2550a -0, 278100, 160, 0xd60a56e1 -0, 279000, 160, 0xb6c4535e -0, 279900, 160, 0x4d2e536c -0, 280800, 160, 0xdef85cc7 -0, 281700, 160, 0xee985a98 -0, 282600, 160, 0x006a4cdb -0, 283500, 160, 0xd06652ad -0, 284400, 160, 0xeeee4ed6 -0, 285300, 160, 0xcb8b586d -0, 286200, 160, 0x2ee4556e -0, 287100, 160, 0x6d924c01 -0, 288000, 160, 0x7ff257cc -0, 288900, 160, 0x67df5710 -0, 289800, 160, 0x0f704f29 -0, 290700, 160, 0x19dc53a7 -0, 291600, 160, 0xfbf44bc0 -0, 292500, 160, 0x640b5718 -0, 293400, 160, 0x2bfd4b91 -0, 294300, 160, 0xaae049bf -0, 295200, 160, 0xca3154f6 -0, 296100, 160, 0x36064f2c -0, 297000, 160, 0x28404919 -0, 297900, 160, 0x9c944fe3 -0, 298800, 160, 0xb4214c82 -0, 299700, 160, 0x442c514d -0, 300600, 160, 0x44434ea5 -0, 301500, 160, 0x82a05aae -0, 302400, 160, 0x4b86510d -0, 303300, 160, 0x46844eab -0, 304200, 160, 0xe5455deb -0, 305100, 160, 0x60826550 -0, 306000, 160, 0x3c5a5448 -0, 306900, 160, 0x2db860c9 -0, 307800, 160, 0x4d845b78 -0, 308700, 160, 0x81dc5e23 -0, 309600, 160, 0x78c95932 -0, 310500, 160, 0xb5be57cd -0, 311400, 160, 0x6fa45c65 -0, 312300, 160, 0x4e085e2a -0, 313200, 160, 0x50ee530c -0, 314100, 160, 0x2bb85587 -0, 315000, 160, 0x6d58614e -0, 315900, 160, 0xcf4c5d69 -0, 316800, 160, 0x3cbf5ffb -0, 317700, 160, 0x452157d3 -0, 318600, 160, 0x3cb55cd8 -0, 319500, 160, 0x2bba5735 -0, 320400, 160, 0x36a45670 -0, 321300, 160, 0x23b85b8a -0, 322200, 160, 0x9a255457 -0, 323100, 160, 0x4e6956f3 -0, 324000, 160, 0xa0714edc -0, 324900, 160, 0x7dee4a3d -0, 325800, 160, 0x86404bc9 -0, 326700, 160, 0x358c50cd -0, 327600, 160, 0x9eda47e8 -0, 328500, 160, 0x3cfe522e -0, 329400, 160, 0xddb95758 -0, 330300, 160, 0x1a434a83 -0, 331200, 160, 0xa8a450bb -0, 332100, 160, 0x44e7530e -0, 333000, 160, 0x59b5555a -0, 333900, 160, 0x65404db1 -0, 334800, 160, 0xcac15945 -0, 335700, 160, 0x38864f17 -0, 336600, 160, 0x61114f30 -0, 337500, 160, 0x195542d8 -0, 338400, 160, 0xacbb4c69 -0, 339300, 160, 0xd0da4ab9 -0, 340200, 160, 0x563d4eb6 -0, 341100, 160, 0xd0ce503c -0, 342000, 160, 0x8b684e15 -0, 342900, 160, 0x711541d3 -0, 343800, 160, 0xb28b5b9b -0, 344700, 160, 0x48b145e4 -0, 345600, 160, 0x908f5606 -0, 346500, 160, 0x22c74f02 -0, 347400, 160, 0x87274716 -0, 348300, 160, 0xaa2351e6 -0, 349200, 160, 0x2df5505a -0, 350100, 160, 0x7999525c -0, 351000, 160, 0x728a4b73 -0, 351900, 160, 0xa67447ff -0, 352800, 160, 0x28884a20 -0, 353700, 160, 0x3ffa5840 -0, 354600, 160, 0xd6265047 -0, 355500, 160, 0x2f1553a8 -0, 356400, 160, 0xac0653ec -0, 357300, 160, 0x35844368 -0, 358200, 160, 0x6e1553ba -0, 359100, 160, 0xb62a4c88 -0, 360000, 160, 0x88a04ffc -0, 360900, 160, 0x947e525e -0, 361800, 160, 0x3dd24f98 -0, 362700, 160, 0x942e542e -0, 363600, 160, 0xdb985211 -0, 364500, 160, 0x615a5022 -0, 365400, 160, 0x71c04569 -0, 366300, 160, 0xbbbe4f41 -0, 367200, 160, 0x62074e0b -0, 368100, 160, 0x2c5d56c7 -0, 369000, 160, 0x34344c18 -0, 369900, 160, 0xc57d4c22 -0, 370800, 160, 0xb273560d -0, 371700, 160, 0x7e985229 -0, 372600, 160, 0x2dd3542d -0, 373500, 160, 0x39645000 -0, 374400, 160, 0x1b3f4d9e -0, 375300, 160, 0x0bbf5ed2 -0, 376200, 160, 0xc81f5608 -0, 377100, 160, 0xe82e569e -0, 378000, 160, 0x34df537d -0, 378900, 160, 0x53175837 -0, 379800, 160, 0xbb76517f -0, 380700, 160, 0xd5a25737 -0, 381600, 160, 0x58eb4f3d -0, 382500, 160, 0x8f6e51d3 -0, 383400, 160, 0x1fd85602 -0, 384300, 160, 0xef2a4ee7 -0, 385200, 160, 0x0e6e58f4 -0, 386100, 160, 0x80345497 -0, 387000, 160, 0x710150a1 -0, 387900, 160, 0x32fb51db -0, 388800, 160, 0x7efd564c -0, 389700, 160, 0xf6604f26 -0, 390600, 160, 0xc0954d7e -0, 391500, 160, 0x27705072 -0, 392400, 160, 0xd26f5958 -0, 393300, 160, 0x2c2552cd -0, 394200, 160, 0xd14056b1 -0, 395100, 160, 0x11f356d2 -0, 396000, 160, 0x93b35efd -0, 396900, 160, 0xa6d65ae7 -0, 397800, 160, 0x95015177 -0, 398700, 160, 0x2e6157e8 -0, 399600, 160, 0xb90c5021 -0, 400500, 160, 0xf39155c9 -0, 401400, 160, 0xd6ad544b -0, 402300, 160, 0x4b8a5b98 -0, 403200, 160, 0x90a94f2d -0, 404100, 160, 0x46a04f3f -0, 405000, 160, 0x542b5cd1 -0, 405900, 160, 0xebaa5710 -0, 406800, 160, 0x504854a0 -0, 407700, 160, 0xbd9d53b5 -0, 408600, 160, 0x91524fed -0, 409500, 160, 0x9b7a582d -0, 410400, 160, 0xa4f258cf -0, 411300, 160, 0x46274dda -0, 412200, 160, 0xc0335ba9 -0, 413100, 160, 0xe59c5c74 -0, 414000, 160, 0xc2ee5ab0 -0, 414900, 160, 0x3e035996 -0, 415800, 160, 0x63e25521 -0, 416700, 160, 0xc09851af -0, 417600, 160, 0xb8225715 -0, 418500, 160, 0x74355bfb -0, 419400, 160, 0xf4c75adf -0, 420300, 160, 0x2f8b56cd -0, 421200, 160, 0xb4705795 -0, 422100, 160, 0xb4b25506 -0, 423000, 160, 0xaadb54f8 -0, 423900, 160, 0xe6d158aa -0, 424800, 160, 0xed64614f -0, 425700, 160, 0x80195732 -0, 426600, 160, 0xa8995f0e -0, 427500, 160, 0xdc4a520d -0, 428400, 160, 0x071a5bae -0, 429300, 160, 0xce1b5ae9 -0, 430200, 160, 0x85e25804 -0, 431100, 160, 0x435e555f -0, 432000, 160, 0xe4154ef4 -0, 432900, 160, 0xeff857b4 -0, 433800, 160, 0xc9e25868 -0, 434700, 160, 0x6e6961eb -0, 435600, 160, 0x361e45e6 -0, 436500, 160, 0xf8a94988 -0, 437400, 160, 0x9de758b3 -0, 438300, 160, 0x2e65533e -0, 439200, 160, 0x3f89422d -0, 440100, 160, 0x77fd56a5 -0, 441000, 160, 0x91104845 -0, 441900, 160, 0x2eeb5491 -0, 442800, 160, 0x6a5348c4 -0, 443700, 160, 0xe0954882 -0, 444600, 160, 0x7e915761 -0, 445500, 160, 0x2cb5531f -0, 446400, 160, 0xe1dc4ecd -0, 447300, 160, 0xbf6b4e61 -0, 448200, 160, 0x3d6b5746 -0, 449100, 160, 0xe8bd5077 -0, 450000, 160, 0xd38d5921 -0, 450900, 160, 0xfc534e38 -0, 451800, 160, 0xd361475b -0, 452700, 160, 0x4d5152c7 -0, 453600, 160, 0xb6684d11 -0, 454500, 160, 0xd2e25864 -0, 455400, 160, 0x02ec536a -0, 456300, 160, 0x27ac550e -0, 457200, 160, 0xe8d44e2d -0, 458100, 160, 0x520152c8 -0, 459000, 160, 0xace747ea -0, 459900, 160, 0x773a4ee3 -0, 460800, 160, 0x7dd1559f -0, 461700, 160, 0x124453a8 -0, 462600, 160, 0x04154991 -0, 463500, 160, 0x3c794d98 -0, 464400, 160, 0x309f4e47 -0, 465300, 160, 0x98c74a48 -0, 466200, 160, 0xd0c34bcc -0, 467100, 160, 0xfa304e19 -0, 468000, 160, 0x69505201 -0, 468900, 160, 0x2e714ac7 -0, 469800, 160, 0x076654a3 -0, 470700, 160, 0xc6674e27 -0, 471600, 160, 0x1adf4dd9 -0, 472500, 160, 0x4408507e -0, 473400, 160, 0xd2654d94 -0, 474300, 160, 0x97a65cc0 -0, 475200, 160, 0xb53251f9 -0, 476100, 160, 0xd498584b -0, 477000, 160, 0x46a058c8 -0, 477900, 160, 0xa2f85cbd -0, 478800, 160, 0x43b856fb -0, 479700, 160, 0xdeb957ba -0, 480600, 160, 0x3064580a -0, 481500, 160, 0xe86357a5 -0, 482400, 160, 0x9b974d00 -0, 483300, 160, 0x66ee4ff3 -0, 484200, 160, 0x0b9958f7 -0, 485100, 160, 0xc3754d0a -0, 486000, 160, 0x42314c33 -0, 486900, 160, 0x4550555f -0, 487800, 160, 0x0f064e4c -0, 488700, 160, 0xe569596d -0, 489600, 160, 0x056c4751 -0, 490500, 160, 0xdc1049fc -0, 491400, 160, 0x63c54a1e -0, 492300, 160, 0xb402518e -0, 493200, 160, 0xaf0d4b19 -0, 494100, 160, 0xa22b4c5b -0, 495000, 160, 0x28084bbf -0, 495900, 160, 0x10495224 -0, 496800, 160, 0x4cb94993 -0, 497700, 160, 0x17c15457 -0, 498600, 160, 0xbd834d6d -0, 499500, 160, 0x6ca25235 -0, 500400, 160, 0x84b74f89 -0, 501300, 160, 0xdeef4e76 -0, 502200, 160, 0x6ab05188 -0, 503100, 160, 0xa91c4646 -0, 504000, 160, 0xad574e7d -0, 504900, 160, 0xba264d69 -0, 505800, 160, 0xd8734dd0 -0, 506700, 160, 0x69f25581 -0, 507600, 160, 0x3b8e4ae9 -0, 508500, 160, 0xb1124607 -0, 509400, 160, 0xd78e4e4f -0, 510300, 160, 0x05a1504f -0, 511200, 160, 0x3e705270 -0, 512100, 160, 0x1e144b3b -0, 513000, 160, 0xbb0b5416 -0, 513900, 160, 0xc26f5b45 -0, 514800, 160, 0x14224ab9 -0, 515700, 160, 0x2bbd4837 -0, 516600, 160, 0xd2bf4e60 -0, 517500, 160, 0xbeec506c -0, 518400, 160, 0x2cd34d3a -0, 519300, 160, 0x85134fc6 -0, 520200, 160, 0xdb9a4ac2 -0, 521100, 160, 0x92715256 -0, 522000, 160, 0xff395098 -0, 522900, 160, 0xa5ec560c -0, 523800, 160, 0xce95534b -0, 524700, 160, 0xe36f46f1 -0, 525600, 160, 0x45f74a58 -0, 526500, 160, 0x02d05440 -0, 527400, 160, 0xa005529f -0, 528300, 160, 0xae0f3f22 -0, 529200, 160, 0x3f984eb0 -0, 530100, 160, 0xc5bd5015 -0, 531000, 160, 0xf4504c53 -0, 531900, 160, 0x7f4044c5 -0, 532800, 160, 0x82dd4bab -0, 533700, 160, 0x7a0d5122 -0, 534600, 160, 0xd0da5271 -0, 535500, 160, 0x67d14e3e -0, 536400, 160, 0x54564f42 -0, 537300, 160, 0x77df4e0a -0, 538200, 160, 0x0c4a4f70 -0, 539100, 160, 0xb2944f40 -0, 540000, 160, 0xe57a52de -0, 540900, 160, 0x7d994ed1 -0, 541800, 160, 0x9dc35763 -0, 542700, 160, 0x8d0a4da9 -0, 543600, 160, 0x0c6449a4 -0, 544500, 160, 0xc73c503a -0, 545400, 160, 0x52904cbe -0, 546300, 160, 0x49824c2e -0, 547200, 160, 0xb7e14e0b -0, 548100, 160, 0x9745548e -0, 549000, 160, 0xdafb4c20 -0, 549900, 160, 0x1aa84d67 -0, 550800, 160, 0x64bc5033 -0, 551700, 160, 0x9e2e5a05 -0, 552600, 160, 0x69144bc5 -0, 553500, 160, 0xce1253fa -0, 554400, 160, 0x359f4c15 -0, 555300, 160, 0xdba74ed0 -0, 556200, 160, 0xea1453b8 -0, 557100, 160, 0xccdf49d3 -0, 558000, 160, 0xeb324750 -0, 558900, 160, 0x62b14ad4 -0, 559800, 160, 0x446e50c0 -0, 560700, 160, 0x111e5151 -0, 561600, 160, 0x6be84f3a -0, 562500, 160, 0xf5cf4e42 -0, 563400, 160, 0xcc995459 -0, 564300, 160, 0x0faf5172 -0, 565200, 160, 0x31334f66 -0, 566100, 160, 0x20ba52c0 -0, 567000, 160, 0xc7cc4975 -0, 567900, 160, 0x9e7a51ba -0, 568800, 160, 0x52884ff1 -0, 569700, 160, 0xc7a84cfd -0, 570600, 160, 0x5ae64c22 -0, 571500, 160, 0x68125a92 -0, 572400, 160, 0x39ed54f1 -0, 573300, 160, 0xfa0a4ad1 -0, 574200, 160, 0xe8c8590c -0, 575100, 160, 0x5f555576 -0, 576000, 160, 0xaf7a57a1 -0, 576900, 160, 0x858257e9 -0, 577800, 160, 0x1223523e -0, 578700, 160, 0x446954a1 -0, 579600, 160, 0xfbe952d9 -0, 580500, 160, 0xd56259ff -0, 581400, 160, 0xc4fa4f44 -0, 582300, 160, 0x77cc57f6 -0, 583200, 160, 0x53d3573d -0, 584100, 160, 0x085e4ff9 -0, 585000, 160, 0x7a4e5410 -0, 585900, 160, 0xb4ad5794 -0, 586800, 160, 0x71255738 -0, 587700, 160, 0x36724918 -0, 588600, 160, 0x370e5974 -0, 589500, 160, 0xb709596c -0, 590400, 160, 0x89b05052 -0, 591300, 160, 0x74e550ce -0, 592200, 160, 0x6e2c5a49 -0, 593100, 160, 0x4dfa5b50 -0, 594000, 160, 0x80764c70 -0, 594900, 160, 0xc1d14fc6 -0, 595800, 160, 0x53e746b3 -0, 596700, 160, 0x728350c0 -0, 597600, 160, 0x9aa6500e -0, 598500, 160, 0x60985454 -0, 599400, 160, 0xa0c54b6f -0, 600300, 160, 0xe3b157ea -0, 601200, 160, 0xce86573b -0, 602100, 160, 0x9dad5535 -0, 603000, 160, 0xb3094af9 -0, 603900, 160, 0x2d1456ed -0, 604800, 160, 0x328248b9 -0, 605700, 160, 0x4ffb4f52 -0, 606600, 160, 0x71fe53de -0, 607500, 160, 0x0d114e92 -0, 608400, 160, 0x37065510 -0, 609300, 160, 0x426c4c07 -0, 610200, 160, 0x58e3528b -0, 611100, 160, 0x71674484 -0, 612000, 160, 0x45934ee1 -0, 612900, 160, 0x4e914b31 -0, 613800, 160, 0x525b4ec2 -0, 614700, 160, 0x4393563d -0, 615600, 160, 0xb10154e9 -0, 616500, 160, 0x23b15a4d -0, 617400, 160, 0x6d995220 -0, 618300, 160, 0xcd2949fd -0, 619200, 160, 0x67234f75 -0, 620100, 160, 0x00cc4cdb -0, 621000, 160, 0x97c35574 -0, 621900, 160, 0xc0855753 -0, 622800, 160, 0xf4e650a5 -0, 623700, 160, 0x95b14bc2 -0, 624600, 160, 0x04d948dc -0, 625500, 160, 0x284d4d02 -0, 626400, 160, 0xfb0d4cd9 -0, 627300, 160, 0x0e515126 -0, 628200, 160, 0xb4055a86 -0, 629100, 160, 0x0bbe4f68 -0, 630000, 160, 0xf1b848af -0, 630900, 160, 0x7d154853 -0, 631800, 160, 0x78225418 -0, 632700, 160, 0xfb2f523e -0, 633600, 160, 0xa6d34ea6 -0, 634500, 160, 0xe4264e30 -0, 635400, 160, 0x113750aa -0, 636300, 160, 0x4073529b -0, 637200, 160, 0xd1754dda -0, 638100, 160, 0x1b495413 -0, 639000, 160, 0x29f94cd8 -0, 639900, 160, 0x49004a53 -0, 640800, 160, 0x1fec4de4 -0, 641700, 160, 0x7d6b4670 -0, 642600, 160, 0x626c4c9f -0, 643500, 160, 0x79265234 -0, 644400, 160, 0xab765b86 -0, 645300, 160, 0xe9ae4d26 -0, 646200, 160, 0xeee1481f -0, 647100, 160, 0x289d5287 -0, 648000, 160, 0xb5524e8b -0, 648900, 160, 0x7e715764 -0, 649800, 160, 0xb1b25091 -0, 650700, 160, 0xf1a946f6 -0, 651600, 160, 0x57dc51bd -0, 652500, 160, 0x4c0b4f14 -0, 653400, 160, 0xdc1f4930 -0, 654300, 160, 0x79d75057 -0, 655200, 160, 0x22bd52df -0, 656100, 160, 0x963a5562 -0, 657000, 160, 0x7e475303 -0, 657900, 160, 0x2c065494 -0, 658800, 160, 0xb0514720 -0, 659700, 160, 0xbc734849 -0, 660600, 160, 0xf4924e4d -0, 661500, 160, 0xe50f44c9 -0, 662400, 160, 0x978c4ce8 -0, 663300, 160, 0x302e51c2 -0, 664200, 160, 0x262b4a60 -0, 665100, 160, 0xf95f4e99 -0, 666000, 160, 0x7465504a -0, 666900, 160, 0xab0e5108 -0, 667800, 160, 0xbec15395 -0, 668700, 160, 0x4f2c5139 -0, 669600, 160, 0x26444deb -0, 670500, 160, 0xee4c4b15 -0, 671400, 160, 0x8bc350e1 -0, 672300, 160, 0xd0744a5a -0, 673200, 160, 0xfee64d9d -0, 674100, 160, 0x234c50b6 -0, 675000, 160, 0x8592482c -0, 675900, 160, 0x5e8b5308 -0, 676800, 160, 0x4f9848c7 -0, 677700, 160, 0x939d4faa -0, 678600, 160, 0x797654f1 -0, 679500, 160, 0x15d24d9b -0, 680400, 160, 0xa6e54bd2 -0, 681300, 160, 0x755e4c90 -0, 682200, 160, 0xcd334bce -0, 683100, 160, 0xfc1746e9 -0, 684000, 160, 0x81f04dd5 -0, 684900, 160, 0x44b35080 -0, 685800, 160, 0x91e65217 -0, 686700, 160, 0x492150af -0, 687600, 160, 0xf73e58ec -0, 688500, 160, 0xf988538a -0, 689400, 160, 0x0dee4c10 -0, 690300, 160, 0x2c9f4c23 -0, 691200, 160, 0x8c1e4e08 -0, 692100, 160, 0x25bb5286 -0, 693000, 160, 0xd0ed469b -0, 693900, 160, 0x71eb50e8 -0, 694800, 160, 0x249f4d26 -0, 695700, 160, 0x9662498f -0, 696600, 160, 0x49ee55e2 -0, 697500, 160, 0x54d9491b -0, 698400, 160, 0x4c675649 -0, 699300, 160, 0x0e4b4b34 -0, 700200, 160, 0x776f4995 -0, 701100, 160, 0x722656b2 -0, 702000, 160, 0x081d4b6f -0, 702900, 160, 0xf70746fe -0, 703800, 160, 0x08b151da -0, 704700, 160, 0x6b255328 -0, 705600, 160, 0xeb2b586a -0, 706500, 160, 0x812b4444 -0, 707400, 160, 0x1e16533f -0, 708300, 160, 0xc1244760 -0, 709200, 160, 0x67584d87 -0, 710100, 160, 0xde8b5726 -0, 711000, 160, 0xe96d4e3e -0, 711900, 160, 0x41174c98 -0, 712800, 160, 0x4cdd4cd8 -0, 713700, 160, 0xfb724b64 -0, 714600, 160, 0x78f154df -0, 715500, 160, 0x97e1476d -0, 716400, 160, 0x6f034e7f -0, 717300, 160, 0x93b240df -0, 718200, 160, 0xc4d040e6 -0, 719100, 160, 0xe47744a4 -0, 720000, 160, 0x87a950ff -0, 720900, 160, 0x7079491b -0, 721800, 160, 0x89f0491a -0, 722700, 160, 0x70b8467e -0, 723600, 160, 0x20945294 -0, 724500, 160, 0x2d5c4919 -0, 725400, 160, 0x1ed44c78 -0, 726300, 160, 0x93d74a5f -0, 727200, 160, 0x300e490e -0, 728100, 160, 0x8249558d -0, 729000, 160, 0x630a4f57 -0, 729900, 160, 0xdd6e475f -0, 730800, 160, 0xf50941e5 -0, 731700, 160, 0x1fe44bea -0, 732600, 160, 0x03be5469 -0, 733500, 160, 0x7ece4f4c -0, 734400, 160, 0x31f953dd -0, 735300, 160, 0x22a44b7d -0, 736200, 160, 0x1f5e5562 -0, 737100, 160, 0x771b5688 -0, 738000, 160, 0x7d1c4d45 -0, 738900, 160, 0x6bc45cd0 -0, 739800, 160, 0x8f714c36 -0, 740700, 160, 0xfb1f4c87 -0, 741600, 160, 0x1f8a4b36 -0, 742500, 160, 0xee5c451a -0, 743400, 160, 0xd56950ac -0, 744300, 160, 0x529057f6 -0, 745200, 160, 0x336641fd -0, 746100, 160, 0xa0dd5a66 -0, 747000, 160, 0x5f4b5248 -0, 747900, 160, 0xb6ef49a3 -0, 748800, 160, 0x07705f19 -0, 749700, 160, 0x3fce4bbb -0, 750600, 160, 0xda395511 -0, 751500, 160, 0x1ecf5145 -0, 752400, 160, 0x88a547ab -0, 753300, 160, 0x6c6849be -0, 754200, 160, 0x979c4e97 -0, 755100, 160, 0x171854b3 -0, 756000, 160, 0x9a715283 -0, 756900, 160, 0x064e50ac -0, 757800, 160, 0xc2fb4e94 -0, 758700, 160, 0x708146f5 -0, 759600, 160, 0x1ca45198 -0, 760500, 160, 0x332d4869 -0, 761400, 160, 0xc2ff4656 -0, 762300, 160, 0x0747552e -0, 763200, 160, 0x0c3d4ba8 -0, 764100, 160, 0x72934dab -0, 765000, 160, 0xbb1e5860 -0, 765900, 160, 0x526d4cea -0, 766800, 160, 0xa4c445d6 -0, 767700, 160, 0x70cd49ba -0, 768600, 160, 0x008c53a7 -0, 769500, 160, 0xf7174bca -0, 770400, 160, 0x0bab4936 -0, 771300, 160, 0x59e5564d -0, 772200, 160, 0x33045087 -0, 773100, 160, 0xde7454f0 -0, 774000, 160, 0x31184cc3 -0, 774900, 160, 0x37984bb3 -0, 775800, 160, 0xf5e052d4 -0, 776700, 160, 0x23ca4b42 -0, 777600, 160, 0xbe2a572b -0, 778500, 160, 0x9a91538d -0, 779400, 160, 0x8a994c40 -0, 780300, 160, 0x5dea51ee -0, 781200, 160, 0x1b53524c -0, 782100, 160, 0xd9e75227 -0, 783000, 160, 0x58384c3b -0, 783900, 160, 0x4a1b53b2 -0, 784800, 160, 0xc2a3458a -0, 785700, 160, 0x7f68502d -0, 786600, 160, 0x85475559 -0, 787500, 160, 0xd0d25472 -0, 788400, 160, 0x4c0d4bbf -0, 789300, 160, 0xcad352df -0, 790200, 160, 0x17904c97 -0, 791100, 160, 0x4e774b8e -0, 792000, 160, 0x21905952 -0, 792900, 160, 0xc2d950cd -0, 793800, 160, 0xfdea55e6 -0, 794700, 160, 0x22ca4e37 -0, 795600, 160, 0x1143562a -0, 796500, 160, 0xe83c583e -0, 797400, 160, 0xba544b27 -0, 798300, 160, 0x1e8c50e4 -0, 799200, 160, 0xf7ca4d2a -0, 800100, 160, 0x67764579 -0, 801000, 160, 0x40d74f42 -0, 801900, 160, 0x88e35360 -0, 802800, 160, 0xda3f4f5b -0, 803700, 160, 0x19c1522f -0, 804600, 160, 0x93ce4f78 -0, 805500, 160, 0xf65447ba -0, 806400, 160, 0xc0bc4e5a -0, 807300, 160, 0x4915572b -0, 808200, 160, 0x1651460b -0, 809100, 160, 0xffe552a5 -0, 810000, 160, 0x5bd351ab -0, 810900, 160, 0xbbd85034 -0, 811800, 160, 0xb9ff505f -0, 812700, 160, 0xfc104eaf -0, 813600, 160, 0xdaa74d6c -0, 814500, 160, 0x34b04d78 -0, 815400, 160, 0x1e924f70 -0, 816300, 160, 0x0d46512d -0, 817200, 160, 0x0d115950 -0, 818100, 160, 0x62de55a4 -0, 819000, 160, 0x58d652ab -0, 819900, 160, 0x1776584e -0, 820800, 160, 0x60175a2b -0, 821700, 160, 0x4d714c82 -0, 822600, 160, 0xe13c4ce0 -0, 823500, 160, 0x7cd15464 -0, 824400, 160, 0x6c87571a -0, 825300, 160, 0x1abe4f07 -0, 826200, 160, 0x039d5661 -0, 827100, 160, 0x0eba5909 -0, 828000, 160, 0xa46e51ec -0, 828900, 160, 0x9be44eb7 -0, 829800, 160, 0xe0634aad -0, 830700, 160, 0xcd53530b -0, 831600, 160, 0x12cd482c -0, 832500, 160, 0x71884634 -0, 833400, 160, 0xd5845743 -0, 834300, 160, 0xacd1502c -0, 835200, 160, 0x04795031 -0, 836100, 160, 0xf0df54b9 -0, 837000, 160, 0x43aa5155 -0, 837900, 160, 0x316a4988 -0, 838800, 160, 0xfbc64f8a -0, 839700, 160, 0xda084e8e -0, 840600, 160, 0x3cc34ce2 -0, 841500, 160, 0xbfc055d8 -0, 842400, 160, 0x20ef4876 -0, 843300, 160, 0x035a5660 -0, 844200, 160, 0xbc7255be -0, 845100, 160, 0xba514f44 -0, 846000, 160, 0x868c4c9c -0, 846900, 160, 0x83494f04 -0, 847800, 160, 0xa452521a -0, 848700, 160, 0x2ed04f65 -0, 849600, 160, 0x2e3e592d -0, 850500, 160, 0x82bc4763 -0, 851400, 160, 0x339950db -0, 852300, 160, 0x5bb64eff -0, 853200, 160, 0x347c4d85 -0, 854100, 160, 0x25e949a3 -0, 855000, 160, 0xbdf649a8 -0, 855900, 160, 0x498650f3 -0, 856800, 160, 0x2a6f4e60 -0, 857700, 160, 0x661e5697 -0, 858600, 160, 0x5d6150ca -0, 859500, 160, 0xe7c74b8f -0, 860400, 160, 0x1ae148da -0, 861300, 160, 0xaeef485d -0, 862200, 160, 0x105650c6 -0, 863100, 160, 0xc1c45376 -0, 864000, 160, 0x83c55011 -0, 864900, 160, 0x77025597 -0, 865800, 160, 0x324250b7 -0, 866700, 160, 0x5cdc570f -0, 867600, 160, 0x292e52a1 -0, 868500, 160, 0x8d7a5090 -0, 869400, 160, 0x32fc54e4 -0, 870300, 160, 0x50984e8b -0, 871200, 160, 0x07f442a0 -0, 872100, 160, 0xc91c4fc3 -0, 873000, 160, 0x06cf53d7 -0, 873900, 160, 0xa66c5923 -0, 874800, 160, 0xc2015120 -0, 875700, 160, 0xedfa50c4 -0, 876600, 160, 0xe4c85fb5 -0, 877500, 160, 0xcd7b4c65 -0, 878400, 160, 0xb22353c1 -0, 879300, 160, 0x298c5996 -0, 880200, 160, 0xefce51db -0, 881100, 160, 0x6df74ee3 -0, 882000, 160, 0x7c46496b -0, 882900, 160, 0x910a48a4 -0, 883800, 160, 0xbf504b1e -0, 884700, 160, 0x096947e8 -0, 885600, 160, 0x4a07629d -0, 886500, 160, 0x577b43c1 -0, 887400, 160, 0x939e4d6d -0, 888300, 160, 0x486e48ac -0, 889200, 160, 0x50064871 -0, 890100, 160, 0x4a255534 -0, 891000, 160, 0xc80d4618 -0, 891900, 160, 0xf18a4780 -0, 892800, 160, 0x1c274dd4 -0, 893700, 160, 0x2f3e4f7c -0, 894600, 160, 0x44b24cc2 -0, 895500, 160, 0x89b451f4 -0, 896400, 160, 0x06515b65 -0, 897300, 160, 0xc5b857ce -0, 898200, 160, 0xa47b47a7 -0, 899100, 160, 0xfb375448 diff --git a/tests/ref/fate/g729-1 b/tests/ref/fate/g729-1 deleted file mode 100644 index 6bf05c5efd..0000000000 --- a/tests/ref/fate/g729-1 +++ /dev/null @@ -1,1000 +0,0 @@ -0, 0, 160, 0xf7e550f0 -0, 900, 160, 0x42794ea8 -0, 1800, 160, 0xfe023e42 -0, 2700, 160, 0xc1ae40e3 -0, 3600, 160, 0xee6d4bf1 -0, 4500, 160, 0x107451d7 -0, 5400, 160, 0x40cb4ba4 -0, 6300, 160, 0x90504e5e -0, 7200, 160, 0xf6f3531d -0, 8100, 160, 0x48664ea0 -0, 9000, 160, 0xa30458e1 -0, 9900, 160, 0x00b74aa2 -0, 10800, 160, 0x95234e49 -0, 11700, 160, 0x9cf24a94 -0, 12600, 160, 0x4f2952f4 -0, 13500, 160, 0x658353db -0, 14400, 160, 0x98ef4d79 -0, 15300, 160, 0x765d5472 -0, 16200, 160, 0xc6e25262 -0, 17100, 160, 0x33334993 -0, 18000, 160, 0xfa104dc5 -0, 18900, 160, 0x03ee5530 -0, 19800, 160, 0x52c54e0e -0, 20700, 160, 0xbd744638 -0, 21600, 160, 0x7775519f -0, 22500, 160, 0xd22f499e -0, 23400, 160, 0x26af4eec -0, 24300, 160, 0x37474ed9 -0, 25200, 160, 0x6b19548d -0, 26100, 160, 0x4a3449b7 -0, 27000, 160, 0x2bed5231 -0, 27900, 160, 0x556d5349 -0, 28800, 160, 0xbb6c5227 -0, 29700, 160, 0xea354b4d -0, 30600, 160, 0xf35f4b7d -0, 31500, 160, 0x9dcb4e9d -0, 32400, 160, 0xc81f5ac2 -0, 33300, 160, 0xfa054cfd -0, 34200, 160, 0x0c554e62 -0, 35100, 160, 0x7ffa5250 -0, 36000, 160, 0x7e5148ec -0, 36900, 160, 0x95bc4d69 -0, 37800, 160, 0xf34a5644 -0, 38700, 160, 0xcaa3493d -0, 39600, 160, 0xa44745dc -0, 40500, 160, 0x320355c0 -0, 41400, 160, 0xbd1e5670 -0, 42300, 160, 0xfe3250cd -0, 43200, 160, 0xce7a574c -0, 44100, 160, 0x09b04f6e -0, 45000, 160, 0x035759c8 -0, 45900, 160, 0x713458c7 -0, 46800, 160, 0x9a75494b -0, 47700, 160, 0x99114fef -0, 48600, 160, 0x129251f0 -0, 49500, 160, 0x4eb845f2 -0, 50400, 160, 0x5d064da5 -0, 51300, 160, 0x5a8e4a34 -0, 52200, 160, 0x5b784608 -0, 53100, 160, 0x1ca7546a -0, 54000, 160, 0x327e5cbf -0, 54900, 160, 0xd7ae4bc3 -0, 55800, 160, 0xba3f55b4 -0, 56700, 160, 0x09fe4ca7 -0, 57600, 160, 0x347248ba -0, 58500, 160, 0xf0bf52ff -0, 59400, 160, 0x3500507e -0, 60300, 160, 0x30e65135 -0, 61200, 160, 0x390a5201 -0, 62100, 160, 0xf0dc5bca -0, 63000, 160, 0x69b94f64 -0, 63900, 160, 0x6ac04cf6 -0, 64800, 160, 0xbc014cf4 -0, 65700, 160, 0x4b564eca -0, 66600, 160, 0x33e44e85 -0, 67500, 160, 0xe39e5343 -0, 68400, 160, 0xebf64c80 -0, 69300, 160, 0x5a92562b -0, 70200, 160, 0xe0075c88 -0, 71100, 160, 0x59bd55e8 -0, 72000, 160, 0xe6ca4ef2 -0, 72900, 160, 0xea9a4df2 -0, 73800, 160, 0xf53c4bf6 -0, 74700, 160, 0x977a4f32 -0, 75600, 160, 0xe5894eb2 -0, 76500, 160, 0x956c4c28 -0, 77400, 160, 0xdff74c3d -0, 78300, 160, 0xace74db7 -0, 79200, 160, 0x00e74ef5 -0, 80100, 160, 0x6633560a -0, 81000, 160, 0xd63647c5 -0, 81900, 160, 0xff144eef -0, 82800, 160, 0xc5fe4d51 -0, 83700, 160, 0x5c244c7c -0, 84600, 160, 0x95be50f1 -0, 85500, 160, 0x74d84b77 -0, 86400, 160, 0x1e965711 -0, 87300, 160, 0x7ae45ad7 -0, 88200, 160, 0xf9cd5920 -0, 89100, 160, 0xf0064ea9 -0, 90000, 160, 0xec645244 -0, 90900, 160, 0x8330539a -0, 91800, 160, 0x4a5d5023 -0, 92700, 160, 0x706153d7 -0, 93600, 160, 0xd6e0520f -0, 94500, 160, 0x0bd9586f -0, 95400, 160, 0xc1554dec -0, 96300, 160, 0x89be4bde -0, 97200, 160, 0x0c2a49c0 -0, 98100, 160, 0xc18d498a -0, 99000, 160, 0xc36147e1 -0, 99900, 160, 0x99de4d4b -0, 100800, 160, 0x2b9d542b -0, 101700, 160, 0x062b52c9 -0, 102600, 160, 0x9dcf542e -0, 103500, 160, 0x641f58b9 -0, 104400, 160, 0x114c51ff -0, 105300, 160, 0x78e04b0e -0, 106200, 160, 0xfec74535 -0, 107100, 160, 0x71d54cd3 -0, 108000, 160, 0xee9e5289 -0, 108900, 160, 0x142354d9 -0, 109800, 160, 0x051e4ddc -0, 110700, 160, 0x358146b8 -0, 111600, 160, 0x4dec58eb -0, 112500, 160, 0xd0944f04 -0, 113400, 160, 0xdc025a99 -0, 114300, 160, 0x6b355402 -0, 115200, 160, 0x1c0b5a6d -0, 116100, 160, 0xa3b34bc8 -0, 117000, 160, 0x92604eb7 -0, 117900, 160, 0x6f2f5465 -0, 118800, 160, 0xcb565361 -0, 119700, 160, 0x8bfb50a3 -0, 120600, 160, 0xf9114e99 -0, 121500, 160, 0x11065580 -0, 122400, 160, 0x903550c8 -0, 123300, 160, 0xe7aa3da8 -0, 124200, 160, 0x13f34e01 -0, 125100, 160, 0x4c3b4c0a -0, 126000, 160, 0x08e64c60 -0, 126900, 160, 0xffcd6176 -0, 127800, 160, 0x09684f13 -0, 128700, 160, 0xd8a646b5 -0, 129600, 160, 0xc07355f0 -0, 130500, 160, 0xe836515b -0, 131400, 160, 0x935741a5 -0, 132300, 160, 0x68f85160 -0, 133200, 160, 0x669a4ed0 -0, 134100, 160, 0xce9f4883 -0, 135000, 160, 0xd94c42de -0, 135900, 160, 0xf1874b54 -0, 136800, 160, 0x42da46ce -0, 137700, 160, 0xe99a4da5 -0, 138600, 160, 0x94934f16 -0, 139500, 160, 0x8571437f -0, 140400, 160, 0xe4774dc2 -0, 141300, 160, 0x743f4f89 -0, 142200, 160, 0x3b3e50ba -0, 143100, 160, 0x439355e9 -0, 144000, 160, 0x3e4d5178 -0, 144900, 160, 0x64595524 -0, 145800, 160, 0x42d14702 -0, 146700, 160, 0x051e4b1d -0, 147600, 160, 0x5db84cee -0, 148500, 160, 0x4d875136 -0, 149400, 160, 0x33b75996 -0, 150300, 160, 0xd5094d76 -0, 151200, 160, 0x6a7052b7 -0, 152100, 160, 0x77264c8f -0, 153000, 160, 0xcf7e4ccf -0, 153900, 160, 0x5f7c568b -0, 154800, 160, 0x8886578b -0, 155700, 160, 0xd33a4e52 -0, 156600, 160, 0xeefe5c23 -0, 157500, 160, 0xa9c94e38 -0, 158400, 160, 0x67845aa0 -0, 159300, 160, 0xbe91498f -0, 160200, 160, 0x843d46e3 -0, 161100, 160, 0xbd215999 -0, 162000, 160, 0x1a2e5f2c -0, 162900, 160, 0x6a344a63 -0, 163800, 160, 0xd80d5743 -0, 164700, 160, 0x80964879 -0, 165600, 160, 0xaafb5e35 -0, 166500, 160, 0x3b855ff3 -0, 167400, 160, 0x770b51d0 -0, 168300, 160, 0x623a5312 -0, 169200, 160, 0x0c235b56 -0, 170100, 160, 0xc8c25724 -0, 171000, 160, 0xb44650e2 -0, 171900, 160, 0xab964d47 -0, 172800, 160, 0x7aa35107 -0, 173700, 160, 0xf12d4780 -0, 174600, 160, 0x77e64f92 -0, 175500, 160, 0x34ee4fa0 -0, 176400, 160, 0x6701466b -0, 177300, 160, 0xa79d4b4c -0, 178200, 160, 0xbb7f557b -0, 179100, 160, 0xaeb253c4 -0, 180000, 160, 0xe7255029 -0, 180900, 160, 0xa5f1505c -0, 181800, 160, 0x4ae54f09 -0, 182700, 160, 0x6a2b4bc9 -0, 183600, 160, 0xf8724ea5 -0, 184500, 160, 0x4ab35317 -0, 185400, 160, 0xc8d350fb -0, 186300, 160, 0x73a74994 -0, 187200, 160, 0x9cd1596d -0, 188100, 160, 0x5ba16005 -0, 189000, 160, 0xb17e4fcc -0, 189900, 160, 0x8ac958cd -0, 190800, 160, 0x7919557f -0, 191700, 160, 0x0be35121 -0, 192600, 160, 0xf8f752f2 -0, 193500, 160, 0xae894d40 -0, 194400, 160, 0x03d94c10 -0, 195300, 160, 0xf12c4917 -0, 196200, 160, 0x3c94534e -0, 197100, 160, 0x111d51c3 -0, 198000, 160, 0x0a285304 -0, 198900, 160, 0xc3ac4ab1 -0, 199800, 160, 0x5576579d -0, 200700, 160, 0x9cd04f10 -0, 201600, 160, 0x38a04bf9 -0, 202500, 160, 0xbd0d4d6d -0, 203400, 160, 0x4db24510 -0, 204300, 160, 0x968753de -0, 205200, 160, 0x1fa35c67 -0, 206100, 160, 0xc9c048bc -0, 207000, 160, 0x221d629e -0, 207900, 160, 0xbb864b0e -0, 208800, 160, 0xe2964bcd -0, 209700, 160, 0x20ff4b23 -0, 210600, 160, 0x01dc53e7 -0, 211500, 160, 0x522b56aa -0, 212400, 160, 0x1e6a495a -0, 213300, 160, 0x0dcf5731 -0, 214200, 160, 0x241f448d -0, 215100, 160, 0xdafa55b6 -0, 216000, 160, 0x40584e43 -0, 216900, 160, 0xb73850ab -0, 217800, 160, 0x7cff593a -0, 218700, 160, 0x2796515a -0, 219600, 160, 0x872c5454 -0, 220500, 160, 0xa13058e7 -0, 221400, 160, 0xd8a65261 -0, 222300, 160, 0x48a75601 -0, 223200, 160, 0xb1e7584c -0, 224100, 160, 0x29cd53fa -0, 225000, 160, 0xba514d84 -0, 225900, 160, 0x747f4f99 -0, 226800, 160, 0x5819526e -0, 227700, 160, 0x10185413 -0, 228600, 160, 0x4d084cdc -0, 229500, 160, 0x8313530b -0, 230400, 160, 0xd26c5583 -0, 231300, 160, 0x76d749f9 -0, 232200, 160, 0x7cf847a5 -0, 233100, 160, 0xa642590c -0, 234000, 160, 0x7fef56f2 -0, 234900, 160, 0xf6ea49b9 -0, 235800, 160, 0x6c654e89 -0, 236700, 160, 0x164f56e9 -0, 237600, 160, 0x84cf6139 -0, 238500, 160, 0x20c753ef -0, 239400, 160, 0x3f3a485f -0, 240300, 160, 0xee0c5f4b -0, 241200, 160, 0x706b5313 -0, 242100, 160, 0x47da5af3 -0, 243000, 160, 0x05504b25 -0, 243900, 160, 0x584e59d8 -0, 244800, 160, 0xe9cc4e37 -0, 245700, 160, 0xf33b518a -0, 246600, 160, 0xb9ac58b7 -0, 247500, 160, 0xed5c57f0 -0, 248400, 160, 0x4cf1579d -0, 249300, 160, 0x96f94792 -0, 250200, 160, 0x7c455836 -0, 251100, 160, 0xad6652ce -0, 252000, 160, 0x1ba95cab -0, 252900, 160, 0xd86755bb -0, 253800, 160, 0x2f9e51b4 -0, 254700, 160, 0x084e5119 -0, 255600, 160, 0x54ad5449 -0, 256500, 160, 0xff7c5b86 -0, 257400, 160, 0x29a94fff -0, 258300, 160, 0x679c55ff -0, 259200, 160, 0x9a415b81 -0, 260100, 160, 0x3ea5528a -0, 261000, 160, 0x54e15d3f -0, 261900, 160, 0x122b5c28 -0, 262800, 160, 0xdc0f4e7f -0, 263700, 160, 0xdc304acd -0, 264600, 160, 0xe55e5407 -0, 265500, 160, 0x8d07485f -0, 266400, 160, 0xdc0b5333 -0, 267300, 160, 0xfaed4a90 -0, 268200, 160, 0xb0625538 -0, 269100, 160, 0x1ef3526b -0, 270000, 160, 0xb48c48e9 -0, 270900, 160, 0x8c945190 -0, 271800, 160, 0x7f9a58b3 -0, 272700, 160, 0x55735499 -0, 273600, 160, 0xeba34a71 -0, 274500, 160, 0xbaa94a6d -0, 275400, 160, 0x15ab484f -0, 276300, 160, 0xdc675509 -0, 277200, 160, 0xc2e94f0e -0, 278100, 160, 0xd7f348ac -0, 279000, 160, 0x14884e8f -0, 279900, 160, 0x2d274a97 -0, 280800, 160, 0x578c5834 -0, 281700, 160, 0x12074dab -0, 282600, 160, 0x74c55067 -0, 283500, 160, 0x7c904e0f -0, 284400, 160, 0x81d45735 -0, 285300, 160, 0x766f4d71 -0, 286200, 160, 0x9c915273 -0, 287100, 160, 0xf37f4d04 -0, 288000, 160, 0x1ac74d66 -0, 288900, 160, 0xf9b253ab -0, 289800, 160, 0x6e0c5bb2 -0, 290700, 160, 0x603d629e -0, 291600, 160, 0xbb674faf -0, 292500, 160, 0x5d8d51c6 -0, 293400, 160, 0xae7350b9 -0, 294300, 160, 0xfde859ec -0, 295200, 160, 0x900d50a4 -0, 296100, 160, 0x003551b2 -0, 297000, 160, 0xf8ae4c9d -0, 297900, 160, 0x66ea508f -0, 298800, 160, 0xd45b4c51 -0, 299700, 160, 0xb64451a3 -0, 300600, 160, 0x6d2a5621 -0, 301500, 160, 0x71db4d36 -0, 302400, 160, 0x06704647 -0, 303300, 160, 0x1f124cf9 -0, 304200, 160, 0x10d14b46 -0, 305100, 160, 0x421b59d8 -0, 306000, 160, 0x84ba4cae -0, 306900, 160, 0x4fba48e1 -0, 307800, 160, 0xec294a6b -0, 308700, 160, 0x2f1752a7 -0, 309600, 160, 0x8d665570 -0, 310500, 160, 0x586e537d -0, 311400, 160, 0x18d54a49 -0, 312300, 160, 0xa895566d -0, 313200, 160, 0xb9b35255 -0, 314100, 160, 0x2e194e1f -0, 315000, 160, 0x4810594b -0, 315900, 160, 0xb82557ee -0, 316800, 160, 0x35d84d67 -0, 317700, 160, 0x5ee95128 -0, 318600, 160, 0x24f05747 -0, 319500, 160, 0x434d53f6 -0, 320400, 160, 0x3c894f3e -0, 321300, 160, 0x81c34896 -0, 322200, 160, 0x7540543c -0, 323100, 160, 0x35bc5504 -0, 324000, 160, 0x546943dc -0, 324900, 160, 0x084d46e9 -0, 325800, 160, 0x983852ba -0, 326700, 160, 0xefac4e15 -0, 327600, 160, 0xc9294430 -0, 328500, 160, 0xe9e74de1 -0, 329400, 160, 0x4ca1516a -0, 330300, 160, 0x44014ceb -0, 331200, 160, 0x1dbc5ad1 -0, 332100, 160, 0x98be4efd -0, 333000, 160, 0x2dc75c7a -0, 333900, 160, 0x46275852 -0, 334800, 160, 0x61c15d30 -0, 335700, 160, 0x1f605adc -0, 336600, 160, 0xf08659ac -0, 337500, 160, 0xb7656021 -0, 338400, 160, 0x1f4a5a72 -0, 339300, 160, 0xf8175275 -0, 340200, 160, 0xbbf4564d -0, 341100, 160, 0x6fdc5a7d -0, 342000, 160, 0x082f5250 -0, 342900, 160, 0x84cb55b5 -0, 343800, 160, 0x0e1a51ba -0, 344700, 160, 0xa84e52fc -0, 345600, 160, 0xcb5a55c9 -0, 346500, 160, 0x9ce6570d -0, 347400, 160, 0x82b253cc -0, 348300, 160, 0x34c4594b -0, 349200, 160, 0xff5c5854 -0, 350100, 160, 0xd5da4ea0 -0, 351000, 160, 0xc86e5553 -0, 351900, 160, 0x7ecb55c6 -0, 352800, 160, 0xb08b5338 -0, 353700, 160, 0xd601573c -0, 354600, 160, 0x93305092 -0, 355500, 160, 0x352d4912 -0, 356400, 160, 0xddba4d29 -0, 357300, 160, 0xc79c50b7 -0, 358200, 160, 0xe67d4e8e -0, 359100, 160, 0xdbfd4bbc -0, 360000, 160, 0xb2f746fb -0, 360900, 160, 0x835b5539 -0, 361800, 160, 0x612049e9 -0, 362700, 160, 0x91a6503c -0, 363600, 160, 0x762e4f0e -0, 364500, 160, 0x2b2153f9 -0, 365400, 160, 0xdcfe5804 -0, 366300, 160, 0x79144cae -0, 367200, 160, 0xd6394d99 -0, 368100, 160, 0x22395292 -0, 369000, 160, 0x50b04fa0 -0, 369900, 160, 0x846b49a5 -0, 370800, 160, 0x1f554dff -0, 371700, 160, 0x0aa458dd -0, 372600, 160, 0x62154dde -0, 373500, 160, 0xe69847ac -0, 374400, 160, 0x75855425 -0, 375300, 160, 0x49125665 -0, 376200, 160, 0xa8605945 -0, 377100, 160, 0xc02a5083 -0, 378000, 160, 0x6198537c -0, 378900, 160, 0x90f25711 -0, 379800, 160, 0x32da51f1 -0, 380700, 160, 0x96c3474d -0, 381600, 160, 0x82ae4579 -0, 382500, 160, 0xbabf5919 -0, 383400, 160, 0x78095772 -0, 384300, 160, 0x46964abb -0, 385200, 160, 0x5fcb5ba3 -0, 386100, 160, 0x4a775585 -0, 387000, 160, 0xc41f53af -0, 387900, 160, 0x457251bc -0, 388800, 160, 0x8f864fb3 -0, 389700, 160, 0x439d526c -0, 390600, 160, 0x5cf6503f -0, 391500, 160, 0x90b7534f -0, 392400, 160, 0xecc45253 -0, 393300, 160, 0x533b4ee3 -0, 394200, 160, 0x4cc44f27 -0, 395100, 160, 0x6ff35096 -0, 396000, 160, 0x141e4a80 -0, 396900, 160, 0x9e075461 -0, 397800, 160, 0xc4b55791 -0, 398700, 160, 0x40955666 -0, 399600, 160, 0x6255462f -0, 400500, 160, 0x2cec55d6 -0, 401400, 160, 0xd71652e9 -0, 402300, 160, 0xe65e530c -0, 403200, 160, 0xeeb9556d -0, 404100, 160, 0x558f523e -0, 405000, 160, 0x76e14b00 -0, 405900, 160, 0x3f9f4e9b -0, 406800, 160, 0x0d7b492a -0, 407700, 160, 0xdd6e51bd -0, 408600, 160, 0x5ab353b9 -0, 409500, 160, 0x5b934f33 -0, 410400, 160, 0x36bb57a0 -0, 411300, 160, 0x455d54d3 -0, 412200, 160, 0x7e6853d7 -0, 413100, 160, 0xdcb85ed4 -0, 414000, 160, 0x3a8d5860 -0, 414900, 160, 0x5c90558f -0, 415800, 160, 0x25504d46 -0, 416700, 160, 0x0fc55413 -0, 417600, 160, 0x98545409 -0, 418500, 160, 0x963b550e -0, 419400, 160, 0x544a569c -0, 420300, 160, 0x7ab65f77 -0, 421200, 160, 0x14c257e2 -0, 422100, 160, 0x6cac6262 -0, 423000, 160, 0x2f7f5091 -0, 423900, 160, 0xc2655462 -0, 424800, 160, 0xbb4b4744 -0, 425700, 160, 0x4c5f54db -0, 426600, 160, 0x9e694ab5 -0, 427500, 160, 0xc2c95173 -0, 428400, 160, 0xf4ae553f -0, 429300, 160, 0xb4c04ed1 -0, 430200, 160, 0xf3095128 -0, 431100, 160, 0x73b04de1 -0, 432000, 160, 0xff4951c7 -0, 432900, 160, 0x28c156bd -0, 433800, 160, 0x17b652aa -0, 434700, 160, 0xb9ce528b -0, 435600, 160, 0x3cc558be -0, 436500, 160, 0xdf385905 -0, 437400, 160, 0xe2de4fe2 -0, 438300, 160, 0xc2a6582d -0, 439200, 160, 0xe5715bc9 -0, 440100, 160, 0x741b6416 -0, 441000, 160, 0xf9b1544f -0, 441900, 160, 0x012e5f01 -0, 442800, 160, 0x5ab65a49 -0, 443700, 160, 0xfe1e5b1a -0, 444600, 160, 0x370056ef -0, 445500, 160, 0xfde45ed4 -0, 446400, 160, 0xa34f6053 -0, 447300, 160, 0x31755604 -0, 448200, 160, 0xc3415bfe -0, 449100, 160, 0xe5dd5b58 -0, 450000, 160, 0xb6cf5295 -0, 450900, 160, 0x3d81538b -0, 451800, 160, 0xc00255d2 -0, 452700, 160, 0xb0714f71 -0, 453600, 160, 0x9c9756ac -0, 454500, 160, 0x4de053a0 -0, 455400, 160, 0x6706500c -0, 456300, 160, 0x34e4511d -0, 457200, 160, 0xe4224e3e -0, 458100, 160, 0xdf695529 -0, 459000, 160, 0xeb1f54e0 -0, 459900, 160, 0x2870550e -0, 460800, 160, 0x08465464 -0, 461700, 160, 0xe34150e6 -0, 462600, 160, 0xb77556e0 -0, 463500, 160, 0xb23e46ab -0, 464400, 160, 0x83884a7b -0, 465300, 160, 0xa0284b16 -0, 466200, 160, 0x87b749e1 -0, 467100, 160, 0x4b276444 -0, 468000, 160, 0x92f95091 -0, 468900, 160, 0x2b1056c2 -0, 469800, 160, 0xd5d5590a -0, 470700, 160, 0x5a454fac -0, 471600, 160, 0x0ab05b13 -0, 472500, 160, 0xd98e56ca -0, 473400, 160, 0x183d5892 -0, 474300, 160, 0x8ba951e4 -0, 475200, 160, 0x487054ff -0, 476100, 160, 0xc0d05562 -0, 477000, 160, 0x166c590f -0, 477900, 160, 0x3e254cc0 -0, 478800, 160, 0xd2784ab4 -0, 479700, 160, 0x9f7b4ef6 -0, 480600, 160, 0xdd7653b6 -0, 481500, 160, 0x7ae453b7 -0, 482400, 160, 0xff6c50ec -0, 483300, 160, 0xfa0d51a9 -0, 484200, 160, 0x29ab583b -0, 485100, 160, 0x671d5437 -0, 486000, 160, 0x6867569f -0, 486900, 160, 0xdd775e05 -0, 487800, 160, 0xbafa65ed -0, 488700, 160, 0xd33f5aea -0, 489600, 160, 0x851455a8 -0, 490500, 160, 0x044c4d45 -0, 491400, 160, 0xcd7c5d84 -0, 492300, 160, 0xd6565e61 -0, 493200, 160, 0x2f345a92 -0, 494100, 160, 0x50e05530 -0, 495000, 160, 0x787f516a -0, 495900, 160, 0x75cd5ade -0, 496800, 160, 0x55b558ad -0, 497700, 160, 0x55255b01 -0, 498600, 160, 0xfc5b5945 -0, 499500, 160, 0x33914e05 -0, 500400, 160, 0x1f4a5c31 -0, 501300, 160, 0x542f4bf2 -0, 502200, 160, 0xd8b2573f -0, 503100, 160, 0x127758b0 -0, 504000, 160, 0x18dd5a30 -0, 504900, 160, 0xe8ce61c4 -0, 505800, 160, 0x9a225b47 -0, 506700, 160, 0xd4436314 -0, 507600, 160, 0x2bf06310 -0, 508500, 160, 0x0de35e82 -0, 509400, 160, 0x76cb56f2 -0, 510300, 160, 0x65bc569b -0, 511200, 160, 0x00a45461 -0, 512100, 160, 0xb5c55019 -0, 513000, 160, 0x5eb04b4d -0, 513900, 160, 0xf1224c39 -0, 514800, 160, 0x4d135288 -0, 515700, 160, 0x9bc34ba7 -0, 516600, 160, 0xbde3510e -0, 517500, 160, 0xefaf4fa4 -0, 518400, 160, 0x584950e2 -0, 519300, 160, 0x1e844e27 -0, 520200, 160, 0x38634315 -0, 521100, 160, 0x6b9b4a0b -0, 522000, 160, 0xd491512a -0, 522900, 160, 0x8624478c -0, 523800, 160, 0x67ab45c7 -0, 524700, 160, 0xf78e4c53 -0, 525600, 160, 0xb1654f0d -0, 526500, 160, 0x17bb4e96 -0, 527400, 160, 0xf3165e7c -0, 528300, 160, 0xf7914633 -0, 529200, 160, 0x3421530f -0, 530100, 160, 0x492e572c -0, 531000, 160, 0xa3185319 -0, 531900, 160, 0x92d054c0 -0, 532800, 160, 0x1cc24ce1 -0, 533700, 160, 0x2ebc519e -0, 534600, 160, 0x946b53e7 -0, 535500, 160, 0xf85c4fe6 -0, 536400, 160, 0x2974534c -0, 537300, 160, 0xef7e4a28 -0, 538200, 160, 0x01a74c6e -0, 539100, 160, 0x2a865674 -0, 540000, 160, 0x70474faf -0, 540900, 160, 0x2df75014 -0, 541800, 160, 0xf1f3574e -0, 542700, 160, 0x741b5308 -0, 543600, 160, 0xcb34513e -0, 544500, 160, 0x7b5e50c7 -0, 545400, 160, 0x0165553b -0, 546300, 160, 0x04b85450 -0, 547200, 160, 0x795d5873 -0, 548100, 160, 0x508859fb -0, 549000, 160, 0xca09587d -0, 549900, 160, 0x86a65ac8 -0, 550800, 160, 0x447353fe -0, 551700, 160, 0x48ca54a5 -0, 552600, 160, 0x1b3e5f3e -0, 553500, 160, 0x270a5aa2 -0, 554400, 160, 0x48a45c29 -0, 555300, 160, 0xfbf75a0b -0, 556200, 160, 0xe65161e5 -0, 557100, 160, 0xf47c6701 -0, 558000, 160, 0xc12058bc -0, 558900, 160, 0xdb17520c -0, 559800, 160, 0x860455bd -0, 560700, 160, 0xa02d56de -0, 561600, 160, 0xf5574c7d -0, 562500, 160, 0x500e59b3 -0, 563400, 160, 0xf0b75894 -0, 564300, 160, 0x9d454a04 -0, 565200, 160, 0x0b0554a4 -0, 566100, 160, 0x3fc34d98 -0, 567000, 160, 0x538550b8 -0, 567900, 160, 0xd84e495e -0, 568800, 160, 0x736c4e17 -0, 569700, 160, 0xa59e5607 -0, 570600, 160, 0xe7485609 -0, 571500, 160, 0x20185a67 -0, 572400, 160, 0x9aa5576f -0, 573300, 160, 0xed8c5d11 -0, 574200, 160, 0xecef5494 -0, 575100, 160, 0x76f75a5c -0, 576000, 160, 0xa8fa5322 -0, 576900, 160, 0xd1945734 -0, 577800, 160, 0x817f5c82 -0, 578700, 160, 0x40756063 -0, 579600, 160, 0x524454c7 -0, 580500, 160, 0x5a776106 -0, 581400, 160, 0xd16e5d9d -0, 582300, 160, 0x8522524c -0, 583200, 160, 0x4a115bb9 -0, 584100, 160, 0xbf5c5c27 -0, 585000, 160, 0x48905da4 -0, 585900, 160, 0x58735040 -0, 586800, 160, 0x48635631 -0, 587700, 160, 0xf1305eaf -0, 588600, 160, 0xd34451bd -0, 589500, 160, 0x1a244fcf -0, 590400, 160, 0xdb995ca0 -0, 591300, 160, 0xe38e52bb -0, 592200, 160, 0x00715069 -0, 593100, 160, 0x72a95190 -0, 594000, 160, 0xea7d50b7 -0, 594900, 160, 0xb4094a9c -0, 595800, 160, 0xd5284d79 -0, 596700, 160, 0x3c4349e5 -0, 597600, 160, 0x65d34e92 -0, 598500, 160, 0x67805756 -0, 599400, 160, 0x1b96502f -0, 600300, 160, 0x395250ae -0, 601200, 160, 0x4dc74976 -0, 602100, 160, 0x2666486e -0, 603000, 160, 0x41924d01 -0, 603900, 160, 0x94a845f5 -0, 604800, 160, 0x1b264cf9 -0, 605700, 160, 0x63ea4aab -0, 606600, 160, 0x9c0d4a82 -0, 607500, 160, 0x02ba4cf6 -0, 608400, 160, 0x9cd54b87 -0, 609300, 160, 0x24624c5b -0, 610200, 160, 0x14cf54b1 -0, 611100, 160, 0xce54544b -0, 612000, 160, 0x459b4fc9 -0, 612900, 160, 0xcc2453f1 -0, 613800, 160, 0xa4ab53bc -0, 614700, 160, 0x92235013 -0, 615600, 160, 0xbfa257b3 -0, 616500, 160, 0xd32d51f5 -0, 617400, 160, 0x7d5d47e6 -0, 618300, 160, 0xe23d43ed -0, 619200, 160, 0x51d8514f -0, 620100, 160, 0x0fa04240 -0, 621000, 160, 0x233c4dce -0, 621900, 160, 0xcd30466f -0, 622800, 160, 0x4435546a -0, 623700, 160, 0x3eb6445b -0, 624600, 160, 0xcaed4ef9 -0, 625500, 160, 0xf0174da8 -0, 626400, 160, 0x60e756a0 -0, 627300, 160, 0x72ba457d -0, 628200, 160, 0x84ce4f0f -0, 629100, 160, 0x660d45ae -0, 630000, 160, 0xac8446e2 -0, 630900, 160, 0xeeb153b4 -0, 631800, 160, 0x6a634c23 -0, 632700, 160, 0x890f4af8 -0, 633600, 160, 0x1d3743a7 -0, 634500, 160, 0xa37e4ee8 -0, 635400, 160, 0xb9334d56 -0, 636300, 160, 0xc1384bef -0, 637200, 160, 0x52964f6e -0, 638100, 160, 0xe36e57e2 -0, 639000, 160, 0x62114a53 -0, 639900, 160, 0xb1f855bb -0, 640800, 160, 0xf0934da0 -0, 641700, 160, 0xb454494a -0, 642600, 160, 0xb6e04b15 -0, 643500, 160, 0x933e488e -0, 644400, 160, 0x762d5ce8 -0, 645300, 160, 0x1c4a4f85 -0, 646200, 160, 0xaaa25313 -0, 647100, 160, 0xd3655979 -0, 648000, 160, 0x8ff149e5 -0, 648900, 160, 0x5d5e51fb -0, 649800, 160, 0x0a354c51 -0, 650700, 160, 0x79ea52ee -0, 651600, 160, 0x306e5365 -0, 652500, 160, 0x7e03546a -0, 653400, 160, 0x71575ddf -0, 654300, 160, 0x08da523d -0, 655200, 160, 0x2a2152b2 -0, 656100, 160, 0x50e55447 -0, 657000, 160, 0xf3b55758 -0, 657900, 160, 0xc29d5f12 -0, 658800, 160, 0x0c0b5778 -0, 659700, 160, 0x1b07593a -0, 660600, 160, 0x946f562d -0, 661500, 160, 0xcdc85636 -0, 662400, 160, 0x2421589b -0, 663300, 160, 0x8e3b5451 -0, 664200, 160, 0xd565536a -0, 665100, 160, 0x8d225557 -0, 666000, 160, 0xa0084e44 -0, 666900, 160, 0x85bd5413 -0, 667800, 160, 0xa4be4c3b -0, 668700, 160, 0x332957c8 -0, 669600, 160, 0x60505225 -0, 670500, 160, 0x3d154eb3 -0, 671400, 160, 0xd85359f4 -0, 672300, 160, 0xf95b4f6b -0, 673200, 160, 0x8bea5846 -0, 674100, 160, 0x43835a02 -0, 675000, 160, 0x340b5732 -0, 675900, 160, 0x8b6d5005 -0, 676800, 160, 0xa4995aca -0, 677700, 160, 0x88d34efc -0, 678600, 160, 0x078e5003 -0, 679500, 160, 0x09964b19 -0, 680400, 160, 0x2eaf5120 -0, 681300, 160, 0x52514d52 -0, 682200, 160, 0x08f84d4c -0, 683100, 160, 0x4a9b4cc7 -0, 684000, 160, 0x947f4ca6 -0, 684900, 160, 0x086a4f32 -0, 685800, 160, 0x0e0857a6 -0, 686700, 160, 0x38145bf7 -0, 687600, 160, 0xc6e156bf -0, 688500, 160, 0xb07853b2 -0, 689400, 160, 0xaeda5172 -0, 690300, 160, 0xc4e54d07 -0, 691200, 160, 0x0b075a61 -0, 692100, 160, 0x09f05c1f -0, 693000, 160, 0xf5415796 -0, 693900, 160, 0xe3be584e -0, 694800, 160, 0x6e1656f9 -0, 695700, 160, 0xd6d85599 -0, 696600, 160, 0xd9b4502e -0, 697500, 160, 0x1186598c -0, 698400, 160, 0x879c543d -0, 699300, 160, 0x5b2551a3 -0, 700200, 160, 0xcf50528d -0, 701100, 160, 0x95d059b2 -0, 702000, 160, 0x34ba5515 -0, 702900, 160, 0x7a014ba8 -0, 703800, 160, 0x27725169 -0, 704700, 160, 0x2fd14ca4 -0, 705600, 160, 0xd5ad542a -0, 706500, 160, 0xddc24d2e -0, 707400, 160, 0x8a4b48b4 -0, 708300, 160, 0x915e4a29 -0, 709200, 160, 0xd56d4cae -0, 710100, 160, 0x59594eea -0, 711000, 160, 0x87085338 -0, 711900, 160, 0xa5ee538f -0, 712800, 160, 0xf34e5030 -0, 713700, 160, 0x6bef4da7 -0, 714600, 160, 0x05a14c52 -0, 715500, 160, 0x67bc49ce -0, 716400, 160, 0xb18f4cff -0, 717300, 160, 0x5d744e6d -0, 718200, 160, 0xcb7c5973 -0, 719100, 160, 0x6df056f0 -0, 720000, 160, 0xd62c4e00 -0, 720900, 160, 0xa54d4d1e -0, 721800, 160, 0xdaa250b0 -0, 722700, 160, 0x350e475f -0, 723600, 160, 0x0e454bb2 -0, 724500, 160, 0xe37949ca -0, 725400, 160, 0x551453bf -0, 726300, 160, 0x35d04c27 -0, 727200, 160, 0x6749469d -0, 728100, 160, 0x544752e9 -0, 729000, 160, 0xf23b4888 -0, 729900, 160, 0x6f0a5519 -0, 730800, 160, 0x808a58df -0, 731700, 160, 0x8e674c88 -0, 732600, 160, 0xd3ab51f7 -0, 733500, 160, 0x985d500f -0, 734400, 160, 0x734e52d8 -0, 735300, 160, 0xb0da5227 -0, 736200, 160, 0xcc7d4a21 -0, 737100, 160, 0xb1354baf -0, 738000, 160, 0xfc8d4f9a -0, 738900, 160, 0x6f044d82 -0, 739800, 160, 0x41e7546b -0, 740700, 160, 0x67014682 -0, 741600, 160, 0x5516575b -0, 742500, 160, 0x26254693 -0, 743400, 160, 0x81ce4af5 -0, 744300, 160, 0x77f152a0 -0, 745200, 160, 0x995a5096 -0, 746100, 160, 0x6114532e -0, 747000, 160, 0x4df457f3 -0, 747900, 160, 0xbcd94804 -0, 748800, 160, 0x1e544fd2 -0, 749700, 160, 0xa70b5954 -0, 750600, 160, 0x1c77484c -0, 751500, 160, 0xb07f4c42 -0, 752400, 160, 0x62074f1f -0, 753300, 160, 0xf3b656a1 -0, 754200, 160, 0x65734ac0 -0, 755100, 160, 0x2a9752cd -0, 756000, 160, 0x15ff4ef0 -0, 756900, 160, 0xabd4532c -0, 757800, 160, 0x8a44503a -0, 758700, 160, 0xbf4250f3 -0, 759600, 160, 0x17594ac5 -0, 760500, 160, 0x7b5e4b24 -0, 761400, 160, 0x24684cb5 -0, 762300, 160, 0xc4d54b42 -0, 763200, 160, 0xd48f58af -0, 764100, 160, 0x0374593a -0, 765000, 160, 0x398a5b0d -0, 765900, 160, 0xf60855e6 -0, 766800, 160, 0x6fbb5587 -0, 767700, 160, 0x44405c2b -0, 768600, 160, 0xa6345d70 -0, 769500, 160, 0x464557d5 -0, 770400, 160, 0x0c3153ca -0, 771300, 160, 0x15ec50c4 -0, 772200, 160, 0xd5e559da -0, 773100, 160, 0x999757b9 -0, 774000, 160, 0x7a5d5754 -0, 774900, 160, 0xf85b5f18 -0, 775800, 160, 0xa66d5c72 -0, 776700, 160, 0xd8f55981 -0, 777600, 160, 0xe6364f64 -0, 778500, 160, 0x528a5785 -0, 779400, 160, 0xdefe5332 -0, 780300, 160, 0x4bc4532e -0, 781200, 160, 0x505a4eb3 -0, 782100, 160, 0xa28d589d -0, 783000, 160, 0x092d511f -0, 783900, 160, 0x3079591e -0, 784800, 160, 0x2b1d5339 -0, 785700, 160, 0xf8d849d1 -0, 786600, 160, 0xadb056a6 -0, 787500, 160, 0x2ee74c4f -0, 788400, 160, 0x35c34c9f -0, 789300, 160, 0xb6ae53d3 -0, 790200, 160, 0x7258534e -0, 791100, 160, 0xb76d4b1b -0, 792000, 160, 0x99a14a0f -0, 792900, 160, 0x88365944 -0, 793800, 160, 0x97cf4aed -0, 794700, 160, 0x444b56f6 -0, 795600, 160, 0x1d1f4b01 -0, 796500, 160, 0x3dcd417e -0, 797400, 160, 0xa4985140 -0, 798300, 160, 0x86f94c4d -0, 799200, 160, 0xc3635436 -0, 800100, 160, 0x198b432b -0, 801000, 160, 0xae5253e4 -0, 801900, 160, 0x248c4f1a -0, 802800, 160, 0x787a45df -0, 803700, 160, 0x5fd44cad -0, 804600, 160, 0x68be581c -0, 805500, 160, 0x5ff5531b -0, 806400, 160, 0x2bcd4aa1 -0, 807300, 160, 0x0d134a7c -0, 808200, 160, 0x28af5885 -0, 809100, 160, 0xc09f4d65 -0, 810000, 160, 0x7468552d -0, 810900, 160, 0x82df49ac -0, 811800, 160, 0xe3725fdc -0, 812700, 160, 0x0ec74d11 -0, 813600, 160, 0xfc2a5355 -0, 814500, 160, 0x41df4d4f -0, 815400, 160, 0x4ebe473d -0, 816300, 160, 0xd8734bf2 -0, 817200, 160, 0x4acd5056 -0, 818100, 160, 0x47805700 -0, 819000, 160, 0xe4f25135 -0, 819900, 160, 0x9f195649 -0, 820800, 160, 0x8b055f64 -0, 821700, 160, 0xc4b751c8 -0, 822600, 160, 0x95e55ba4 -0, 823500, 160, 0xf0955494 -0, 824400, 160, 0xca1a47b9 -0, 825300, 160, 0x9d025711 -0, 826200, 160, 0xf6cb4a0a -0, 827100, 160, 0xd8385b4d -0, 828000, 160, 0x7b2852b6 -0, 828900, 160, 0x90a35643 -0, 829800, 160, 0x63105d0a -0, 830700, 160, 0x55414083 -0, 831600, 160, 0xc94554a9 -0, 832500, 160, 0xa88f4a36 -0, 833400, 160, 0xda5d52bc -0, 834300, 160, 0x5b3943da -0, 835200, 160, 0xd2314755 -0, 836100, 160, 0x743c4cdc -0, 837000, 160, 0x7c3e4dc2 -0, 837900, 160, 0x12644715 -0, 838800, 160, 0x1050480b -0, 839700, 160, 0x73645906 -0, 840600, 160, 0x28ef4a9e -0, 841500, 160, 0xf72440bc -0, 842400, 160, 0x41964bda -0, 843300, 160, 0x2afb4d9b -0, 844200, 160, 0xf74b4c5a -0, 845100, 160, 0xcf165e2e -0, 846000, 160, 0x3dbb4d06 -0, 846900, 160, 0xbd9755f9 -0, 847800, 160, 0x3248581d -0, 848700, 160, 0xc00c559d -0, 849600, 160, 0xff6c4b0a -0, 850500, 160, 0x154157e3 -0, 851400, 160, 0xb996499c -0, 852300, 160, 0xe1a059ba -0, 853200, 160, 0x98015946 -0, 854100, 160, 0x168b4ceb -0, 855000, 160, 0x567b4f83 -0, 855900, 160, 0x903e52f8 -0, 856800, 160, 0xc0a252dc -0, 857700, 160, 0x08cb4b70 -0, 858600, 160, 0x3d9a5be6 -0, 859500, 160, 0x904b4907 -0, 860400, 160, 0x738847b1 -0, 861300, 160, 0x10405c19 -0, 862200, 160, 0x8c134f27 -0, 863100, 160, 0xdfe34d7f -0, 864000, 160, 0x9d0948a8 -0, 864900, 160, 0x67755611 -0, 865800, 160, 0x46734258 -0, 866700, 160, 0x76f449fa -0, 867600, 160, 0xfad64d30 -0, 868500, 160, 0x7f4357f4 -0, 869400, 160, 0xd20e5079 -0, 870300, 160, 0xdf7857ec -0, 871200, 160, 0x46ff4891 -0, 872100, 160, 0x1b724ffc -0, 873000, 160, 0xdf20545a -0, 873900, 160, 0xeb5254e0 -0, 874800, 160, 0x794b4a96 -0, 875700, 160, 0x86a15147 -0, 876600, 160, 0x30f75504 -0, 877500, 160, 0x39575354 -0, 878400, 160, 0xb6a35351 -0, 879300, 160, 0x9da34c3a -0, 880200, 160, 0xcf2d5386 -0, 881100, 160, 0xa7f353f6 -0, 882000, 160, 0xa6e34e95 -0, 882900, 160, 0x98174400 -0, 883800, 160, 0x13685641 -0, 884700, 160, 0x99215154 -0, 885600, 160, 0x5be75237 -0, 886500, 160, 0x4cb64942 -0, 887400, 160, 0x15de4e03 -0, 888300, 160, 0x613a4fd5 -0, 889200, 160, 0xc97c4821 -0, 890100, 160, 0xbf1558f2 -0, 891000, 160, 0x651d4cf4 -0, 891900, 160, 0xbee44a56 -0, 892800, 160, 0x6cbd4c20 -0, 893700, 160, 0xcf45493d -0, 894600, 160, 0x73e74d2a -0, 895500, 160, 0x6a3256e4 -0, 896400, 160, 0x89ac4a68 -0, 897300, 160, 0x0d2652aa -0, 898200, 160, 0x56ce4b78 -0, 899100, 160, 0xb7b24bcb diff --git a/tests/ref/fate/hapenc-hap-none b/tests/ref/fate/hapenc-hap-none deleted file mode 100644 index 22c8b2c751..0000000000 --- a/tests/ref/fate/hapenc-hap-none +++ /dev/null @@ -1,14 +0,0 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#tb 0: 1/25 -#media_type 0: video -#codec_id 0: hap -#dimensions 0: 352x288 -#sar 0: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 50696, 7fd5bc08f7b96326953ba6926cb06109 -0, 1, 1, 1, 50696, 24d172f2ea03994add2596a48151fca8 -0, 2, 2, 1, 50696, e5f2bac02ad850eb769007694a2f7acc -0, 3, 3, 1, 50696, 26042fbce3868ad012b0b4557fd95d8a -0, 4, 4, 1, 50696, 80902dd47d1211f1cd388652d5e0a797 diff --git a/tests/ref/fate/hapenc-hapa-none b/tests/ref/fate/hapenc-hapa-none deleted file mode 100644 index 9aa80ae83d..0000000000 --- a/tests/ref/fate/hapenc-hapa-none +++ /dev/null @@ -1,14 +0,0 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#tb 0: 1/25 -#media_type 0: video -#codec_id 0: hap -#dimensions 0: 352x288 -#sar 0: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 101384, 7bd1e603a54fb468242c9e00b0a90359 -0, 1, 1, 1, 101384, 09bf0e48db9bf465f3d89a192ddfda2d -0, 2, 2, 1, 101384, 4993a96ed5f5d2bc0f0ff2080622eed2 -0, 3, 3, 1, 101384, 5cdbd0f763ba40366816588160ec73c2 -0, 4, 4, 1, 101384, 9202fe8358efde2c92c75210ed93c118 diff --git a/tests/ref/fate/hapenc-hapq-none b/tests/ref/fate/hapenc-hapq-none deleted file mode 100644 index ee467b6753..0000000000 --- a/tests/ref/fate/hapenc-hapq-none +++ /dev/null @@ -1,14 +0,0 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#tb 0: 1/25 -#media_type 0: video -#codec_id 0: hap -#dimensions 0: 352x288 -#sar 0: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 101384, cb6ef787ae7adff965ba4904a57c2188 -0, 1, 1, 1, 101384, 7cd50676c256354c06f728a265556efd -0, 2, 2, 1, 101384, 454b14f7770a1f57830a678ea6e24b86 -0, 3, 3, 1, 101384, 6e6c088ed068d05870976fe78a75bb30 -0, 4, 4, 1, 101384, ba79bd8e7fc5d8919b174f0c8ea82753 diff --git a/tests/ref/fate/smjpeg b/tests/ref/fate/smjpeg deleted file mode 100644 index 7aac52febc..0000000000 --- a/tests/ref/fate/smjpeg +++ /dev/null @@ -1,425 +0,0 @@ -#tb 0: 1/1000 -#tb 1: 1/22050 -0, 0, 0, 0, 734, 0x5a042c2c -1, 0, 0, 512, 1024, 0x00000000 -1, 507, 507, 512, 1024, 0x00000000 -1, 1014, 1014, 512, 1024, 0xd89a448e -1, 1521, 1521, 512, 1024, 0x695b369c -1, 2029, 2029, 512, 1024, 0xc8ba5707 -0, 111, 111, 0, 763, 0xb5893f2f -1, 2558, 2558, 512, 1024, 0xdf241fc6 -1, 3065, 3065, 512, 1024, 0x61cf4166 -1, 3572, 3572, 512, 1024, 0x97cbc386 -1, 4079, 4079, 512, 1024, 0x44899d04 -1, 4586, 4586, 512, 1024, 0xa7cbaa62 -0, 222, 222, 0, 3023, 0x0f3907d3 -1, 5116, 5116, 512, 1024, 0xa7aea60c -1, 5623, 5623, 512, 1024, 0xd7b18a89 -1, 6130, 6130, 512, 1024, 0x268e81f6 -1, 6637, 6637, 512, 1024, 0x9cf83a2f -1, 7166, 7166, 512, 1024, 0x5559b508 -0, 333, 333, 0, 4800, 0x22e6e18a -1, 7673, 7673, 512, 1024, 0xe1b9e71c -1, 8181, 8181, 512, 1024, 0xdcee733e -1, 8688, 8688, 512, 1024, 0xe5918f60 -1, 9195, 9195, 512, 1024, 0x29dbd209 -1, 9724, 9724, 512, 1024, 0x9bcbcf16 -0, 444, 444, 0, 6417, 0x427adde5 -1, 10231, 10231, 512, 1024, 0x86f5f458 -1, 10738, 10738, 512, 1024, 0xabcbda86 -1, 11246, 11246, 512, 1024, 0xc51f77b9 -1, 11775, 11775, 512, 1024, 0xf6b3a504 -0, 555, 555, 0, 6776, 0x7a74c6ad -1, 12282, 12282, 512, 1024, 0x1af3e40e -1, 12789, 12789, 512, 1024, 0x3866b03b -1, 13296, 13296, 512, 1024, 0xbc005403 -1, 13803, 13803, 512, 1024, 0xe9dfcc51 -1, 14333, 14333, 512, 1024, 0x83c837cb -0, 666, 666, 0, 6808, 0x1f6eb7c3 -1, 14840, 14840, 512, 1024, 0xfa649580 -1, 15347, 15347, 512, 1024, 0x519452ea -1, 15854, 15854, 512, 1024, 0xd4978774 -1, 16383, 16383, 512, 1024, 0xe2a3b1cd -1, 16890, 16890, 512, 1024, 0x9a9472ad -0, 777, 777, 0, 6726, 0x452087e6 -1, 17397, 17397, 512, 1024, 0xa12d4060 -1, 17905, 17905, 512, 1024, 0x31fb0646 -1, 18412, 18412, 512, 1024, 0xfc44343f -1, 18941, 18941, 512, 1024, 0x0847751a -1, 19448, 19448, 512, 1024, 0x227968a2 -0, 888, 888, 0, 6829, 0xee82b109 -1, 19955, 19955, 512, 1024, 0x7cce9f1c -1, 20462, 20462, 512, 1024, 0xb8356713 -1, 20992, 20992, 512, 1024, 0xb29f6e6f -1, 21499, 21499, 512, 1024, 0x9e1430ab -1, 22006, 22006, 512, 1024, 0x26d85423 -0, 999, 999, 0, 7055, 0xf41f1108 -1, 22513, 22513, 512, 1024, 0x6496547d -1, 23020, 23020, 512, 1024, 0x316b1a86 -1, 23549, 23549, 512, 1024, 0x3cd83afc -1, 24057, 24057, 512, 1024, 0x993ff633 -0, 1111, 1111, 0, 6977, 0xf8fe1ede -1, 24564, 24564, 512, 1024, 0x0708d1a2 -1, 25071, 25071, 512, 1024, 0xd7230db9 -1, 25578, 25578, 512, 1024, 0xbb0779ca -1, 26107, 26107, 512, 1024, 0xc6094e1b -1, 26614, 26614, 512, 1024, 0x15a8b039 -0, 1222, 1222, 0, 6942, 0x9ad105c6 -1, 27122, 27122, 512, 1024, 0xd6dbe88c -1, 27629, 27629, 512, 1024, 0x7e8d1140 -1, 28158, 28158, 512, 1024, 0xef88e525 -1, 28665, 28665, 512, 1024, 0x44e21149 -1, 29172, 29172, 512, 1024, 0x65b0f5f4 -0, 1333, 1333, 0, 6926, 0xe239dad6 -1, 29679, 29679, 512, 1024, 0xb955f687 -1, 30186, 30186, 512, 1024, 0xc85fba9c -1, 30716, 30716, 512, 1024, 0xf59655ad -1, 31223, 31223, 512, 1024, 0x6de80bf1 -1, 31730, 31730, 512, 1024, 0x2dcf6e41 -0, 1444, 1444, 0, 6966, 0x81dcfab1 -1, 32237, 32237, 512, 1024, 0xd0ddcf8a -1, 32766, 32766, 512, 1024, 0x00135c2d -1, 33273, 33273, 512, 1024, 0x697f8efd -1, 33781, 33781, 512, 1024, 0x7a9bada5 -0, 1555, 1555, 0, 6896, 0x31e6cc02 -1, 34288, 34288, 512, 1024, 0x0d22783c -1, 34795, 34795, 512, 1024, 0x7726d07d -1, 35324, 35324, 512, 1024, 0xa2f14f67 -1, 35831, 35831, 512, 1024, 0x7f51060d -1, 36338, 36338, 512, 1024, 0xc4ec6aea -0, 1666, 1666, 0, 6889, 0x1cc1006e -1, 36846, 36846, 512, 1024, 0x9bb37ca4 -1, 37375, 37375, 512, 1024, 0x9b085577 -1, 37882, 37882, 512, 1024, 0x8812f8af -1, 38389, 38389, 512, 1024, 0x788f5221 -1, 38896, 38896, 512, 1024, 0x3a2ce642 -0, 1777, 1777, 0, 6933, 0xc303f87f -1, 39403, 39403, 512, 1024, 0x72415692 -1, 39933, 39933, 512, 1024, 0xe3dcc105 -1, 40440, 40440, 512, 1024, 0xb26c0599 -1, 40947, 40947, 512, 1024, 0x5c9e55eb -1, 41454, 41454, 512, 1024, 0x8fe88707 -0, 1888, 1888, 0, 7034, 0xb4970a20 -1, 41983, 41983, 512, 1024, 0xc5d7beb6 -1, 42490, 42490, 512, 1024, 0xe1d3a3b4 -1, 42998, 42998, 512, 1024, 0x012da0c6 -1, 43505, 43505, 512, 1024, 0x8d010922 -1, 44012, 44012, 512, 1024, 0x3366eb0d -0, 1999, 1999, 0, 6961, 0xf064095d -1, 44541, 44541, 512, 1024, 0xc9381a27 -1, 45048, 45048, 512, 1024, 0x0774f685 -1, 45555, 45555, 512, 1024, 0xc5cae0a5 -1, 46062, 46062, 512, 1024, 0xa6f4737c -0, 2111, 2111, 0, 7089, 0x5ba350f9 -1, 46592, 46592, 512, 1024, 0x8fb6d0d1 -1, 47099, 47099, 512, 1024, 0x05f579c2 -1, 47606, 47606, 512, 1024, 0x56905d99 -1, 48113, 48113, 512, 1024, 0x002ee18d -1, 48620, 48620, 512, 1024, 0xeb37ef51 -0, 2222, 2222, 0, 7078, 0xa83f3e88 -1, 49149, 49149, 512, 1024, 0x38025635 -1, 49657, 49657, 512, 1024, 0x4fe643c8 -1, 50164, 50164, 512, 1024, 0x11d66ab1 -1, 50671, 50671, 512, 1024, 0xcc3051e9 -1, 51178, 51178, 512, 1024, 0xcd93e854 -0, 2333, 2333, 0, 7147, 0xcda66cfc -1, 51707, 51707, 512, 1024, 0x38f1196d -1, 52214, 52214, 512, 1024, 0x657a15fc -1, 52722, 52722, 512, 1024, 0x669ce2a9 -1, 53229, 53229, 512, 1024, 0x95862dda -1, 53758, 53758, 512, 1024, 0x1726a7b2 -0, 2444, 2444, 0, 7173, 0xb7455859 -1, 54265, 54265, 512, 1024, 0xd6ece2a1 -1, 54772, 54772, 512, 1024, 0x33ab9553 -1, 55279, 55279, 512, 1024, 0xd50c73a6 -1, 55787, 55787, 512, 1024, 0xfe25b63a -1, 56316, 56316, 512, 1024, 0x7e2959e3 -0, 2555, 2555, 0, 7213, 0x97b89994 -1, 56823, 56823, 512, 1024, 0xa4c07b34 -1, 57330, 57330, 512, 1024, 0xd6d8f15c -1, 57837, 57837, 512, 1024, 0x1eccddd7 -1, 58366, 58366, 512, 1024, 0x2b69f9cb -0, 2666, 2666, 0, 7170, 0xca8b2948 -1, 58874, 58874, 512, 1024, 0x667b775f -1, 59381, 59381, 512, 1024, 0xad3b84e9 -1, 59888, 59888, 512, 1024, 0x4f29fc67 -1, 60395, 60395, 512, 1024, 0x8d611ab7 -1, 60924, 60924, 512, 1024, 0x278966ea -0, 2777, 2777, 0, 7174, 0xc7cc6bbb -1, 61431, 61431, 512, 1024, 0xaf33812b -1, 61938, 61938, 512, 1024, 0xa55f4265 -1, 62446, 62446, 512, 1024, 0x023cb51c -1, 62975, 62975, 512, 1024, 0x1d1f1005 -1, 63482, 63482, 512, 1024, 0x874cccf7 -0, 2888, 2888, 0, 7235, 0xc2e68d2b -1, 63989, 63989, 512, 1024, 0xda705428 -1, 64496, 64496, 512, 1024, 0x48d9b440 -1, 65003, 65003, 512, 1024, 0xa14e0712 -1, 65533, 65533, 512, 1024, 0x7efbad1f -1, 66040, 66040, 512, 1024, 0xdb82c17f -0, 3000, 3000, 0, 7261, 0x8204a423 -1, 66547, 66547, 512, 1024, 0xcbe87613 -1, 67054, 67054, 512, 1024, 0x3a63df1d -1, 67583, 67583, 512, 1024, 0xd5636bba -1, 68090, 68090, 512, 1024, 0x9397af23 -0, 3111, 3111, 0, 7353, 0xacc7e7c0 -1, 68598, 68598, 512, 1024, 0x32a07c98 -1, 69105, 69105, 512, 1024, 0x202ca667 -1, 69612, 69612, 512, 1024, 0xdf969011 -1, 70141, 70141, 512, 1024, 0xc434d238 -1, 70648, 70648, 512, 1024, 0xe9ad7562 -0, 3222, 3222, 0, 7065, 0x45035c5c -1, 71155, 71155, 512, 1024, 0xb51b6b50 -1, 71663, 71663, 512, 1024, 0xe70aecd3 -1, 72192, 72192, 512, 1024, 0x03c816b2 -1, 72699, 72699, 512, 1024, 0x869fdf25 -1, 73206, 73206, 512, 1024, 0xd40a0a62 -0, 3333, 3333, 0, 7269, 0x72edbb76 -1, 73713, 73713, 512, 1024, 0x5af7dd35 -1, 74220, 74220, 512, 1024, 0x891ffc72 -1, 74750, 74750, 512, 1024, 0x1ff68a08 -1, 75257, 75257, 512, 1024, 0x5a7517a9 -1, 75764, 75764, 512, 1024, 0x0f959f74 -0, 3444, 3444, 0, 7220, 0xb926772f -1, 76271, 76271, 512, 1024, 0xe92a12a2 -1, 76778, 76778, 512, 1024, 0x38000e55 -1, 77307, 77307, 512, 1024, 0x39fbdd70 -1, 77814, 77814, 512, 1024, 0xca3d9184 -1, 78322, 78322, 512, 1024, 0x66c8995b -0, 3555, 3555, 0, 7326, 0x0a66c632 -1, 78829, 78829, 512, 1024, 0xac25acea -1, 79358, 79358, 512, 1024, 0x3cd1046c -1, 79865, 79865, 512, 1024, 0x6a1df31c -1, 80372, 80372, 512, 1024, 0x21ca10a1 -0, 3666, 3666, 0, 7225, 0xe39076ab -1, 80879, 80879, 512, 1024, 0x1aeccedc -1, 81387, 81387, 512, 1024, 0xddea1335 -1, 81916, 81916, 512, 1024, 0x19f5ca9f -1, 82423, 82423, 512, 1024, 0x88e95e43 -1, 82930, 82930, 512, 1024, 0x726284fe -0, 3777, 3777, 0, 7265, 0xe0209036 -1, 83437, 83437, 512, 1024, 0x6b85b40e -1, 83966, 83966, 512, 1024, 0x111fee2a -1, 84474, 84474, 512, 1024, 0x3656b588 -1, 84981, 84981, 512, 1024, 0xa5a2b552 -1, 85488, 85488, 512, 1024, 0x38fb2467 -0, 3888, 3888, 0, 7337, 0x7a5dc093 -1, 85995, 85995, 512, 1024, 0xaa919ccc -1, 86524, 86524, 512, 1024, 0x15993dbc -1, 87031, 87031, 512, 1024, 0xbe01a7b9 -1, 87539, 87539, 512, 1024, 0xefe93c09 -1, 88046, 88046, 512, 1024, 0x1bb566e5 -0, 4000, 4000, 0, 7246, 0x519a7a3c -1, 88575, 88575, 512, 1024, 0x15ce6237 -1, 89082, 89082, 512, 1024, 0xa8552e66 -1, 89589, 89589, 512, 1024, 0x9d80187e -1, 90096, 90096, 512, 1024, 0x5df3fc30 -1, 90603, 90603, 512, 1024, 0x1a312aa5 -0, 4111, 4111, 0, 7266, 0x352c8078 -1, 91133, 91133, 512, 1024, 0x6bb8e302 -1, 91640, 91640, 512, 1024, 0xbd9684bb -1, 92147, 92147, 512, 1024, 0x78b0b166 -1, 92654, 92654, 512, 1024, 0xd9af5eae -0, 4222, 4222, 0, 7323, 0xcaf69d7c -1, 93183, 93183, 512, 1024, 0xdb90fe82 -1, 93690, 93690, 512, 1024, 0x327614e9 -1, 94198, 94198, 512, 1024, 0x1f19b7fe -1, 94705, 94705, 512, 1024, 0x46c53f96 -1, 95212, 95212, 512, 1024, 0x921b2189 -0, 4333, 4333, 0, 7309, 0x98c1e6f7 -1, 95741, 95741, 512, 1024, 0xa8fbc85a -1, 96248, 96248, 512, 1024, 0xabfdaaae -1, 96755, 96755, 512, 1024, 0x6acc7387 -1, 97263, 97263, 512, 1024, 0x0d9c27b5 -1, 97792, 97792, 512, 1024, 0xba4dd809 -0, 4444, 4444, 0, 7121, 0x913d5bd6 -1, 98299, 98299, 512, 1024, 0x2a2ad521 -1, 98806, 98806, 512, 1024, 0x892de38a -1, 99313, 99313, 512, 1024, 0xdc97a2eb -1, 99820, 99820, 512, 1024, 0x4f614ca4 -1, 100350, 100350, 512, 1024, 0x9c8a77ea -0, 4555, 4555, 111, 7088, 0x56302362 -1, 100857, 100857, 512, 1024, 0x2d30e646 -1, 101364, 101364, 512, 1024, 0x74e800a7 -1, 101871, 101871, 512, 1024, 0x1e01fb02 -1, 102378, 102378, 512, 1024, 0x4ed2c1d8 -0, 4666, 4666, 111, 7104, 0xc0d14f78 -1, 102907, 102907, 512, 1024, 0xf2fdbe63 -1, 103415, 103415, 512, 1024, 0x8d6f63a1 -1, 103922, 103922, 512, 1024, 0xded468d9 -1, 104429, 104429, 512, 1024, 0xccad839e -1, 104958, 104958, 512, 1024, 0xdde7c082 -0, 4777, 4777, 111, 7169, 0xd03c825b -1, 105465, 105465, 512, 1024, 0x548613c5 -1, 105972, 105972, 512, 1024, 0x383909bd -1, 106479, 106479, 512, 1024, 0xfd37627b -1, 106987, 106987, 512, 1024, 0x6d95a481 -1, 107516, 107516, 512, 1024, 0x56aa87fa -0, 4888, 4888, 111, 7038, 0x1ecc201d -1, 108023, 108023, 512, 1024, 0x7b67258c -1, 108530, 108530, 512, 1024, 0x7dd99a92 -1, 109037, 109037, 512, 1024, 0x4a66d102 -1, 109566, 109566, 512, 1024, 0x7b3fce51 -1, 110074, 110074, 512, 1024, 0xbbd968aa -0, 5000, 5000, 111, 7015, 0x83c94454 -1, 110581, 110581, 512, 1024, 0x8283ec36 -1, 111088, 111088, 512, 1024, 0x3c96493d -1, 111595, 111595, 512, 1024, 0xfa4f8cf8 -1, 112124, 112124, 512, 1024, 0xe2cf872d -1, 112631, 112631, 512, 1024, 0x0a9e7aa6 -0, 5111, 5111, 111, 6983, 0x9e51f54d -1, 113139, 113139, 512, 1024, 0x6e7a0550 -1, 113646, 113646, 512, 1024, 0x3acfea2f -1, 114175, 114175, 512, 1024, 0x7111d0fa -1, 114682, 114682, 512, 1024, 0xe9a1eca9 -0, 5222, 5222, 111, 7088, 0x70d33de1 -1, 115189, 115189, 512, 1024, 0x24da6c46 -1, 115696, 115696, 512, 1024, 0x117cff37 -1, 116204, 116204, 512, 1024, 0x0f27cab6 -1, 116733, 116733, 512, 1024, 0x69b6b4e6 -1, 117240, 117240, 512, 1024, 0x1e6cc841 -0, 5333, 5333, 111, 7096, 0x4d0f81b5 -1, 117747, 117747, 512, 1024, 0xb01e2365 -1, 118254, 118254, 512, 1024, 0x14e200d3 -1, 118783, 118783, 512, 1024, 0xd1184c98 -1, 119291, 119291, 512, 1024, 0xef9140e9 -1, 119798, 119798, 512, 1024, 0x4cbb645e -0, 5444, 5444, 111, 7106, 0xd1a83ddc -1, 120305, 120305, 512, 1024, 0xe7fe2f06 -1, 120812, 120812, 512, 1024, 0xf8c45028 -1, 121341, 121341, 512, 1024, 0x561358f4 -1, 121848, 121848, 512, 1024, 0xd0129b77 -1, 122355, 122355, 512, 1024, 0xcc636e88 -0, 5555, 5555, 111, 7219, 0x20f47fe4 -1, 122863, 122863, 512, 1024, 0xe9406321 -1, 123392, 123392, 512, 1024, 0x9f16a041 -1, 123899, 123899, 512, 1024, 0x468bf409 -1, 124406, 124406, 512, 1024, 0x3df70f7b -1, 124913, 124913, 512, 1024, 0xa880b11b -0, 5666, 5666, 111, 7184, 0x45dc6a0e -1, 125420, 125420, 512, 1024, 0x3286c489 -1, 125950, 125950, 512, 1024, 0x39fe9ebc -1, 126457, 126457, 512, 1024, 0xc533d83b -1, 126964, 126964, 512, 1024, 0x153b195d -0, 5777, 5777, 111, 7222, 0x488c6499 -1, 127471, 127471, 512, 1024, 0xd84786a1 -1, 127978, 127978, 512, 1024, 0xdc295aaa -1, 128507, 128507, 512, 1024, 0xfb764d8c -1, 129015, 129015, 512, 1024, 0xeebc9db9 -1, 129522, 129522, 512, 1024, 0x7ba9403e -0, 5888, 5888, 111, 7254, 0xbd097ba7 -1, 130029, 130029, 512, 1024, 0x4e5571ec -1, 130558, 130558, 512, 1024, 0xd965fad4 -1, 131065, 131065, 512, 1024, 0x87e259f2 -1, 131572, 131572, 512, 1024, 0xae7e533b -1, 132080, 132080, 512, 1024, 0x313cf4d6 -0, 6000, 6000, 111, 7189, 0x46e06d43 -1, 132587, 132587, 512, 1024, 0xe1844c90 -1, 133116, 133116, 512, 1024, 0xbb057b44 -1, 133623, 133623, 512, 1024, 0xa5099687 -1, 134130, 134130, 512, 1024, 0xbff10707 -1, 134637, 134637, 512, 1024, 0x37c4ffc0 -0, 6111, 6111, 111, 7283, 0x19dd7319 -1, 135167, 135167, 512, 1024, 0xf9fb6caa -1, 135674, 135674, 512, 1024, 0x3b6a3a1f -1, 136181, 136181, 512, 1024, 0x83431edb -1, 136688, 136688, 512, 1024, 0x1eb713cf -1, 137195, 137195, 512, 1024, 0xd7b07a6d -0, 6222, 6222, 111, 7161, 0x23171d02 -1, 137724, 137724, 512, 1024, 0x81ae3391 -1, 138231, 138231, 512, 1024, 0xf150130a -1, 138739, 138739, 512, 1024, 0x09678eaa -1, 139246, 139246, 512, 1024, 0xb94e06f1 -0, 6333, 6333, 111, 6976, 0xcc610c26 -1, 139775, 139775, 512, 1024, 0x67b1dbc9 -1, 140282, 140282, 512, 1024, 0xd6edc235 -1, 140789, 140789, 512, 1024, 0x34e4c499 -1, 141296, 141296, 512, 1024, 0xeefd89c0 -1, 141804, 141804, 512, 1024, 0x38afdaf1 -0, 6444, 6444, 111, 7056, 0x6cd917b0 -1, 142333, 142333, 512, 1024, 0x29a60d76 -1, 142840, 142840, 512, 1024, 0xe28a4372 -1, 143347, 143347, 512, 1024, 0x7089454d -1, 143854, 143854, 512, 1024, 0x0c01bb7b -1, 144383, 144383, 512, 1024, 0xbd776a72 -0, 6555, 6555, 111, 6736, 0x02b78951 -1, 144891, 144891, 512, 1024, 0x86776fd0 -1, 145398, 145398, 512, 1024, 0xb37c88f7 -1, 145905, 145905, 512, 1024, 0x5f90aaf8 -1, 146412, 146412, 512, 1024, 0x203d4222 -1, 146941, 146941, 512, 1024, 0x382692a6 -0, 6666, 6666, 111, 6540, 0x767e0854 -1, 147448, 147448, 512, 1024, 0xf37c95fd -1, 147956, 147956, 512, 1024, 0x6c0b8877 -1, 148463, 148463, 512, 1024, 0x2e54a8b6 -1, 148992, 148992, 512, 1024, 0x7f266488 -0, 6777, 6777, 111, 6170, 0xc84962fb -1, 149499, 149499, 512, 1024, 0xfbf20f9a -1, 150006, 150006, 512, 1024, 0xf2985cc0 -1, 150513, 150513, 512, 1024, 0xc7075340 -1, 151020, 151020, 512, 1024, 0xe4585695 -1, 151550, 151550, 512, 1024, 0xbdffa380 -0, 6888, 6888, 111, 6169, 0x27e06c03 -1, 152057, 152057, 512, 1024, 0x2422a8a9 -1, 152564, 152564, 512, 1024, 0x59cbd75f -1, 153071, 153071, 512, 1024, 0x04ad1a8c -1, 153578, 153578, 512, 1024, 0x33c09191 -1, 154107, 154107, 512, 1024, 0x55efa6fd -0, 7000, 7000, 111, 5864, 0xd14db83f -1, 154615, 154615, 512, 1024, 0xf73d0e5d -1, 155122, 155122, 512, 1024, 0x6141ebae -1, 155629, 155629, 512, 1024, 0x7db17a68 -1, 156158, 156158, 512, 1024, 0xa6c690b6 -1, 156665, 156665, 512, 1024, 0xa6fd6725 -0, 7111, 7111, 111, 5375, 0x4a21055d -1, 157172, 157172, 512, 1024, 0x50a90b9b -1, 157680, 157680, 512, 1024, 0xef990dc8 -1, 158187, 158187, 512, 1024, 0x75adf6b5 -1, 158716, 158716, 512, 1024, 0x61eac43e -1, 159223, 159223, 512, 1024, 0x67797a19 -0, 7222, 7222, 111, 5206, 0x95ead3cb -1, 159730, 159730, 512, 1024, 0xf325277a -1, 160237, 160237, 512, 1024, 0x18bf254a -1, 160767, 160767, 512, 1024, 0x2ce6bee3 -1, 161274, 161274, 512, 1024, 0x8d320860 -0, 7333, 7333, 111, 5220, 0xcfdcc37e -1, 161781, 161781, 512, 1024, 0xc979b6e8 -1, 162288, 162288, 512, 1024, 0xdb644b41 -1, 162795, 162795, 512, 1024, 0xe1b368ba -1, 163324, 163324, 512, 1024, 0xacc53d15 -1, 163832, 163832, 512, 1024, 0x42ea8c18 -0, 7444, 7444, 111, 4946, 0x2d864a77 -1, 164339, 164339, 512, 1024, 0xe52c99a4 -1, 164846, 164846, 512, 1024, 0xd7db54a6 -1, 165375, 165375, 512, 1024, 0x7f27a7e3 -1, 165882, 165882, 512, 1024, 0xf7ffeaa9 -1, 166389, 166389, 512, 1024, 0x792b6088 -0, 7555, 7555, 111, 4390, 0x2ab9f462 -1, 166896, 166896, 512, 1024, 0x61d99724 -1, 167404, 167404, 512, 1024, 0x5213720e -1, 167933, 167933, 512, 1024, 0xac09dd30 -1, 168440, 168440, 512, 1024, 0x960bf6bb -1, 168947, 168947, 512, 1024, 0xc90168e1 -0, 7666, 7666, 111, 4051, 0x1d09592e -1, 169454, 169454, 512, 1024, 0x43b45768 -1, 169983, 169983, 512, 1024, 0x935d60a1 -1, 170491, 170491, 512, 1024, 0x9a342ef2 -1, 170998, 170998, 512, 1024, 0xc894709f -0, 7777, 7777, 111, 3680, 0x39bd6a12 -1, 171505, 171505, 512, 1024, 0x59b43b07 -1, 172012, 172012, 512, 1024, 0x36a1a98d -1, 172541, 172541, 512, 1024, 0x9e1a121c -1, 173048, 173048, 512, 1024, 0x02208b78 -1, 173556, 173556, 512, 1024, 0xd1d7b274 -0, 7888, 7888, 111, 2910, 0x6337ece9 -1, 174063, 174063, 512, 1024, 0xdacd5096 -1, 174592, 174592, 512, 1024, 0x51b71ead -1, 175099, 175099, 512, 1024, 0xd009a7ca -1, 175606, 175606, 512, 1024, 0xb6d5a938 -1, 176113, 176113, 512, 1024, 0xf3d45e47 -0, 8000, 8000, 111, 2153, 0xf4e3bc17 -1, 176621, 176621, 512, 1024, 0xea8e04fc -1, 177150, 177150, 512, 1024, 0x0b928bd8 -1, 177657, 177657, 512, 1024, 0x0f02caec -1, 178164, 178164, 512, 1024, 0xe2b137a8 -1, 178671, 178671, 512, 1024, 0xd5f94892 diff --git a/tests/ref/vsynth/vsynth1-dnxhd_1080i b/tests/ref/vsynth/vsynth1-dnxhd_1080i deleted file mode 100644 index f8f6df09bf..0000000000 --- a/tests/ref/vsynth/vsynth1-dnxhd_1080i +++ /dev/null @@ -1,4 +0,0 @@ -027c985483caab9397592bf27477dce1 *./tests/data/vsynth1/dnxhd-1080i.mov -3031911 ./tests/data/vsynth1/dnxhd-1080i.mov -0c651e840f860592f0d5b66030d9fa32 *./tests/data/dnxhd_1080i.vsynth1.out.yuv -stddev: 6.29 PSNR: 32.15 MAXDIFF: 64 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-dv_411 b/tests/ref/vsynth/vsynth1-dv_411 deleted file mode 100644 index c45b593c02..0000000000 --- a/tests/ref/vsynth/vsynth1-dv_411 +++ /dev/null @@ -1,4 +0,0 @@ -f179899efba432c6f01149c36c709092 *./tests/data/vsynth1/dv411.dv -7200000 ./tests/data/vsynth1/dv411.dv -b6640a3a572353f51284acb746eb00c4 *./tests/data/dv_411.vsynth1.out.yuv -stddev: 30.76 PSNR: 18.37 MAXDIFF: 205 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-zmbv b/tests/ref/vsynth/vsynth1-zmbv deleted file mode 100644 index c608c4bb36..0000000000 --- a/tests/ref/vsynth/vsynth1-zmbv +++ /dev/null @@ -1,4 +0,0 @@ -09bae55394f86ddb9e5c3254b174f865 *tests/data/fate/vsynth1-zmbv.avi -2285442 tests/data/fate/vsynth1-zmbv.avi -4ad1ca9de7c65eab68a619c54fffaec8 *tests/data/fate/vsynth1-zmbv.out.rawvideo -stddev: 8.61 PSNR: 29.43 MAXDIFF: 64 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd_1080i b/tests/ref/vsynth/vsynth_lena-dnxhd_1080i deleted file mode 100644 index 125c7a8e16..0000000000 --- a/tests/ref/vsynth/vsynth_lena-dnxhd_1080i +++ /dev/null @@ -1,4 +0,0 @@ -204e80f2e406ada90fca596ab2810b3e *./tests/data/vsynth_lena/dnxhd-1080i.mov -3031911 ./tests/data/vsynth_lena/dnxhd-1080i.mov -3c559af629ae0a8fb1a9a0e4b4da7733 *./tests/data/dnxhd_1080i.vsynth_lena.out.yuv -stddev: 1.31 PSNR: 45.77 MAXDIFF: 23 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dv_411 b/tests/ref/vsynth/vsynth_lena-dv_411 deleted file mode 100644 index 1ca2bc03d9..0000000000 --- a/tests/ref/vsynth/vsynth_lena-dv_411 +++ /dev/null @@ -1,4 +0,0 @@ -e428508f400327aeb96969c08fb9e1b5 *./tests/data/vsynth_lena/dv411.dv -7200000 ./tests/data/vsynth_lena/dv411.dv -7f9fa421028aabb11eaf4c6513a5a843 *./tests/data/dv_411.vsynth_lena.out.yuv -stddev: 10.09 PSNR: 28.05 MAXDIFF: 60 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-zmbv b/tests/ref/vsynth/vsynth_lena-zmbv deleted file mode 100644 index e6c994f844..0000000000 --- a/tests/ref/vsynth/vsynth_lena-zmbv +++ /dev/null @@ -1,4 +0,0 @@ -e9cc761eb3fedc36ce5f97744196ed8b *tests/data/fate/vsynth_lena-zmbv.avi -1808720 tests/data/fate/vsynth_lena-zmbv.avi -ee68a5292fd0745834246b4ec0d85e9b *tests/data/fate/vsynth_lena-zmbv.out.rawvideo -stddev: 8.12 PSNR: 29.94 MAXDIFF: 32 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/cljr b/tests/ref/vsynth1/cljr deleted file mode 100644 index 6002bbbbb6..0000000000 --- a/tests/ref/vsynth1/cljr +++ /dev/null @@ -1,4 +0,0 @@ -041982e4fa83428c621a127647d47b3f *./tests/data/vsynth1/cljr.avi -5075660 ./tests/data/vsynth1/cljr.avi -e1c4c96c74de3435d0f9f6118c5ed9b5 *./tests/data/cljr.vsynth1.out.yuv -stddev: 30.53 PSNR: 18.43 MAXDIFF: 225 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/yuv b/tests/ref/vsynth1/yuv deleted file mode 100644 index 6d8b1431db..0000000000 --- a/tests/ref/vsynth1/yuv +++ /dev/null @@ -1,4 +0,0 @@ -eaa66c3b27a2602e882befe154a8b119 *./tests/data/vsynth1/yuv.avi -7610060 ./tests/data/vsynth1/yuv.avi -c5ccac874dbf808e9088bc3107860042 *./tests/data/yuv.vsynth1.out.yuv -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth_lena/cljr b/tests/ref/vsynth_lena/cljr deleted file mode 100644 index e3bbc05f4b..0000000000 --- a/tests/ref/vsynth_lena/cljr +++ /dev/null @@ -1,4 +0,0 @@ -fdc1926e0a599de94513f0a3472b598f *./tests/data/vsynth_lena/cljr.avi -5075660 ./tests/data/vsynth_lena/cljr.avi -7df03229ee6361ea11a0d83d4926cb10 *./tests/data/cljr.vsynth_lena.out.yuv -stddev: 10.30 PSNR: 27.87 MAXDIFF: 65 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth_lena/huffyuv b/tests/ref/vsynth_lena/huffyuv deleted file mode 100644 index c0e374d615..0000000000 --- a/tests/ref/vsynth_lena/huffyuv +++ /dev/null @@ -1,4 +0,0 @@ -ed66182be0d515e8b6cb970ad63162da *./tests/data/vsynth_lena/huffyuv.avi -6455232 ./tests/data/vsynth_lena/huffyuv.avi -dde5895817ad9d219f79a52d0bdfb001 *./tests/data/huffyuv.vsynth_lena.out.yuv -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth_lena/yuv b/tests/ref/vsynth_lena/yuv deleted file mode 100644 index eff44c3276..0000000000 --- a/tests/ref/vsynth_lena/yuv +++ /dev/null @@ -1,4 +0,0 @@ -3d5ee6d2023bc15bba898819e4977e46 *./tests/data/vsynth_lena/yuv.avi -7610060 ./tests/data/vsynth_lena/yuv.avi -dde5895817ad9d219f79a52d0bdfb001 *./tests/data/yuv.vsynth_lena.out.yuv -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 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 From patchwork Sat Apr 30 06:25:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35523 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp708253pzb; Fri, 29 Apr 2022 23:26:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDMN0lUXehdG0Y7ZYYSZVpXQc3IY21G2HNgTYW77nn91GsZBddOAvEWWR2+EH4MxNomUvD X-Received: by 2002:a05:6402:518b:b0:427:ae8b:a400 with SMTP id q11-20020a056402518b00b00427ae8ba400mr733298edd.52.1651300018151; Fri, 29 Apr 2022 23:26:58 -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 ka24-20020a170907991800b006e8cb4353d9si7164652ejc.290.2022.04.29.23.26.47; Fri, 29 Apr 2022 23:26:58 -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=X99X0DNm; 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 AFD6168B363; Sat, 30 Apr 2022 09:26:34 +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 94F7568B30A for ; Sat, 30 Apr 2022 09:26:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MDmLLP/w/aLMDrpfxkFwquCQD+ljJv45f0bIdGhOL2HFI4FQAfhxCN+cZAlpJwdXYfCriE+ZCtN/qAaa1/3Asw3PTId6J+IACcQrYohCbiE/JqxKsg6qgj/ftIz7UgD16bQdx7vYTJAdwJDKcv+eB/3bRd0viicUsqmTofcuTFl71CiV+NJsp8PzdZfd4IfpPZbCch3FP7BSnnWU9tA/+TlRW+Vt8YCthrIFCk+HExrLxq5KZZVo6M3rgnjnqZuTDuqPLMt8XoXyhUfzruOzWcIjzZ4QLgWRDEe0VV8QDHt6dHpv1MXH1NK8NyJ/CLVB40TGCZQTozlvTBThpnd7CA== 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=d/jEJAriKSP79s0cKuGmUtcz4wsv5Jpz+MwyR/S4puk=; b=B1vhQVSB1mq2mit6KheJuq8iCr6cb9fTL3Vvj0Ayz5iewXs7PHYeX1GxwKp3i8IjSm1EZhAz63bBrJ4TdPhduf8WgNTQoXVp3kfn7emEHTSGD1wti1fUD9L2LPCFqtbmiyeQlBCIgkcke2J5EgxlkDS8944qDkwe+N4zqlq2s5f+gb7C0fbaudrtbq3spF0tHPkyI3eIYQJyOt0MjI6xbwOE7+yOmBmwCGRTvQ0vWqUg0tQc4N+kg+YQ/jJO+QztkWIphUVmzlVqWmRRjWqsbddkdcZziCH2BDqGnNtdLZr1kQ1PXxddbq3AVYjaqukafRp5ARvVEiT3EcakVw2fyg== 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=d/jEJAriKSP79s0cKuGmUtcz4wsv5Jpz+MwyR/S4puk=; b=X99X0DNmq1gs5tfZo1sdvnEIT1X9G7YcrpM1pp/GwyYfNBuusMfKlDFmJ/vVQ0daFct5bT1CndcN7EFYqDKkCuESAB2uUGZHMi/Kq4N2gO6KhuKr+Y+xRctV6ywi8DIGH3MSmMndRwXldf//+2yVAEChBHE308ED8LLCcIBvpHyXyuGX081SpE9EbaODcuIV7CHywnEASJWnAR2/99KJ40DK5Re8qMqmQiC7l+z4Xb0GtubXLB2pg6YeGX9yabwAsE6ybxA0ICtuctzId93AC4N/dV+Qv69vysZi9+lZpKH816tbr/v5Oz5r8imb5R+5KrdfxHti8/WGcPGHT27P3w== 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Apr 2022 08:25:22 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [vcsGZ/hkn/IfwLluEecPOR/VfDCBTvC+] 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-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74039e2e-a805-4384-7ce4-08da2a7255a9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViLEfi+B1v2W1R2oBej65d+rm0I2cwkBZbWv4zgNpr6lr0Vnlqg9CnyMjIRRw0+BVSMi8Hb4Xm5D9DE+nHA3XIb9rHjxywG/mY5ZnrY1WdxcPktfGLJ6+Z0xQY7GYTU6dk2aFgJoHDxHnPqva0loQ7Q78Cs8yuSttRUClGPMk8YvAXgP/Bx6JsGW1wBZkRMhlv+lCLHYGgSm2UQ1Y5hkoLFLZ9qyB6W75CmYP3ptAOZoNzUVwbSNetbow8zbR4YenfoRn5encptpkDZLHz2MRhZmZhMVoUVgr6cWutVivOx/IZAYDRekgjHbpVFlDzmymcH8j3d93p+jYG1x0rsQun4UF/Y82xYokRGiKm73M+zZfKfCLghfQAb72f698OZNRWIhVzMq0tqou50KwnVreoMxqrziGrclXTyvx9XdgAuHw67Yx4W6ENCaxDzcxYHOr1+oJJBkG9NtUPgiAQ10Ca/EAoGxAN2eHjrmXguhvpNd2dzMOUcWf5jYNq87vaxTR9aDmuYYtc62cRp0kcrOcpbi9EdddzrtnHUywWZtZrN7dYI4TgL56yIx9ah/ZJMs7BRglB4ScfsMoQ/K2Avplr3mq4c+379wHPmq7v0tGpx6JPuTJ6gYLgx5uKIpaMdC5mrJAo5LbUa0Gzk1drb54r0Pj6xW3dA5G7nUJXXzGuWBh9ZH4bYXkgx12nNLiiBERthT5P6bpl/nFBPQUokPJfVo5G9PG3AFk= X-MS-TrafficTypeDiagnostic: VI1PR01MB5406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mn58uJ+Gl9Sx8C9IoGPdw9dCyfgD3Uswo9Lk6aJ9VNtUJklbYBYdPhvSHJKD9ioF1jYZXdZwYYlo8jPfpFLanPxF0aIxIaeJmZFkAyI8A4dOc6q+AibhzvTW9NfQCtAsqcVN0iDXCHrIE0fjL6WbHCFmu1j2g5L4s68CSpXi1qVasSKfBdkK/bmdoaxsXR74AadszDo0XENU9GodpxNpN7IDQ7lUZEljljYyJz2K3KRQVLpJSAihxmw4uxBDd50eNjtvn55XeelMM7sBVYasi8L7FuwolcW8IQfhqhbrCYlVZV+L0ge1ZJZC4ldVurYLzVAHx4voxwmu/J4aJuAvP1u8/iGwN0Sp2HonS2gpQYzWOb61kWiZyYxpt4xSc12egftVM/m0nFL6xdZ3GBnr9heCcxyXPBHLVoeF1E744ec4/H7iOz6LGLaO7ewQlgqH9Af4iVrg+kaVi7ufvVWrA7sp8Vmr+qWVmBifCYFRv2Hx8Ul674nyjLG/P1qDkv+qr+0/8Er0n2kxoIQkDPZJYYI8FJTLJqiM9cwA4XeTWUI2CgleCHOGcUl5P/X3gFQ0OdQKNNJFUF490iG2SQa0Kw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZLqzQ4B8+6gHmKhQsmMRRUyhIN+f5xU3WQfl8qEBC/o6MLBcQKBnZGZbjpkVwtj87+bv7Ux2wddPQ8v4lDR/lHl4Qk+9LiSM4pQJ8/imgCcgR4PpU6MrB7UPPEnyL6mKSZgxYj6PvVNZvdiWck3yRSqX32MGwp66ltl7Am1CGujQx0Iaif66TWxN7MMAkmnHoskfBHcmUD3xt/A1Pmk0ifSpuVFXMJfEhcK67ZuakzKTubLDL4ruCJVMT4+a4ISLXnZPtzDUc/PglNSma7jT30TdVeG3IHrpkhYfTage3fUVjd5qGCkfUcjSsOWvbGP6/mJQ5WAXoE4+xuLiV+eMF4XTEFxLTZ6MoNMNevJ9U/dfM5UrX5ukDlyL4XzUUVtY1M4sYCWC8TK1qwt8uvwLBtQAExuI5Su2iTePaTItVh3YyNzwWjCD8tZWzRBYYAlN5Hnt+F/xKkI3KZvR8aW6ayjCTLYYOjadtJF45HD0+1QOukZKta9CtikY3jcY7cK8zQCz+RpDX+WC2UWxnTVa2/a69XlA3kKY9V6rloMzPEFUgykBRmXoNdC1l/YhNfetkXtqirdN/nEPsSQQ+8YJML+O69cfwtpnP5ij/aJp9DDf0I4le+v0NwJEAWGjMMW5BXUsqwpVt9zwEJTclJGirS7VCFUtiCQrnY4pAi4G8ncRGMZGdLwhLFtTIFYQKtX5FNt5DeOcE7ZkmujX39w4h0s0OTv/VIog5/N9/m8rZ4u7LLmlI8ESfo/6R6IJPFbtAB1TpkzD67q6b0/14Ma4XlNjQaGF/XtolsTRJYALI+oRefz6MlhIVWR0L128W5ASpTpFgXNmEl5pfaqqv+odfGMw63rxgkfJQgXIDAhDsW+Ah7CAlA070if3LmMuTt/4E9IM3nGme67Z/kgAfDe8ihaA6wsyTpSfHXlxhcV1+uD6H3hEyuj0DqCdnbuNsKuXvA2Z08bKe3WHVcvQDsr6ygpvGyh/1FdAAqG5HGLUA7NtdxiyPA2g7uL3oVlWtWXjlQQ45TqhL7sKMjXCB/kKzpq8/U2ptmL7XqVIce56UMxtZGxualyKrkVKWyR0RGrtGHmQrX7Kw39izGcjnLpD0p8weFR/CLDdnv5HKU56LnirTXiTaOZDm+3wHPAtLHudxpsv9GZF8Z3V88QY66kvGekoaxKeihlCMSu/u/602HpCV2dPscxGPWppeTWXEQY9k20td7cnt5ubINiJl5v7LrFU6GIFF9y45xkqRhPX6IO5sVaySVLByduMK1MDIZt+yS57A53j9DJZoIxXIT27zgprFirav50MOKsh/TAFv581kyYloNxjK3JglP+TKownVqqNlfft+UODfjbjPXf5fBjh7Rd+iK07Ece1Bi5ktYuKSu/thY2WXH3mI7ixgRWHjX8/bmfke2IhQyI73Np017RdhHj2xV3lzeYW8+Y4w5ODM4irNx6/5sd0KfxXC8Q7ICQVGEoyHGZJspsNgYhkaA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74039e2e-a805-4384-7ce4-08da2a7255a9 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:18.6122 (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 23/24] fate/hap: 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: Z2cIWJ1Jx+NS Signed-off-by: Andreas Rheinhardt --- tests/fate/hap.mak | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/fate/hap.mak b/tests/fate/hap.mak index ba921798cc..8268798f4a 100644 --- a/tests/fate/hap.mak +++ b/tests/fate/hap.mak @@ -25,8 +25,10 @@ fate-hap-alpha-only-nosnappy-128x72: CMD = framecrc -i $(TARGET_SAMPLES)/hap/Hap FATE_HAP += fate-hap-alpha-only-snappy-127x71 fate-hap-alpha-only-snappy-127x71: CMD = framecrc -i $(TARGET_SAMPLES)/hap/HapAlphaOnly_snappy1chunk_127x71.mov -pix_fmt gray8 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, HAP) += $(FATE_HAP) -fate-hap: $(FATE_HAP) +FATE_HAP-$(call FRAMECRC, MOV, HAP) += $(FATE_HAP) + +FATE_SAMPLES_FFMPEG += $(FATE_HAP-yes) +fate-hap: $(FATE_HAP-yes) #Test bsf conversion @@ -42,6 +44,7 @@ fate-hapqa-extract-snappy1-to-hapalphaonly: CMD = framecrc -i $(TARGET_SAMPLES)/ FATE_HAPQA_EXTRACT_BSF += fate-hapqa-extract-snappy16-to-hapalphaonly fate-hapqa-extract-snappy16-to-hapalphaonly: CMD = framecrc -i $(TARGET_SAMPLES)/hap/HAPQA_Snappy_16chunk_127x1.mov -c:v copy -bsf:v hapqa_extract=texture=alpha -tag:v HapA -metadata:s:v:0 encoder="HAPAlphaOnly" +FATE_HAPQA_EXTRACT_BSF-$(call REMUX, FRAMECRC MOV, HAPQA_EXTRACT_BSF) += $(FATE_HAPQA_EXTRACT_BSF) #Test bsf conversion and mov tests/data/hapq_nosnappy.mov: TAG = GEN @@ -65,8 +68,8 @@ FATE_HAPQA_EXTRACT_BSF_FFPROBE += fate-hapqa-extract-nosnappy-to-hapalphaonly-mo fate-hapqa-extract-nosnappy-to-hapalphaonly-mov: tests/data/hapalphaonly_nosnappy.mov fate-hapqa-extract-nosnappy-to-hapalphaonly-mov: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -show_data_hash adler32 -bitexact -show_streams -select_streams v -v 0 $(TARGET_PATH)/tests/data/hapalphaonly_nosnappy.mov +FATE_HAPQA_EXTRACT_BSF_FFPROBE-$(call DEMMUX, MOV, MOV, HAPQA_EXTRACT_BSF HAP_DECODER) += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE) -FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER HAPQA_EXTRACT_BSF MOV_MUXER) += $(FATE_HAPQA_EXTRACT_BSF) -FATE_SAMPLES_FFPROBE += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE) - -fate-hapqa-extract-bsf: $(FATE_HAPQA_EXTRACT_BSF) $(FATE_HAPQA_EXTRACT_BSF_FFPROBE) +FATE_SAMPLES_FFMPEG += $(FATE_HAPQA_EXTRACT_BSF-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE-yes) +fate-hapqa-extract-bsf: $(FATE_HAPQA_EXTRACT_BSF-yes) $(FATE_HAPQA_EXTRACT_BSF_FFPROBE-yes) From patchwork Sat Apr 30 06:25:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35524 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp708263pzb; Fri, 29 Apr 2022 23:27:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpUprqT36A380E4+JAYFrC/ftUt5vYaWwksT4le0dDUtcl7gBhCYvNNMsvsuyXlPNxuytZ X-Received: by 2002:a05:6402:518a:b0:427:ae8c:1ad3 with SMTP id q10-20020a056402518a00b00427ae8c1ad3mr729760edd.275.1651300020239; Fri, 29 Apr 2022 23:27:00 -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 dn20-20020a05640222f400b00425b8e21a14si7213392edb.383.2022.04.29.23.26.58; Fri, 29 Apr 2022 23:27:00 -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=FuKSQK++; 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 98C1568B369; Sat, 30 Apr 2022 09:26:39 +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 AD83F68B180 for ; Sat, 30 Apr 2022 09:26:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iv3hx7cwOpkrxVY756hpORFmyr9RRpkhEF53cg8Op9L781MQsB1Nosbtt9VxXrEUTV59cQO2ypv8u5rdzOjJkofHssfSHJNUwELSpmgEtp5Xo7/pWegxC6cI50/XsO75o0n+rYN22RMIZf/arFWBT2Z/CT428JstiF2bmblj1VLYT4GqomLkU+s8PaVthcigS6XHx/mii02KpSepYRsWTf9UrQt/4KF5o4WG3PHWEZe7yQfOK5lePLk69CCtNMaKYVj3e4puS6NLLhJjlwc0lGgxvKgWG2q+A+wVvd22zmbRH2ZuiXhmmu7UDAXTU7YZVXWc79bpkbzqdSGrG9jKQQ== 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=d+aPj3KdVUbizjmJmZNaTGzwg24VnsywgzPT7aC2b14=; b=UNp85D0KjvsBUwM72z8hNjbcg/rboL/6hOFxO4pzrvs7O0gZOhe8mrDkA4ObwUEnNPPIxiO2XUYwmlMQbMBjxtUJkTyaFmefAAPLqa0TqStyqvNz6bFcf8qrohLl+FhYSt5ZBstvzLvl7YbpNpMepzMHyJ87fhbTZ0UQdhf+MGiGE8Bd2Q+B//hLUWZamqOhlBV54i1OASdcm+7ymRmdCKZSOryE6GBUvARc/Xh046NxtjFsKjYPFztJqQY0e6zAL/yJxz6lCKrexR/MX24ZGh14/9Rq/2woQt0nRe5Vk/loXv8LZoTAOOhVwXCL1LKl7HE6IkX93MUB758TV6G4XQ== 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=d+aPj3KdVUbizjmJmZNaTGzwg24VnsywgzPT7aC2b14=; b=FuKSQK++E9TZqF0GtAdA0pVCwybPfjo5p0nmSOPopoDRXaiCqH2Medpc/w0uvXrLHPJwPD8+qJJh8SekUhSviR14VNz1+nKD8r+awl9pDJSmtPpqYYs/vJkc3peUdJST7dkWY3vtaET4WMwSfGZIQfdm2bdRcMsktBpYHHYxhJYpNtXGEjKTiK/VtZAlYd2q8azwE6nn8zZrAQqQ5uA+A2fuKgvCJ1G0lBzVzgNW+XDSs37BpmNPEVAzq3pqUVllc/10KYbQuQBLyupKtbPggI8xw70xjgxBhoRNjWtQnrUSAymB3KTxtj/9b++7Cgva4OiAKhnQaZuIZntWkTEGYg== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Apr 2022 08:25:23 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [OQf6tvwTJPIgZem2RAppvzXiq3xsTmWk] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a4eb4fa-0d15-4830-12ef-08da2a7258f6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSp1XYbE3vnwUBkebNAZYX6hlF05tSA4exK5vicPX7Ll2PjiedwkecM0Udpuz6ZekdoL8vFhZwnO7JPclj1qbxmIZADUhHAEjYHPImW/WHkRb72NAM2ISwBagOwP1u+BbAngc3e3dUxk1BUmtt0Iv1QJEqkllClBG8CHZ6wDxnPqcD2cKWNBI8xtWzpU2pYrbUfDgOjhGP6lWdPzqE9xUCajcE+Y7x73KeVDApzUBHf3R0KVuZLfy1nHeHfgdgsWSKeuKo6yX0sQE6NonCA5TTZYKWbLedr0Q6+1U56J7dM759CT35schv4o4KRDjX34ryNByk7GIsl8wF3Vh4fbnEJsQcR1xzEPB33BEDS1VIWFOdSKgbH1XcFgeX8/9IS4aIdptz4ggwmq8XIziRPfNFcVaxBPT//FQn2oPAt3VYEMVoficJpumREjKU0ZFMvPBhS6LNbvwly4kEO8uVq0Y00m7+l6Y9ckRh0PDCJdAx8vETeiQYQKuw2GGNSoYaARg5bzIhxv4Cex6GyktbAzrQqFw2SSoTz745jb3GGwCczP8C7qe83RMEkfTUWApq7tv4x9er7VogTu84sjIH0cslnERt9317jl/DvfSHUNiPPNIV9oMfeT/zdaTScYFvUhpneUPFNHhdS2kw1zvYSA+TLgzj3k39eVcr57IWvyrQLMfYeMHO6VLfIGUkWLMnYeLsB9v0EVY6J4Jgsrl04V3oXNFyfzE4ct2MFN36VqfLHJezMZ/QTtbm/ljlkIHveK+c= X-MS-TrafficTypeDiagnostic: VI1PR01MB5406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dhaCw/QQKcpsKClIOecGL9kxBqtXWps9xRP73VcwZJJmqi/XWcXWmhOgj4Cp1KdsOZC5RybED/lH0C4UFwZXStA2DL6f4ZKbNj923lYKfNsPM90sO+4ZXitqAOWhn8hqRpNtXHpBza9fRrwN6Zq1tJsOfbSomfLZLNDc1du0xv0TbgJ8ma7zu10YSGfD6C7vxXwZEc/vg7Okiozf3s8Is3vFwjEF5xUp9zW7MUIBCH2zqUjI/aVn9F66c9LlTws623VAW8dC9Q+WLYWpVPda+EbbnSPVTco8z4N4Z4Z26RjUwwk1D4Yf09TCx25jbC1lZg7rZ8jyOH00Ai6rPbsRZVk0ItQFoEDuCUdPoBJPWz4dCRx0SYzvg40F6orm4fN0+L+xZ11mXWd6+X87LUj2xWn5s2zO8yBDAhWVp694r227PR3acA4TI4736r8rFXzdtjagTFDs9+VmIZuM4x/L7qQLiGb7jFA5jxeZImwXf9sGQz4NpqPmumaqBZIPKMAwD90Ahf5yAlg9sTxWGQftT76CpRkPM37GSRAkGtM6K5ymObll8gNAutpsuSk7cYk/tT9QN5wJ5cjuGDRxU7ArQA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XJ/lvYwcZMrDGbydhc5/kjPyuoR5cqWcKKmLvjSwO8hQM1wSWjCMHeQYj3LaIVk8jpOsaaL0JHysV+ROqRW/MzB9kuRWEuqqp9wSxxHn93B/fBL409r7Ge2e5nFh87GgbiRYGrxa05IRDCM7fzzd+R/1mv1UcypU0zspOSwi2985sM4zQkZjhhDyEG4DDfsIQ4r8gMr8Gl9tXd3BDLTdlZviy69J6vjOuU5w1SddonkqNMs4BeMj5Hkcyl2KBeZRYUH+y87Kf2n+tZgP4qipYqTeU0ylK34CBMfFQlTyz9NygGjfkWI0wnVE//2B2Tj9hEK65Kbv9sF0LdKTt1TMHCL3SOdRBIfsGD9GCv4qzDehp7WOpscGMJkONLXvwvIEVyvbSNFUachDRtbzhltcsxAjY+vSXqFt46/iZDwfmHntb0WaFNYeVHAiuJjCJzwQRiuwh2Zoh+2cemDjJ/y/kgDw6eqs8pUnczYOSHyblbMrnjuzUwjN20UC/c1lEK5r4z9gFAxLuq77CwaKVVATgPq2lR5Iv6PSyycz4g6bVqWUJYsUYFIx69qxmnxbVuCs8HoRR5g5DnnNKZFrc1oy4lrvFWrWjXDVNmxXVcdnrYbvP+5pxjryjFrsIgCcGT8oRYt4mp/41Gr/hYLx/MNsjzzi6d1EuTbLPmXqRQia2JLUNz4v6Qx4dU/qBFt02v9okq0xC8usHUO/lZBxwS2n/EvgxZ3AUFf3HnH3B9iMRbzpSOb8HDat/nNOnI9EgXvBVnG9KCUb7GVMbhzydRxy0AHi3WuidiP0Fm5BhxlJ77z+B2ah/YsV70z4WVLXdlr6Dy3GsXLAQy4tnqZ2hGGuU77V+jPdBGwvbbavCjZbDYi+V4lTl9WfIgzrU9Z0aKXn8TkFqZXhSxYtMLuf5lvvKStcWM3lYz6Jqfc4vbjzKYjTCzejZaZDB2eJbv84OQKlgO/27okvc/5GGDKWUN9yMmECpRPK6pBrIB/D8OnhP+Xvp9kBmrXKiSp3ULDKGgDt7THPlZ6irPnZk42zsv/VSqGJFvEnG1Go1eQR82fNnR9ghetIMUjJ5hpiPtGJRzatFHfc+PRSdnmgohF1LTq52V5QVuGQfjB5I0SLjfUj7/UI3hDOuOlo+rZlnDw/GHa44wApK1Y8u/C8WpxbjUPL0Vnq1lZ7IxHQaeF33u8GxaXOaea/wT2n4k0G+1Kg3WNBr7Hjq+S7/7WJtz+diMOpfn6X7DitaOB9n+/vzwUoDvvJ365Xcyj8TQIK1bw9ZDlzjhcm+igqo8SBt8OBqlkVPssiYeeMS5D+bEYRuGgS6XFBFOl7DZPnCIAG9ZTRdh+1oOBMM6BH56N5BvhQB+LKen9ZYqY4ZuRobW1O0WvAj5ERlnhrFtq0OGfxffx6xO4cIqB5tGJ7Nugq6tkEJvS+wYvyh0jfYe9GJZsS/YjY3wk3CgIwqrDIrqwbFBBrSTbvldGQXYs3FRX8jhle5+U2sw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a4eb4fa-0d15-4830-12ef-08da2a7258f6 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:23.7738 (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 24/24] fate/h264: 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: tX0C3jn5DFg8 Signed-off-by: Andreas Rheinhardt --- tests/fate/h264.mak | 69 +++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index e075b6f67f..44e20f7259 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -1,3 +1,21 @@ +FATE_H264_HIGH_BIT_DEPTH := \ + frext-hi422fr13_sony_b \ + frext-hi422fr6_sony_a \ + frext-pph10i1_panasonic_a \ + frext-pph10i2_panasonic_a \ + frext-pph10i3_panasonic_a \ + frext-pph10i4_panasonic_a \ + frext-pph10i5_panasonic_a \ + frext-pph10i6_panasonic_a \ + frext-pph10i7_panasonic_a \ + frext-pph422i1_panasonic_a \ + frext-pph422i2_panasonic_a \ + frext-pph422i3_panasonic_a \ + frext-pph422i4_panasonic_a \ + frext-pph422i5_panasonic_a \ + frext-pph422i6_panasonic_a \ + frext-pph422i7_panasonic_a \ + FATE_H264 = aud_mw_e \ ba1_ft_c \ ba1_sony_d \ @@ -115,9 +133,7 @@ FATE_H264 = aud_mw_e \ frext-hcafr4_hhi_a \ frext-hcamff1_hhi_b \ frext-hi422fr10_sony_b \ - frext-hi422fr13_sony_b \ frext-hi422fr1_sony_a \ - frext-hi422fr6_sony_a \ frext-hpca_brcm_c \ frext-hpcadq_brcm_b \ frext-hpcafl_bcrm_c \ @@ -132,20 +148,6 @@ FATE_H264 = aud_mw_e \ frext-hpcvflnl_bcrm_a \ frext-hpcvmolq_brcm_b \ frext-hpcvnl_brcm_a \ - frext-pph10i1_panasonic_a \ - frext-pph10i2_panasonic_a \ - frext-pph10i3_panasonic_a \ - frext-pph10i4_panasonic_a \ - frext-pph10i5_panasonic_a \ - frext-pph10i6_panasonic_a \ - frext-pph10i7_panasonic_a \ - frext-pph422i1_panasonic_a \ - frext-pph422i2_panasonic_a \ - frext-pph422i3_panasonic_a \ - frext-pph422i4_panasonic_a \ - frext-pph422i5_panasonic_a \ - frext-pph422i6_panasonic_a \ - frext-pph422i7_panasonic_a \ hcbp2_hhi_a \ hcmp1_hhi_a \ ls_sva_d \ @@ -182,6 +184,7 @@ FATE_H264 = aud_mw_e \ sva_fm1_e \ sva_nl1_b \ sva_nl2_e \ + $(if $(CONFIG_SCALE_FILTER),$(FATE_H264_HIGH_BIT_DEPTH)) FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8 \ small_420_8-to-large_444_10 \ @@ -189,44 +192,44 @@ FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8 \ small_422_9-to-small_420_9 \ FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \ - $(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%) \ - fate-h264-extreme-plane-pred \ fate-h264-intra-refresh-recovery \ fate-h264-lossless \ fate-h264-3386 \ fate-h264-missing-frame \ fate-h264-ref-pic-mod-overflow \ fate-h264-timecode \ - fate-h264-encparams -FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264) -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-crop-to-container +FATE_H264-$(call FRAMECRC, H264, H264, H264_PARSER SCALE_FILTER) += $(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%) +FATE_H264-$(call FRAMECRC, H264, H264, H264_PARSER) += $(FATE_H264) +FATE_H264-$(call FRAMEMD5, H264, H264, H264_PARSER) += fate-h264-extreme-plane-pred +FATE_H264-$(call FRAMEMD5, MOV, H264) += fate-h264-crop-to-container +FATE_H264-$(call DEMDEC, H264, H264, H264_PARSER) += fate-h264-encparams # this sample has two stsd entries and needs to reload extradata -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-extradata-reload +FATE_H264-$(call FRAMEMD5, MOV, H264, SCALE_FILTER) += fate-h264-extradata-reload -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-interlace-crop +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-interlace-crop # this sample has invalid reference list modification, but decodes fine # by using a previous ref frame instead of a missing one -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-invalid-ref-mod +FATE_H264-$(call FRAMECRC, MOV, H264, SCALE_FILTER) += fate-h264-invalid-ref-mod # this sample gives an explicit size for a single NAL unit, but contains # several NAL units -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-mixed-nal-coding +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-mixed-nal-coding # this sample has invalid extradata that is not escaped -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-unescaped-extradata +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-unescaped-extradata # this sample contains field-coded frames, with both fields in a single packet -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-twofields-packet +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-twofields-packet -FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF H264_MUXER) += fate-h264-bsf-mp4toannexb -FATE_H264-$(call DEMDEC, MATROSKA, H264) += fate-h264-direct-bff -FATE_H264-$(call DEMDEC, FLV, H264) += fate-h264-brokensps-2580 -FATE_H264-$(call DEMDEC, MXF, H264) += fate-h264-xavc-4389 -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-attachment-631 -FATE_H264-$(call DEMDEC, MPEGTS, H264) += fate-h264-skip-nokey fate-h264-skip-nointra +FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb +FATE_H264-$(call FRAMECRC, MATROSKA, H264) += fate-h264-direct-bff +FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580 +FATE_H264-$(call FRAMECRC, MXF, H264, PCM_S24LE_DECODER SCALE_FILTER ARESAMPLE_FILTER) += fate-h264-xavc-4389 +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-attachment-631 +FATE_H264-$(call FRAMECRC, MPEGTS, H264, H264_PARSER MP3_DECODER SCALE_FILTER ARESAMPLE_FILTER) += fate-h264-skip-nokey fate-h264-skip-nointra FATE_H264_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-h264-dts_5frames FATE_SAMPLES_AVCONV += $(FATE_H264-yes)