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