From patchwork Sat Mar 30 22:51:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47673 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2721276pzb; Sat, 30 Mar 2024 15:51:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUE9iz/8TKjmDidp+cvMuqGsfOdP1fVweaCRr3N2Gi7z86dNHO2B7DFeKZdPdEQ2sK9VEiYPHgCcIkmehO3T9ufS13aveHTij11OA== X-Google-Smtp-Source: AGHT+IF52BaqbC+6LSm00n2v8iZDh07JZUY3zOmTETTXKvDpF7C5lH/e6MfMI1kd7DXFfDLeNwAe X-Received: by 2002:a05:6402:348d:b0:56b:9f91:d0ee with SMTP id v13-20020a056402348d00b0056b9f91d0eemr4132807edc.2.1711839110664; Sat, 30 Mar 2024 15:51:50 -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 30-20020a508e5e000000b0056bfcbd41a9si3272045edx.151.2024.03.30.15.51.50; Sat, 30 Mar 2024 15:51:50 -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=MCmE3mFT; 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 5619868C8C3; Sun, 31 Mar 2024 00:51:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2092.outbound.protection.outlook.com [40.92.73.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9889E68C455 for ; Sun, 31 Mar 2024 00:51:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SdsxSPJ3nUgcgRSljaAoPAFwwVV9BTbDfBXF8HgwuUuTCXuCjXZ7Fs9AoZCmO1D9tqbMorvhPavt2rTRvBqyjuBR00MVPd751MAhFy28e1SoOCriojKuj3JPA2S+NfWYSzl7pCtlM8q/2g8g2tzKOiq7rPwRvC2aOi15Ho9xpJSNEVuWO+rn2fWvefdiOYSKQnV4MyMLMKuFS6vOiDUtiLSOafbsdrTv7nDqXnOuo7FUixibEQiMMTGQRhN7QO+OLuB55+z9k4An6Czlw9UPflUIt2PuuMePuXofi1qmRJlntzmCotBbBgfoSss6bX/hEVS3aN8N/DLSx3hOum+zkA== 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=4D0vCjhVMKK/Pvh61G+551hjPRn7SyQmRrfCymNOv8k=; b=J6PcEFuE824rd5I2Qw4LRvbUJuYIsiOTm4eelIEXspOvBHJ3FH/H2IfoFlRQIYMGuspIulpZ/7Ci1mVuGTb6eEI1uquuZmoZMrGCMD91YAKrQLGzy6qRFf/jVnG3vYqhWZqYyJVVWCkKbk6qBw1bEAp1208oqZWVzUG9/UAf8Vnj2xBU63zBHiggqIbNzj0oqowVuZcd0eG5FF+P7OZk6qp7YwevYvvSbr+T13gPs55wMwyuXwhob1/rIfDROYWLtQ8M9HsL5kSOTwrvM/OkQMGxNA9R38K+p8VhVHzvbRO2d3w/C/Y4lPWmW655v4kFipH/afDE/a7p6QS5sJC4cg== 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=4D0vCjhVMKK/Pvh61G+551hjPRn7SyQmRrfCymNOv8k=; b=MCmE3mFTMNhnCbYBX6Z9erj3H25rDXbGSsFDtncFSkH+KEF7j7l4eTlJtiDzL/sZP7sBymZ79PgmU7VQZzX3Jzhv51RMTctnyXx74r0n24YeWJn+rI+2jcrCwNQeYsie9jdefcpF0a10SaAPdBFo73G0BUiMPUmb5WnaTwL0K6g8KUWwUe5tseECE2T9X50sAgG35GB7EmHftPVsvk4hoV94z+CP/xcFhx1JX886cDW+v2IliJrGk6mUF/HNrvDzMmfCQo/eEVn3tZH4AZ2yDfF14CsQVUy/fTBpb+2ahLUI6SU6FwOE9GPT/gmAn86WRnN6n9sgXAEPWvEwyXjbwA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0488.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 22:51:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sat, 30 Mar 2024 22:51:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 23:51:26 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [RRnHMK+EtXi4dLC8Zv0+dXv94cDJPrWILdWTvwFjzwI=] X-ClientProxiedBy: ZR2P278CA0084.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330225129.3406260-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0488:EE_ X-MS-Office365-Filtering-Correlation-Id: 527dbcb9-7e9a-435d-c365-08dc510bf4ae X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: por+c9oY3uqVAenl9cQ0Y6d9LaELlftfiNNy61xCYlXbjUO3bgRUxot2eqACoURzJV6MOejXwK24CitHhPsYv+vRt5FlKHQQIrm+uxpyOj57GfrKaTy7k+Ekn5yIEWzsYRsxe+bYMUjpK3weHXpyfBqFZLxjp9ajrErSdX+sF1iDuEIIyohXnUHtkBmsrktzg95ZZa3oWVkejLDYsp+gmuNtZDQwYGRiNfMgCFONptSLA9xko9WpW+bGSL1R/HIvKsZfCrJP4he/Lk8prQZf0eLlU+9q21dmP9psSYTjInM61fPQLb7Yga2S69HyWu2OJg+GDe3Q19GriCLbcHoQHZbp9RwnOx81XhmzoltNoB9I8KqtMgL2Lkfd1J3USXBzpkGueUzs445iA8UiUNxsEeqvIR6t3ZQaPjaXAVJ2/ygCstQjLksqZIUfQHD1Bbr+bstODOkC2/j4MIXJMbINt8pqYTSx8sYx6xVfW8UysemWJsGicLXnQQXWTgZvThq5O8XEsjRXtxWYSJZoiISknc69azMmu0TaxXKRgVeV/lADVfEBA6R1tJxW1Mpv8LypfayafFzXBl6e/4DKZEvyIIYmva0b2O3EWo+WN9UFUlg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nXkKPjsFZr4ok0QKw5rqz+d+Ed2h2PPePZQpWFTkDSaDawajIBSskh77LvKaFKO8DfzFSrCx188+t72VnhSocpx3q2sjyV9Ukiy1D2AmY4Xja2kosX2ytJ0k+x+Vydrh5ruMTBrqTRkPdV3Fw+EeRuxTNKcOvFuiGrqKqkgiEVRdTwLSAL/Csx2kFqlhcmRzkTzsmr5CgSitY6btW0KilaDQAvGmuzQMQkEaGcouqHZkkn5HOfYvpUEKlGjq8rf2f0kinDuAfpU1gQ2h3WZfpbiNQ2JiTs1iDCpgkOjVN2nx0miCgGN8KDd7VhSBWltbjGOsAVjg7OmzvgjgFpoc8oIbky2QpBJIQ0HL5HCdw44kn0dR9I2HfgnOVjeQXATs9z0suU1IdO9MIp0sBmuFKuBYNDH9ypfMVZmSAd975LnYX5X5DpRSeNWE1k9QpTZhP9+wReG4jrX1U1b73WJ7W+cWTwdEl3TDez78PT8KcJ08tT0CTRQ7lqSiX5HCPHemHp1Jx9rPMNxk0vPTsNznk4rFiEUVGPGhATk18yAEV14G09BinaXj2TazTxjn2yyoDks4eoRJDJUfE+ozbmuY5EbF70uU12ZDOAZ3lmVfjrEBnPb0rhh9LPYNfsly+bUrkDBWIyIRA+wByuoSQG+kr1HM8QOHZu/VKv28RNEOBmHg0+CbYx6oly2kYmsQ9UCORkfqK1nNBrLizQr3xmkg1Z1y8tRRE2pFliAiqfcKwkfKqWX7nb3AwlkCdoFvD0ikPF6VU7q1eWfDPG0vmzbQtlc1vNK648UavMBU9leFJc6qm/AwcqiQgSwJ0FfsDXtS7OQ3nMmC/b0gSpwrFMGgpiJAnVFQ5vfnAkg/c8LyQAPfIQqKS5hzC+gWHjYuxOtsTkXVD6v7VjfN1ZFRga2SR5CKRosO4UzIwyflDfHqEHaaurJomw7dkjKTZHz7ux7JQIAjcShdXp1kOaUPoO34TmYUZ3ADC2+/M8hGD1DTYOdBJvUpWE0q5zPNd1b5WpKiAWSPpvPRSYr1oLeVpVW/XyRjSQqXX5sttZ6cIqyGw6dBBx3whLut1NCnLmztjlLMP8XolESlhOVXP8xHCgIiPUIVflnSTx3Km1VLfuCnR8oBlk1ck3S1K5bMsK1rQ0qb74oLASAdBPq3y0NCd1dq5H7Jt59EEu8vknlDSc9eqsfpNk9un7uA7/9j2Gh5xs0hynFHp9AJQWW/VC8nPt8//1aMyKLOtmlQdHAsM4SXyjqC2fZLWtsXmK2kiWc7gGOJhbE6dYsCUtl63lXCV49Elw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 527dbcb9-7e9a-435d-c365-08dc510bf4ae X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 22:51:37.3788 (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: AS4P250MB0488 Subject: [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg 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: g8JaG7FcToSU Signed-off-by: Andreas Rheinhardt --- tests/fate/libswscale.mak | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/fate/libswscale.mak b/tests/fate/libswscale.mak index f8572f9c37..4c29220e6f 100644 --- a/tests/fate/libswscale.mak +++ b/tests/fate/libswscale.mak @@ -17,17 +17,15 @@ $(SWS_SLICE_TEST-yes): tools/scale_slice_test$(EXESUF) $(SWS_SLICE_TEST-yes): REF = /dev/null FATE_LIBSWSCALE_SAMPLES += $(SWS_SLICE_TEST-yes) -FATE_LIBSWSCALE-$(CONFIG_RAWVIDEO_DEMUXER) += fate-sws-yuv-colorspace +FATE_LIBSWSCALE_FFMPEG-$(call FRAMECRC, RAWVIDEO, RAWVIDEO, SCALE_FILTER) += fate-sws-yuv-colorspace \ + fate-sws-yuv-range fate-sws-yuv-colorspace: tests/data/vsynth1.yuv -fate-sws-yuv-colorspace: ffmpeg$(PROGSSUF)$(EXESUF) fate-sws-yuv-colorspace: CMD = framecrc \ -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv \ -frames 1 \ -vf scale=in_color_matrix=bt709:in_range=limited:out_color_matrix=bt601:out_range=full:flags=+accurate_rnd+bitexact -FATE_LIBSWSCALE-$(CONFIG_RAWVIDEO_DEMUXER) += fate-sws-yuv-range fate-sws-yuv-range: tests/data/vsynth1.yuv -fate-sws-yuv-range: ffmpeg$(PROGSSUF)$(EXESUF) fate-sws-yuv-range: CMD = framecrc \ -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv \ -frames 1 \ @@ -36,5 +34,6 @@ fate-sws-yuv-range: CMD = framecrc \ FATE_LIBSWSCALE += $(FATE_LIBSWSCALE-yes) FATE_LIBSWSCALE_SAMPLES += $(FATE_LIBSWSCALE_SAMPLES-yes) FATE-$(CONFIG_SWSCALE) += $(FATE_LIBSWSCALE) +FATE_FFMPEG += $(FATE_LIBSWSCALE_FFMPEG-yes) FATE_EXTERN-$(CONFIG_SWSCALE) += $(FATE_LIBSWSCALE_SAMPLES) -fate-libswscale: $(FATE_LIBSWSCALE) $(FATE_LIBSWSCALE_SAMPLES) +fate-libswscale: $(FATE_LIBSWSCALE) $(FATE_LIBSWSCALE_SAMPLES) $(FATE_LIBSWSCALE_FFMPEG-yes) From patchwork Sat Mar 30 22:54:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47672 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2722006pzb; Sat, 30 Mar 2024 15:55:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUtqImEizRDoLfo8sEHjw5wwkK2t3a4SjW3QM2aseN3VbUUCUXnTWvDY+CCPLnBTRs/lJIBljOHVfC27LIVgKJwMVAZOtBlKLJ20g== X-Google-Smtp-Source: AGHT+IEQ2tEtUaGbtk6lQgXqUfaB3Yjz1s1dLISXDaFOvsaZLdI98v0dF4XBtiSizaHvWQau3O35 X-Received: by 2002:a05:6402:2707:b0:56d:b659:508e with SMTP id y7-20020a056402270700b0056db659508emr3894883edd.0.1711839307666; Sat, 30 Mar 2024 15:55:07 -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 27-20020a50875b000000b0056ba7363b3dsi3081434edv.28.2024.03.30.15.55.07; Sat, 30 Mar 2024 15:55:07 -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=bmRK71sv; 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 B510768C8C3; Sun, 31 Mar 2024 00:55:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC7AF68C455 for ; Sun, 31 Mar 2024 00:54:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RSDoNoVAOK2tVg4BXpovO87t5bgA7h4qgiN2WMbzPhSpINC/NqXpHmyHHLF+WrCfVuB5bcjxXAiVDJOc1VkV3lO4Kj9wDeZsCSBb8ogjBnS8MbWKOFY0OUmVsjBrGzYF/eCRzYhKInpUyS4b7wdOpfpcOZFFudpWcEo80nRvH7ChtHSrGL9w5a0vVmA2W4XqOu4q6oncMM7p7AAO4yDX5NQA09lqdbQ6tt/cdezl0ZJPts+j3d7YneggbzAUyYQQ3QriYRMCUnxZ8qqRYC2VkG0rv1z176oRsytP78jUxru9f4ruVpRsoxronBkoQVnMosl3AJCG//aKTACcyBB7xQ== 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=wsfiBj9VcMVplSa0Q8M9zT29TToBAlLGu+5ytOGHTbY=; b=V9FTXvgg95j7O/yCY8ApBMyIE1JSIw4Xdi0oVhEiVD7+DmKoj0j0PH4biCMrtgPALSI44NnKJ0zDWNhedPzlyvt67P9ybKChtCpCYveR5FxloyIQ1b4Ilot1qpdFnNMXR9xil9tvRhUkedq0wQ9FM8urPoL/qBDLBiRG3TC5XiV1ufEFYtecGD7N5HIIZLuyjPajOm9W3yeAwxmaE8RwWGNr4OQfJxuBg8RKpz7BUxCJhiaCpoiKBtJqPaJtJ2IZlUTyZ1RpPcPDG0Ilc9yeazW+kv8DIczzzYyvJb9F5b+Bczr2ximkeYm87jlLbz2QKA9wsU//652jL3PYHYvDQA== 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=wsfiBj9VcMVplSa0Q8M9zT29TToBAlLGu+5ytOGHTbY=; b=bmRK71svbn9ocr6FpOM1F45WvqBIKp1FozYRbmcD2Xuyp9qwWJxaK34nHuD1EbKdoA0ITgwvLWAsJ8IdJS/pMHE4LbqIIr6roqcz3EoqG7xFeae1i5coaYE7PVvCnBPorxLV08chMinc0ONSbUWDh9o0ZjeAQZ8w9/5cm5GF3Vns/EEv5vcoVYxRZuNxkfU0Fa4PoaFBiQVdLWuCXL84/NbgAsM7NK8uxvF8T25jNZoszeUVmSvQnKRp/DNG1IC0M97A6wpS9jj8kh3KFA9f0QWuXo04uOIqe+i2pbhvL2t94nQRHDBm/FnluiLVqpqpePhEPuCM1ctORUboCwsgfg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0488.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 22:54:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sat, 30 Mar 2024 22:54:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 23:54:46 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [VC71to/9ms76WJ1aeA22KZXmVYY9WWO0k0wISeMQAQk=] X-ClientProxiedBy: FR0P281CA0198.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330225448.3406381-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0488:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a1a1dc6-34cf-4d28-6218-08dc510c6b08 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jRXOiSLl1vImPrHnPtKF4ivff8kNTBJpgvnEI8j/T8l5kT9k/gKuGtmgvZeuDozgOPF198ZkL7FJ/YEq8mHSfmTDsryuUQJuByxiA1/dve9Cksf4NdFgHwxfUmg9QvUDRRGYzhbugt5ODE5ZzD5aQ1aTBv60buSzGefX317pygLOCK2w+FxqU5RKoBicJY1Js7XFj0Z1wAhsQQhHKVFDIyyRRA/dv31NotbMjS6fEXMfSWUxGrLdddR2ZAMRC+ajAdKgzSmi3hU83hw02G2WPpN3P02/PNbcHwKUlZ0Nb4Kx8RysNH6JbfNFq80Fk1QQpG1OlnMu30sBWgy7VWMsmILhd6yRXO5AhDRlEu0X7Ohd8gtdQvqmty3ew6SJjX8BK2eHKF12FH+5K6S8U5+Gy73avZoOdKwVwa2ga2Okgk/Vw2TmgK6AQIHXe1wJF4uwdzg1XNdKhO/eAK/hpVpa+E3d3w5SXhaYRPysLn/5la89Aw5VPXcc8g6YASEfnrSSWtimwCevcs8TDETHWz8L9GGd/bzbFCWs8yvxg6ZaJZNtdcnN5MX0BoZeJ9zz8YNzEeNe6EIOG2UhxOXgBdGLZYOqC5zkFquQI6CCA95g15aTUGhrM8nwkvx7Y53egDlz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k1d4tAyFmmx266REWub2s3PlHenm3Dl2rFR275qtPQ355jy7eE8jsLUu2FctewFvYF18EgzfCVURq7R26u1hwF18p1Hkp1XLefXdtB904ko3849OCe2fhTaFKbQJ+gZ79jaaaPSzEpaKjNR0I0BYgBRSBWBEfLdmeDRiw9708gmj9D0DuZ3IU0ku3G6wgM/lHDj5CYrMicOGZhWmLZZOUW4j0U5y2ZmDgIdsvw/q5Fpv1KfUK989UXIBlNZ17FXkatoxMreI8bPjTO1FgKIRF/o77tpxE+xZc52hkOrkoGFHPZf+E/06lGp7uS7oi8jahpX5EKrxb8ufeY5Jdh/+WhUTXDvL0f4np+r+JFRQzY2gW1LNV9yxTxLtiIfqeYsDZjIPeQWmlSIZFjmbqqRU8xrNniFnJTt78XsM02bqrpv++K9ajOCaXEGzz4sIiw1YLA5Fcosn9RjiFClGXLPdxP7w7R8fLrBW53dnVRLYilMagw0t1TBYnF4rpCRoq8XNEByRwwkm4yvdy0gGs6D75UuBs/XguqpArZPDr0C7nF5RzJK/bJWQpp6WHBwB5yqDWVGGD6qANZjGoyZ+5iBxSRzzspMYkk8DsFrW5Ox6vVm6oqmbKBhgnFYLKGOQWMJ6YwLKMgQTzwMCz8TpGgLOPrzH/vkOm74AdGlB8CHOMvEbHxHXh5N/9vby0ZSh6iqnOxvSMVjnhCIgmqxY5e+dgOG+Ot9rfYErPMJL+M3KKRh3ayA6s7b23aN96gxIw5M753xjC2Cpp3lqawX1/L+wiKxq9XIF9XyBBTpaRons7ccdxVYf+VR6dO0Nnc5Ux2TF4sSas+CWrlJ1cNSvL7lEx4kJs0y/TvzGkG945lLWKBnn0LrNMBLOx9cz1piClp7uh/vpt5SNvDu1ycb55ba6Jh6zd1gkDOTwXv+ABCdyD9NyeX2XLbTYX7SQomwOq6/R8pRSzXmUrCwSJbDL+Si9k6h6lkP6g9Y3PuUK6sdj0cP/g8rD9BRyz4+jJPSiY3WWwf1KmmXpzsU6jYCrVGHqGr1W5Ex4+XlJ4QjwkEZ92YBNdKfkgLPYKyr5i0i93I7uwNvpD7rLJxjCAQAGsblnUvNTAYWNlapEq5b8VsGeOuyZURL8SnyU4IS+ik+KZ4BfbodGOG8mSCHBPGbTiIg9PvC6lEYEQaPrbEY4reRbxDFmHwkKZcFrj3r7t56FU5d+N51lt5dizPufAny2+HYPwDoyswKFhqbQYXfovA1UbIxqsdJ/mdfoq50WH/0L2WIlJGhI3/9ZakVEdLcDYulw5A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a1a1dc6-34cf-4d28-6218-08dc510c6b08 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 22:54:55.9264 (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: AS4P250MB0488 Subject: [FFmpeg-devel] [PATCH 2/4] fate/lavf-container: Check earlier for presence of ffmpeg cli 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: amTzaNvkat7H Several other tests (e.g. concatdec) examine FATE_LAVF_CONTAINER in order to enable or disable tests that depend on samples created by the lavf-container tests; right now this procedure did not account for CONFIG_FFMPEG. Signed-off-by: Andreas Rheinhardt --- tests/fate/lavf-container.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 7a925117c3..d89174d221 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -30,7 +30,7 @@ FATE_LAVF_CONTAINER_SCALE := dv dv_pal dv_ntsc flm gxf gxf_pal gxf_ntsc \ FATE_LAVF_CONTAINER-$(!CONFIG_SCALE_FILTER) := $(filter-out $(FATE_LAVF_CONTAINER_SCALE),$(FATE_LAVF_CONTAINER-yes)) FATE_LAVF_CONTAINER = $(FATE_LAVF_CONTAINER-yes:%=fate-lavf-%) -FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER PIPE_PROTOCOL), $(FATE_LAVF_CONTAINER)) +FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER PIPE_PROTOCOL FFMPEG), $(FATE_LAVF_CONTAINER)) $(FATE_LAVF_CONTAINER): CMD = lavf_container $(FATE_LAVF_CONTAINER): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%) From patchwork Sat Mar 30 22:54:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47674 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2722025pzb; Sat, 30 Mar 2024 15:55:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUlEraOArY6ZL+wKmMLqzX47Hf+56aS2NA/WUIZ8Lz4+fHqOaw0kEi5KvkkrnkXH05DSKbNoV2GcG953YJmDWBd5PITsBV9rlefVw== X-Google-Smtp-Source: AGHT+IFR9BqONoRB7LBMmsS621T14Gl6/yB0k7vMwGe3RdNsjk9Jm1Oukq8qWTmyqAMrjh6DZccQ X-Received: by 2002:adf:eb46:0:b0:33d:c2cb:c18d with SMTP id u6-20020adfeb46000000b0033dc2cbc18dmr4805045wrn.32.1711839315842; Sat, 30 Mar 2024 15:55:15 -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 g1-20020a17090669c100b00a4e4647a314si1148126ejs.411.2024.03.30.15.55.15; Sat, 30 Mar 2024 15:55:15 -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=RqTE5d3c; 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 E60C568C946; Sun, 31 Mar 2024 00:55:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2062568C903 for ; Sun, 31 Mar 2024 00:55:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EvjRkz1kxgoprf0AaL5Tl8o8Ig2JuFqqknyV9hQza8/kRIo/DTw2VkDc+xx+czWgfWgQR9f99lsHcLqZ264II3aTIg+5iqh6I5u/LGtVJUmz4hkQHjO4jjheHYHh0jIuMPdIYFYLiQHpUt+y/qe0JWEGIYRSq+HRfLm/RLVYyynmsOmHXTTPitFyGlI27R1iSe5JjB1IvGvQQuXXHFWOPelXZsgH9H6m5ia6KQr+2FJsPnSaFJPUngpOH0giZBJV0aOIJP2LHUwEo8XaaRrbgggviHxTHMw59Uc29V2xT8c11stvYiP/0VTBoyV9vgx1CxxRzxtCxzfA7dtYjPCeAA== 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=3cyd2pbxHIn5jQp7cqgDPuk1aw5sSyHXEKkRQa/lae0=; b=W2LcjU9LjAc080KEsVEgbe+CqUUa/QzSelDAR1ptaLGbHFEgmVgwBPObTXIqnllRpSFOKF9El3zUmpxv+43AcFsrPp/zlZEK3CBEJWdAzi35vwGeXi+hc3ow4is3OfiflZwJkrUvZST6TGNxXMiNwI4EJZoADU5fNh3A8BgMmseqAGs7USwudHUmCIPncz83V0uH0QSESiQlvnuz2gJBGTFsz+DghMJ81mpPfkcspECwZyPQjOHBchA9abc3uR9Ry7RG2XZj5ytgcG7urZPMokKiwzypaKvCdnHRSUw5pBlDolrhoRBbNBdVKTLhcn29ybIT6P038o8zXSfINO9YUw== 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=3cyd2pbxHIn5jQp7cqgDPuk1aw5sSyHXEKkRQa/lae0=; b=RqTE5d3cmTdi9zpSDPm0TqA+OxeeBaZ/X/WSVH04ZTozVB5TWaqNYK4tvL8yvVflwQKKoTOdBcXQHT+7QirvNwnmb0TxzGONcHcffsAdeL+3tdvRMWtJrHGfUB7uLnRZwISLKTFDI0E4BlC2YimI8SHRudH4R2HCJvbEYS2D1ni+hCmZkx/4pJmrgyuuF1kOAEqQrXkzD4uGxLv9ydAE0W27lzWSpGSYFYPh5bjZUuLtGCBg+TuWJvAT+pDNqdBLiNlObkrYtb+UPca09g6r2TwQ32m/ZBLhe5R0GOrM2MppGdMyVaJgfrSij9Xu/NaFKJzc3+1yL6uiaifjGbCAvw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0488.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 22:54:58 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sat, 30 Mar 2024 22:54:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 23:54:47 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [MDwntYaPUg5KUiFz/0ZipziwxsYHjugJEPZ4NCuhGKA=] X-ClientProxiedBy: FR0P281CA0198.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330225448.3406381-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0488:EE_ X-MS-Office365-Filtering-Correlation-Id: 354befbc-0eee-4f3b-eabb-08dc510c6c3e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RthqHyj9nS0Sjj43mkTAGOI20a8xuTcIrZD2fYkWjPC9FiU/9rhfQtld5lrRgZcGUK85vWnc4VYGDKxJ4YJ3l5Wle18YZbVk2V7DO9NNIzUlnGDDgct8OGENmUzF05TyUB49lJCeBm8h0zY1LJiXiy4FcMyabq5PQJ0SHBXPQx8zf4AUzOu+qy75WiQcSHYy8nO6I2OT6bz922JpLXtcgxR4XdmmmPXaIBVR9V1+4zrt9qawEH1dOBMaZXKyJC5unysGJX6guTFChE0OTcR08QF76cDxxtZY3u8afCNj4XdrFm75W3PJNz8s6dpHJGgkqz/9fHlHxNGWxSgEld2Qz3nJQxnI/UCwKjAUNoND76ekrhOh2Sy4eHGXgiYtFYbHUvpNHIGQD6tlUr3V8TQB1EvQLvbDw7YOIhZqQnGHUCukpy6DmeKpRAhLP7n/ZXz9cJpXoCHzAWJHYuz2KBE97hSMPWX/hOfquSkPBWhR+63UpPfnddnVJWuee2mamEz8K2Ky9eWc+SoLhhnHskIiz9v5moaWHxTNgGnByIJ6DV+3YzhIPZRs6wpSlH445Rd93/j2RfP+1m1wd3vNLxMI4kI3WSbJSQ2If/vqB9Q6CYI= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VwmUMVsX+ERwMl3uk6qh3QB0JCMSq8jMknLdkqteuRQkzi8Ph8+nNPGtYC7vbqYJu6ygLatTZWhoz5VeV++RwkoNi/6xp0Bw5rKyDu0BZ2ebi54GuO3vFfLpeqG6RtqHWBMXprx6pmaqgqZwKx8NZ55fShoeqXzT3KJ8iTDfYdkLUuOMTDDr++wZY8fykuUasxLrAnCSzG8cJr8RbREi0UH0707qIAeobShFvhPr/3DdNHFPhwJnyy1p0cJSkT+SPwdVajvusJG8JNenTIYvfxB4I7LObF1fbDEp4oZwaXy7dVpkfH1QNOaXDXqhNb0B2AxTO/w3ESi80VkkfX0YNtBvSawZt1QrthIGoohK+N8eC3KXwO1KyZIYf2DS7ZFcqRtMW/3RHfPBs7baSnByV3c2kTm3TG7JNv2ArHJe++rQZrtLDHXoqewD5a+LtE2KA3dF1Kzsj/HrGHDjpBfJHDkbr6+Bku9U9Sl4TQNSuTytM8Nq8wOQqzlO1bQOXz3nG0hpQ5SHDeFxZs/lRCGOfFeBlcjMqkf+C7O7NCKmyw/eiVjHw5UDvMMgFkt0F2B0nakG2Yk+C2HLcEkwkYqLDSya8sypRibYzvCbUOt6Mc59SGMXtUEoOXV/QO3hCKHWrQCXjU9XxYb6xsmmV5dRkYYPVB89AWQwUVDD/ODF46Yp5atMf6stZIc+Qqk3yiidQ5UkUH7ctKc1GmK6hgucYHhxTuvMmuHGMg1oz+8uM6mcGCihuUSO7CbFreQNHBenSo86+8Fh8APPypQRZMnrO/Worr0npkp0PD+93zwF3d5ho1HwYBXw0p+7slUhYIozKk1tCB769g248RdCExDBT9y3kByHsrkJqi1gZHh1SYO1REB7PMfxKpXpTuovUugghQTG5B2x3sSj2D3EEjcbKeFGahseJqk03dSTolYbrRvDbXzXawqEptP7inIPFraK23HOIupAGhM2TIZZ6IpmD+5YmXGmaen0EcwdhVFI7bRL79dwxxUodV4SHplBQjmDKmYTaNd2fBfnf9CePGxIDKM9KRnAq1OS7zN/0Ucv8rRF++cS2Ln89Q98KwHrAPRvmV4nEBkLd2pqXW/KXciV69jkIgIJtUrpJnspTJKfNZoq654eVyKfynZdbJzyPY2DjZrKRxOS3Os+YuylKboOTBpKJsOMv51Leu2EnNOKyKmoh1R6QoVnLcyH8kyJndkjZ6miD6w5p7lLYL4mKz860fHVTEZlfjaqZSOEP78CYY97ZzSMGMW5/7sTvUMeRE4r3rmM09aKl8TY6zsvgEClIg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 354befbc-0eee-4f3b-eabb-08dc510c6c3e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 22:54:57.9560 (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: AS4P250MB0488 Subject: [FFmpeg-devel] [PATCH 3/4] fate/api: Fix requirements of fate-api-seek 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: UA7maBOvtEtg It relies on the fate-lavf-flv test. Signed-off-by: Andreas Rheinhardt --- tests/fate/api.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/api.mak b/tests/fate/api.mak index 688fc0f9b3..d2868e57ac 100644 --- a/tests/fate/api.mak +++ b/tests/fate/api.mak @@ -16,7 +16,7 @@ FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264-slice fate-api-h264-slice: $(APITESTSDIR)/api-h264-slice-test$(EXESUF) fate-api-h264-slice: CMD = run $(APITESTSDIR)/api-h264-slice-test$(EXESUF) 2 $(TARGET_SAMPLES)/h264/crew_cif.nal -FATE_API_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-seek +FATE_API_LIBAVFORMAT-yes += $(if $(findstring fate-lavf-flv,$(FATE_LAVF_CONTAINER)),fate-api-seek) fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv fate-lavf-flv: KEEP_FILES ?= 1 fate-api-seek: CMD = run $(APITESTSDIR)/api-seek-test$(EXESUF) $(TARGET_PATH)/tests/data/lavf/lavf.flv 0 720 From patchwork Sat Mar 30 22:54:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47675 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2722052pzb; Sat, 30 Mar 2024 15:55:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/BUkzIsBMLmxnhmX1S5pDEFwqD/keOyvXTocZKRDcHV0k/Xo9Xh4wB4NRg+a74c2E2zLZ81f+Q9E+fORkEnRCfJjcTBlrV+ggFw== X-Google-Smtp-Source: AGHT+IHON+7lAieshoPjeVO0Wqhdjm6tyo0R1iJHezuq6q+2qsWBD/nNByYj/wuWeSAnZ1vHDnBB X-Received: by 2002:adf:f092:0:b0:341:bffe:e5b6 with SMTP id n18-20020adff092000000b00341bffee5b6mr3073718wro.29.1711839323662; Sat, 30 Mar 2024 15:55:23 -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 s21-20020a508d15000000b0056be08e083asi3251253eds.554.2024.03.30.15.55.23; Sat, 30 Mar 2024 15:55:23 -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=Heb5u+YU; 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 ED2BE68CA9C; Sun, 31 Mar 2024 00:55:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4755168C903 for ; Sun, 31 Mar 2024 00:55:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PYJShOHcgpaIxP1rI3BSQF73txLr6gOES7iZcAr9IeA04mHlmT0qq4ISiCE6jRRfnngha7Ox2N6Ohh57HVeXuiHCg8n0As/sSyaBCB9N61wTHir/rSXoOn1+t1coQxjle9NmR3j9co8i3FDlfq38ZwARndNljmBw8SrsvpDZJm/22c0V3fmQRAeevyqbuC/rD5/FJRQ8oyDG7Ka26Jlr/1tIFjsLU2heVseh3tP6zIbv6eBstS4aWLx0p9+csBB5f3X0Q2wvkBKlFzvJyHOsfstIyVhKzbaJ+Vz3MgVFqfmvvwz4QXBwB1rV5a8LF6zhd1XxKemz87tGe2bbWT+haw== 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=19sG4fjUTFkdHwjOkRvL3TqTAMrTzf7iyuOSZ2YiOv8=; b=gcNcKBVFNNf0bvIyyH2j+K/mEdxuNjbO4f1z70iDyrXC67DD03sBrRIqquxwCAwdZkp0ifVaohd33E6hJAJSrpY9+Pqr8Wo9NW7eTeCeEqe39swcf0swGDqCaHrdEwgxih7zO5WKcOAYjuogwHSfNxt4Zd9A388zdpRv0HotW4pKOwL+igP1vKHn2ztIG/Ar26tdpByQz5SWuSrt37A6i2N3SlqlhNOwYh5dAZuvKoxeBsFNrNplgffNwc+BffM3U1w+qijXQQ5/ouPensn551wbr2ppNHumAuZT84UGgzdmXe2IeWfa4ymT949wjqs6oCcFgaSFJMyeCzg9ZQXRIQ== 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=19sG4fjUTFkdHwjOkRvL3TqTAMrTzf7iyuOSZ2YiOv8=; b=Heb5u+YUtrdmqNcWiac+sGD2XIROPbINXy5/rsuqYuAi1jD//qjEEqKU7crFeftAyfQP/F0zPiimgNexlw9IVsQSeexiUW7vOOU9Flr6Bm3iW9Ifcfmn1u6/INoo8KBK3NcVfuGxaFxegtgn1AzOBG0XKZfltvw/5KOLCLkvzHq8pZOj/pSh/HpJlzk/ULCa5kANBWk+8BrwtVt25K8fXQdUuaY7ryMX9ddizD/OaF3lFK78FClPVtzXy+p0DI6oXC2/4UEg3bhl6Q/s08ReUojN/livOGshEH2MqZnEKSNvrjnIcBppI0NpFq4Hrfp9FELdI8e+t6ZYMHuOMEzzSw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0488.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 22:54:59 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sat, 30 Mar 2024 22:54:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 23:54:48 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [wgrByVFviOi2Ovu9xdPrNdjyBipANvY1B7YiCkhRTZ8=] X-ClientProxiedBy: FR0P281CA0198.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330225448.3406381-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0488:EE_ X-MS-Office365-Filtering-Correlation-Id: c871ed4c-ac17-4910-338e-08dc510c6cf9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gw6VE5FpVJL/XOvaqLGetRnaDj3NbdiPoYeiW8ibvJ+XM6biQRjeLr4jrti8YxYsnZttSuV6rAxG70esc10j5hNz0iS+/dL7uxUJmoTE3cJHVjQk+ZLvgnR2bDgifAJFYPUA+pIemgrQ5rZce/Tqapi6MRlnzt0YfXQmvRaobHfYxkt93g50npVb1Lr819BrO+MovEdaKZg4ckE333qu47u+UHlPXb2RjDeodOjtvOfIYiacsorYp5NavPT+ccYEZTo2R+yJ98mkgTyoa44Tijy+24GvvTv/L/2ORoPkFvz11cy7QEDFJFtDTRrBp0jTZVAF/EAYeeWYTbp79OmwckdZ+lYXz2hzzLWc0g/XmH0HD2Ip6um1PaBjsqjVitnt/rAB5lg7g6KwEzOLbyQh0AhK8QOizJZv+esALZTTQbYcOLcmtruI6JZU04kE88ZzLKenDFgjv0vLh33BsALELfYolMk8in33FLSSSMtb71rargAVKaK9d96FXI4NWfPzz9QBMGk/+dh+Uoxfcnda4sjjdURkBwYxaunsibXGq7j9YTN6HbYwmW8krr2UUmYhJK3vcsZmC5BebGHLvOeaPwqi7OgtYbhI5cAOWe8k6oaEnrm5SSqBwHGfLzp7icIK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wiSDMnzH8O5xpkTrCI/jYzYhOtwV4d4P0r1wIDDa+KEEEbakydUDeM9L0wHdj7+8mf+9cubOq5VFAP87KBVLhAYV1Mm9JVSn7Znid7PSEDcwgx528PJgho2H3kXXzMDk3BK05UERoetVsradph+ip2Wg3DjiQig2XjNt16nhl8jrWx4P1zxMCyEcJ+0t+kVXNEQ4tk5uIFL5MkY2xj7zdPCFAuV7Q3SchxeJGGeynUf2JR+Lo0MRa0MvxMOq25m31+DW5MUM2N7QWoCUvGOv8wHMIIODwdd/nh9K171s+KioNCAW3EqRtUO56p+sn3MLBpnQAqMjMaZawet2N2lQr8RFByBpgFuaZqKVCzv7Uba+9Al6RnDk69/jInXhHFxOxMuwlCUThz71fHMatL9IE6thjDyvLpA1awL9tm6ynGb2aJI7kD72VxDLrDZdoA04td/gjyYwDJOCpxBWdihxLaw1EO8h6s+nJyDhyf/cvBC/6RWrHFjWQUSwzqN9UkHYk54XkL0J1pci4SzRjJcfe2vwkkTK20eHLUIDeI9mSo1xuV5x72BI/NTTsyeBQTebZUi3dmogBCjz+fa7H05Lihyo2hqZ8AHudn/3FoYZmffyEYL7Ph2VO03gymOhILmSLZiPBtNkC6zRd/RMuMo7XXNuJ7iS6SDPoUMiMk/0fcQB9hpe7qN+H5tcizghsaZtivImOi4ubQYK71kVmxeEQHQiMs6f2NQtQGNHcRg5L8+XY8Q2SHp+ko5F630XnojB2UDdu88tg79X9/tVOmHn7uPUR900VB0J8xDGO83FgtBWUqI05nq+j+JY3R/CZnpyPdtl6HXKSL0S41lY4bEyqAhVNlJ8VhxzcqeE4727nD9ZJr7InIUOgiW7KgR0AH50oahyAqTXrtBfqblCCgJa0JFafHkOs839af8f/XYMOAOXFKe5DHHFKKMq8jZzdNAN72uyuhXcshzZR9mCCQUnItvKmFsRqU+4iJr0j5+0HoTir7XWhPyNNRflnTqusf3NNaJRhzzHGp4v179oZEJ/CEuMSXgUafRc79HhIPot3Xci3b2JGWhiQNkUVnxNZV8+9eTnEWXA9r6UfGAaWDgYupSwFoArge+UAgoVIJWpYDP32gBWBp9dd1LnQfmTLn6l+shFxnUwVDH2iPy8IRVB227u632/9N6hgTyQNliDp0kfraSOv8sMl0HFKTi4m5K3hkW0Jota350nL7YGbiH4zWMeCtPwlL+2frfViP2w59vq8XNwBxOuUFeDeHL3YLN9cwQXfHau7HEgfjMEpunGtQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c871ed4c-ac17-4910-338e-08dc510c6cf9 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 22:54:59.1243 (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: AS4P250MB0488 Subject: [FFmpeg-devel] [PATCH 4/4] fate/ffprobe: 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: m6FOtZ/y30Bp The ffprobe-test file is generated via ffmpeg and several filters; the requirements for them were missing. Also deduplicate this while just at it. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 + tests/fate/ffprobe.mak | 40 +++++++++------------------------------- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index ed6b1801a8..9b70145015 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -253,6 +253,7 @@ include $(SRC_PATH)/tests/fate/xvid.mak FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) +FATE_FFPROBE += $(FATE_FFPROBE-yes) FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE) FATE-$(call ALLYES, FFMPEG FFPROBE) += $(FATE_FFMPEG_FFPROBE) diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak index f30cc2d4ba..23c6d3550d 100644 --- a/tests/fate/ffprobe.mak +++ b/tests/fate/ffprobe.mak @@ -10,41 +10,19 @@ tests/data/ffprobe-test.nut: ffmpeg$(PROGSSUF)$(EXESUF) tests/test_copy.ffmeta | FFPROBE_TEST_FILE=tests/data/ffprobe-test.nut FFPROBE_COMMAND=ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packets -show_format -show_frames -bitexact $(TARGET_PATH)/$(FFPROBE_TEST_FILE) -print_filename $(FFPROBE_TEST_FILE) -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_compact -fate-ffprobe_compact: $(FFPROBE_TEST_FILE) -fate-ffprobe_compact: CMD = run $(FFPROBE_COMMAND) -of compact +FFPROBE_OUTPUT_MODES_TESTS = $(addprefix fate-ffprobe_, compact csv default flat ini json xml) +$(FFPROBE_OUTPUT_MODES_TESTS): $(FFPROBE_TEST_FILE) +$(FFPROBE_OUTPUT_MODES_TESTS): CMD = run $(FFPROBE_COMMAND) -of $(@:fate-ffprobe_%=%) +FFPROBE_TEST_FILE_TESTS-yes += $(FFPROBE_OUTPUT_MODES_TESTS) -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_csv -fate-ffprobe_csv: $(FFPROBE_TEST_FILE) -fate-ffprobe_csv: CMD = run $(FFPROBE_COMMAND) -of csv - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_default -fate-ffprobe_default: $(FFPROBE_TEST_FILE) -fate-ffprobe_default: CMD = run $(FFPROBE_COMMAND) -of default - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_flat -fate-ffprobe_flat: $(FFPROBE_TEST_FILE) -fate-ffprobe_flat: CMD = run $(FFPROBE_COMMAND) -of flat - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_ini -fate-ffprobe_ini: $(FFPROBE_TEST_FILE) -fate-ffprobe_ini: CMD = run $(FFPROBE_COMMAND) -of ini - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_json -fate-ffprobe_json: $(FFPROBE_TEST_FILE) -fate-ffprobe_json: CMD = run $(FFPROBE_COMMAND) -of json - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_xml -fate-ffprobe_xml: $(FFPROBE_TEST_FILE) -fate-ffprobe_xml: CMD = run $(FFPROBE_COMMAND) -of xml - -FATE_FFPROBE_SCHEMA-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_xsd +FFPROBE_TEST_FILE_TESTS-$(HAVE_XMLLINT) += fate-ffprobe_xsd fate-ffprobe_xsd: $(FFPROBE_TEST_FILE) fate-ffprobe_xsd: CMD = run $(FFPROBE_COMMAND) -noprivate -of xml=q=1:x=1 | \ xmllint --schema $(SRC_PATH)/doc/ffprobe.xsd - -FATE_FFPROBE-$(HAVE_XMLLINT) += $(FATE_FFPROBE_SCHEMA-yes) -FATE_FFPROBE += $(FATE_FFPROBE-yes) +FATE_FFPROBE-$(call FILTERDEMDECENCMUX, AEVALSRC TESTSRC ARESAMPLE, FFMETADATA, WRAPPED_AVFRAME, RAWVIDEO, NUT, \ + FFMPEG LAVFI_INDEV PCM_F64BE_DECODER PCM_F64LE_DECODER PCM_S16LE_ENCODER) \ + += $(FFPROBE_TEST_FILE_TESTS-yes) -fate-ffprobe: $(FATE_FFPROBE) +fate-ffprobe: $(FATE_FFPROBE-yes)