From patchwork Sun Apr 24 03:34:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35416 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220383pzh; Sat, 23 Apr 2022 20:38:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrE8cPS4oGMNUALZlL31+oWLPCOTN3+lpaqb9ganZM2Q+VAkhf/LXW9tBWhNwvCCBw41fn X-Received: by 2002:a17:906:148a:b0:6f3:833d:5a0f with SMTP id x10-20020a170906148a00b006f3833d5a0fmr2633806ejc.49.1650771512069; Sat, 23 Apr 2022 20:38:32 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s9-20020a170906500900b006e86887cccfsi9741457ejj.267.2022.04.23.20.38.31; Sat, 23 Apr 2022 20:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Ae9RDJ0q; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6B3C68B056; Sun, 24 Apr 2022 06:35:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074070.outbound.protection.outlook.com [40.92.74.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EADF68B2BE for ; Sun, 24 Apr 2022 06:35:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dRwbiwzvYiV9Z+ItSK6NhteB6e9oEivCPTmhc6XOFGPgT6aUTFpnWVBMRq92EHjBkpN9W5KN3PtUmM2SID9E43WrqckNPVdrOuVGeb3QTvMcAQeBJtgeFENW5SQFwbPtU+dO7spesrE74nYOLZ7opG3nyD8Lw+3NV1aHQsKbVn6+OucSsiJ7SCSdMS7FZHHHSrtqISxzEDub2RRT16VdKpTbi4JHgRK7KJwDq5FupgwJQC49rWFkYGbK1p7igTWCDH+cQ58yhmEym9DnghuwRbJmvfMm4c2Y9zsbOYXA2wdhpaK5d+7dq/5tTHuhuGVmU8TzI74fqnYMzOVNfaElIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8hXe9i3GrSa4lJTiOWgExoKvjleAWDxCcNAaEBm+DM0=; b=KLHOCQE3o/zt1p2Lq7uYAF9VnXthLPjshkd1RThEDCQdAUceO64RdS36H9BuyWPk4de0oDHmKsA57xi2ZT4wnAxXieGDEbd4n1SvTk9yBQ0v5bKqdZA3K4Hlye4J4ofEry/0+6VK6i8dm5RYttnrlOCsPH0FB3rfXiA+IAYPiGO857czQMd9bz6a73+VPe87zJDslvbEuDzFmuzre7q7VSd6HZdqV5Hz/jGuyzlwKfDHmrnQatN90+4PzYkgzMNi9hdmK6A7yUbywZYtlgInva9UQvA64/fkpUniXhqCebWRoN5QM4EGemhzKDrLJSB3IX9+JPJqthYgrxYSzJQo8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8hXe9i3GrSa4lJTiOWgExoKvjleAWDxCcNAaEBm+DM0=; b=Ae9RDJ0qWoVdUR3EGYgXDw64fJvcUyMG8CtKsCL/EUBSOjYYHLJtfuqXJm0wFmbtk4wFlvEjKG65mK7FQRifDGxT3xtjVRjC6MlYGpH2m1roZCf3xCXCJ0+Gl2hOIKbPqnNvbe7qG7Q5m9Zjw4ouzUJwcJt7vO8hqdk+2NopwSmDluZklSrcOWkRiCP8faVFj0VcDz9WN7+I1wu8zR53tMloYGiALAp4Odm6rPQTsV8mwXWJIW4JMW/ZnOpCRs5FdqTpJ+oQQDw6SRL2whgNd6j6NIswartn5at4Eo7N/bGYYfPn2gRsldfjjBzf2tjcpRNq9XVchrpjX7RiG0x5uQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:31 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 03:35:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:10 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [oOdSgF5pF+TWtrWKGbZG0e9bmjRDMFw+] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-24-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 863ae649-2501-4b46-0b72-08da25a37b80 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjD/8XlGLHPooaeZpGitzHWiu4e9FSohWADLC/3ajI57isToaaAQoN2AmaMXq8RWlacR4Zosis/YfB9c5EoMkKCE4Jr68vXHGxuVyeVp6yDLINWeHUEW4hwa12Qm/DLdexreTMT1OmNu2+n+kEeL3aoYCnLnQCqIZissMUgpRIbQE//6m8BVA1Z9v1CvTWGveIDCbln6XkeefuZ7m/He68HK0+/3b8aASpps28ruUSXQEzqoWH1qn1YG6A0ZM38EaJ57dXhCUaVQkyTwgTtw4o63N1bmCb8R0MNtJpGmn48peI9/lAFoQDkQ9leHh6RcJ8GpY29Tjw64czlAWNt6qVc3HdNDpSm4IOQXPQvbo0aCDcNGuquuzdRDzUTAz2HoQ06evXmHCLS1kuXXX/G0Q3Z4pHkA02KWwmsspXT2NRZS8I218TuIsSW7YioB9JPIvnlUGQV335yF6irp0YuGHXssblDTqrkiUUdoXE6SSQx2niiCOZjdRxyNcSy6nnsdh6Dysxt1RRGEWwNXo3Xm+u5FGisADdMdCFirxwKfHCH+0etgE0AADLMwmq6qtAJeKhjmVbyLu6SCBmfggKJryloAkG151iPVC0ultmgGuIdaeNNo94OdpiPm0ODVjBGM8+53VYart4aUSkaxhyC4EyLQlnjZWgHIecK88Uxjgusdr3p0fwIS5OpfjIWgtfzhxCAk1bwWypGQrij04kkAG7YcsJlWMrRBJbzPfOudcMGqvA= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UTy0lr0wP5/RWQPZbUWCKrgZND0Rqe86e0lvY2pTgFplavd538f68/8R7s9L41VBLEn5t1+KvHYcXtyWC0OCz79iHbyqlsU53ZdKBR/eKK4UDq717yHCBioiDESXm1I3NK6Dm9aQMYBBDQC9z5/6SDKUTLT02vAfyxHUgW57QtScDJrt9USJChx4NhBLYJ3mBPmsNMAZhPdXHMcd4SbnKutjn5fW8kWbLTQAfgcMWvdMO8f4epac0k5grfCfNBqBQJ+iyIwPEW1R1YWZ4PcfpLpPiM8WBdyN37zmQpRkPj/QRfcRTq5K3Dhcl6yfZGbHqNnaUM1qnUgW+lI9O1KKstSop6bcGQnJo1afPpMlbU5vO57ZaTuRWXnLxw8+/mFeVWIRWsXhRug4zp6RC9ckfXQfyvGSbKy5FGF+XT1Ax3LeHe7SgUMh6A3Cc5l3dP2z3H8wRQwbJQOA0rbBhvdt3q86OiJ+JILavTJiZZ29PASkyfgWdIQhxVi0H7ETGGGDlcYDCYALc2A15NJ1ZSCCO6rUoeuI4PzvemklCYz3ty6WVEam89cThZDutPiDADHf7yqSeyY5ppLUu6Wi9FGKlQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LIVdJXZnWYAsDvEUkDlaJ4DwpNMP+3Dk0pPcYg8BJattC32H9Qev3J7cOWrjB/+Jxzsb0ULrjjv4l5cIzYE8f/2MozHhpym18xYFKuOxBx4rH8J2kTGnoDN7XradJRnNoUqyLpqoT4KkczLNP34JtNIb15613HJMK84GtCUqcO8766MTsgCpXwf8cwnrU90f0ZWJ6GE12WZU00hay1oy4YCv+DfaW7L5FcVGYraHIuE1V2JGbDsySQlk6KQaMZWD60QzQDG6BwaW9ZnQaf5XZ3gpsUQY3fngmXzk4r+ERpqcfFE6CJMAZf4mUfNjtAS7sj5B9mdF+vhLi/IwW0kaf5T9U5WBFLaaZrx0Ug8ZSPcYBsFqeffb2PDX4sn8Ek8d6jIUE5qJzh9ZU/X2F+kpg77bY9oP/AmvZbwx5A37Lv7/H9RWF5aGNl97Q24IQBhgJgXQtqg93LwThPw6KURfZs5QvfNnQTiDQWQUZv1uK84U+XzvCiCph3cz7EwF8NmJtmH0GD7Cqy6xJEtFQV2z/6dw7IZBGTAQxuoF/wlD34EwzbMOsUobPCB9EfM1sgRCxklwrw1RmMxJuxTVsoJs+S+naZU4/8IZgMqsW6pzAhIGQYE3Dlayt6a97PO4RS2nx81HMHquZ5z/32efiRhrW3KZKm/BVPFmICmmO6QHu2I5dVyTBEXF+d5z20BZIGMHVbMcczzdIl1PTNtPOFjIyM6GUXcWZxcFhtDAkqoTBPsXI3RPCam4Ew5nur9wW4A1jMbFfcfZPyTW1EDwnfUKDZpIVCTcLtpZR0tZikc21CsPxkeZyrszI/EDQG2DbtpMJqyk5HdFpq4gDjj/32orcxjkcPJ0xPRVCaqOEnaC0UIK4Dq8pO8Vnl04Qj8yunPOnkqRp3WAOv05VQZz1R1G0bmmx5TbmWdjfOpplfcKPgxqmt1ZdRGW6xFx3apQmAm+EoxgdcFPil3dFQsNoQYVe94L6gcFYBilGITRER4PyDKs3onxJSdQBbR0jGRQhZpwwEWoKni/kJJ8CAAw4RYNleHD17C7J2N5sl4CyMWX/vn/sy3VHa1n5V15nMeWCTEE7e8j1PrRK8yGxdC/ShxwlaM3Gcr0Y0KqN0F33CwoTCNHCsPAPcVONtP/eI0t5FitfOrDzW9pvrcKYd7lUTKco3eRCssRhVAVEYAmnheNKaBuh/ZNGK28qolC56qEo1UebadNf3LElPjzXtvowqDUfeT/gkkBi8/cSvmWe2ixalbjiP7jN4P3pYEdJ0gk2IWr6V9HdfL3Vjn+yDqMDsRyVaXU2/HTH133TaPw2YT0kCTLPoX3JpQBmhjl0Dv4JSv74oiUPQEBaYR/WkqBnD+P8lnJMh1zOAwzxVMm60HZ1v5Ix+lMWJtAV6oaB3c5dQokI8HKYnwQJwq4KaDsXzgAj1cEjuwCgD2dFetlk0iq6QhPJDNijRKXwIl3BPQElAls X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 863ae649-2501-4b46-0b72-08da25a37b80 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:35:30.9951 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 25/32] fate/acodec: Fix test requirements X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lfWQ+2BIDcWA This automatically fixes the requirements of the fate-seek-acodec* tests (e.g. 16 of the 27 such tests are now automatically disabled if the aresample filter is disabled). Signed-off-by: Andreas Rheinhardt --- tests/fate/acodec.mak | 85 ++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index eda449c085..efaeaf2c6e 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -6,31 +6,33 @@ fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%) FATE_ACODEC_PCM-$(call ENCDEC, PCM_ALAW, WAV) += alaw FATE_ACODEC_PCM-$(call ENCDEC, PCM_MULAW, WAV) += mulaw -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S8, MOV) += s8 -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U8, WAV) += u8 +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S8, MOV) += s8 +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U8, WAV) += u8 FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16BE, MOV) += s16be FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16LE, WAV) += s16le FATE_ACODEC_PCM-$(call ENCDEC, PCM_U16BE, NUT) += u16be FATE_ACODEC_PCM-$(call ENCDEC, PCM_U16LE, NUT) += u16le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24BE, MOV) += s24be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24LE, WAV) += s24le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U24BE, NUT) += u24be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U24LE, NUT) += u24le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32BE, MOV) += s32be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32LE, WAV) += s32le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U32BE, NUT) += u32be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_U32LE, NUT) += u32le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32BE, AU) += f32be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32LE, WAV) += f32le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64BE, AU) += f64be -FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64LE, WAV) += f64le -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S8_PLANAR, NUT) += s8_planar -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16BE_PLANAR, NUT) += s16be_planar -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16LE_PLANAR, NUT) += s16le_planar -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24LE_PLANAR, NUT) += s24le_planar -FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32LE_PLANAR, NUT) += s32le_planar - -FATE_ACODEC_PCM := $(FATE_ACODEC_PCM-yes:%=fate-acodec-pcm-%) +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S24BE, MOV) += s24be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S24LE, WAV) += s24le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U24BE, NUT) += u24be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U24LE, NUT) += u24le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S32BE, MOV) += s32be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S32LE, WAV) += s32le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U32BE, NUT) += u32be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_U32LE, NUT) += u32le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_F32BE, AU) += f32be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_F32LE, WAV) += f32le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_F64BE, AU) += f64be +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_F64LE, WAV) += f64le +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S8_PLANAR, NUT) += s8_planar +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S16BE_PLANAR, NUT) += s16be_planar +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S16LE_PLANAR, NUT) += s16le_planar +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S24LE_PLANAR, NUT) += s24le_planar +FATE_ACODEC_PCM_RESAMPLE-$(call ENCDEC, PCM_S32LE_PLANAR, NUT) += s32le_planar + +FATE_ACODEC_PCM-$(CONFIG_ARESAMPLE_FILTER) += $(FATE_ACODEC_PCM_RESAMPLE-yes) +FATE_ACODEC_PCM := $(if $(call ENCDEC, PCM_S16LE, WAV), $(FATE_ACODEC_PCM-yes)) +FATE_ACODEC_PCM := $(FATE_ACODEC_PCM:%=fate-acodec-pcm-%) FATE_ACODEC += $(FATE_ACODEC_PCM) fate-acodec-pcm: $(FATE_ACODEC_PCM) @@ -44,20 +46,22 @@ fate-acodec-pcm-u%be: FMT = nut fate-acodec-pcm-u%le: FMT = nut fate-acodec-pcm-f%be: FMT = au -FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_ADX, ADX) += adx -FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_ARGO, ARGO_ASF) += argo +FATE_ACODEC_ADPCM_RESAMPLE-$(call ENCDEC, ADPCM_ADX, ADX) += adx +FATE_ACODEC_ADPCM_RESAMPLE-$(call ENCDEC, ADPCM_ARGO, ARGO_ASF) += argo FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_APM, APM) += ima_apm FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_ALP, ALP) += ima_alp -FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt +FATE_ACODEC_ADPCM_RESAMPLE-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_SSI, KVAG) += ima_ssi -FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav +FATE_ACODEC_ADPCM_RESAMPLE-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_WS, WSAUD) += ima_ws FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_MS, WAV) += ms FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_SWF, FLV) += swf FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_SWF, WAV) += swf-wav FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_YAMAHA, WAV) += yamaha -FATE_ACODEC_ADPCM := $(FATE_ACODEC_ADPCM-yes:%=fate-acodec-adpcm-%) +FATE_ACODEC_ADPCM-$(CONFIG_ARESAMPLE_FILTER) += $(FATE_ACODEC_ADPCM_RESAMPLE-yes) +FATE_ACODEC_ADPCM := $(if $(call ENCDEC, PCM_S16LE, WAV), $(FATE_ACODEC_ADPCM-yes)) +FATE_ACODEC_ADPCM := $(FATE_ACODEC_ADPCM:%=fate-acodec-adpcm-%) FATE_ACODEC += $(FATE_ACODEC_ADPCM) fate-acodec-adpcm: $(FATE_ACODEC_ADPCM) @@ -80,14 +84,10 @@ fate-acodec-adpcm-swf-wav: CODEC = adpcm_swf fate-acodec-adpcm-ima_alp: FMT = alp fate-acodec-adpcm-ima_alp: ENCOPTS = -type pcm -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_ADX, ADX) += adx -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_MS, WAV) += ms -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_SWF, FLV) += swf -FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_YAMAHA, WAV) += yamaha +FATE_ACODEC_ADPCM_TRELLIS := adx ima_qt ima_wav ms swf yamaha -FATE_ACODEC_ADPCM_TRELLIS := $(FATE_ACODEC_ADPCM_TRELLIS-yes:%=fate-acodec-adpcm-%-trellis) +FATE_ACODEC_ADPCM_TRELLIS := $(FATE_ACODEC_ADPCM_TRELLIS:%=fate-acodec-adpcm-%-trellis) +FATE_ACODEC_ADPCM_TRELLIS := $(filter $(addsuffix -trellis,$(FATE_ACODEC_ADPCM)), $(FATE_ACODEC_ADPCM_TRELLIS)) FATE_ACODEC += $(FATE_ACODEC_ADPCM_TRELLIS) fate-acodec-adpcm-trellis: $(FATE_ACODEC_ADPCM_TRELLIS) @@ -101,28 +101,28 @@ fate-acodec-adpcm-ms-trellis: FMT = wav fate-acodec-adpcm-swf-trellis: FMT = flv fate-acodec-adpcm-yamaha-trellis: FMT = wav -FATE_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += fate-acodec-mp2 +FATE_ACODEC-$(call ENCDEC, MP2, MP2 MP3, ARESAMPLE_FILTER) += fate-acodec-mp2 fate-acodec-mp2: FMT = mp2 fate-acodec-mp2: CMP_SHIFT = -1924 fate-acodec-mp2: ENCOPTS = -b:a 128k -FATE_ACODEC-$(call ENCDEC, MP2FIXED MP2 , MP2 MP3) += fate-acodec-mp2fixed +FATE_ACODEC-$(call ENCDEC, MP2FIXED MP2, MP2 MP3, ARESAMPLE_FILTER) += fate-acodec-mp2fixed fate-acodec-mp2fixed: FMT = mp2 fate-acodec-mp2fixed: CMP_SHIFT = -1924 fate-acodec-mp2fixed: ENCOPTS = -b:a 384k -FATE_ACODEC-$(call ENCDEC, ALAC, MOV) += fate-acodec-alac +FATE_ACODEC-$(call ENCDEC, ALAC, MOV, ARESAMPLE_FILTER) += fate-acodec-alac fate-acodec-alac: FMT = mov fate-acodec-alac: CODEC = alac -compression_level 1 -FATE_ACODEC-$(call ENCDEC, DCA, DTS) += fate-acodec-dca +FATE_ACODEC-$(call ENCDEC, DCA, DTS, ARESAMPLE_FILTER) += fate-acodec-dca fate-acodec-dca: tests/data/asynth-44100-2.wav fate-acodec-dca: SRC = tests/data/asynth-44100-2.wav fate-acodec-dca: CMD = md5 -i $(TARGET_PATH)/$(SRC) -c:a dca -strict -2 -f dts -flags +bitexact -af aresample fate-acodec-dca: CMP = oneline fate-acodec-dca: REF = 2aa580ac67820fce4f581b96ebb34acc -FATE_ACODEC-$(call ENCDEC, DCA, WAV) += fate-acodec-dca2 +FATE_ACODEC-$(call ENCDEC, DCA, WAV, ARESAMPLE_FILTER) += fate-acodec-dca2 fate-acodec-dca2: CMD = enc_dec_pcm dts wav s16le $(SRC) -c:a dca -strict -2 -flags +bitexact -af aresample fate-acodec-dca2: REF = $(SRC) fate-acodec-dca2: CMP = stddev @@ -137,7 +137,7 @@ fate-acodec-flac: CODEC = flac -compression_level 2 fate-acodec-flac-exact-rice: FMT = flac fate-acodec-flac-exact-rice: CODEC = flac -compression_level 2 -exact_rice_parameters 1 -FATE_ACODEC-$(call ENCDEC, G723_1, G723_1) += fate-acodec-g723_1 +FATE_ACODEC-$(call ENCDEC, G723_1, G723_1, ARESAMPLE_FILTER) += fate-acodec-g723_1 fate-acodec-g723_1: tests/data/asynth-8000-1.wav fate-acodec-g723_1: SRC = tests/data/asynth-8000-1.wav fate-acodec-g723_1: FMT = g723_1 @@ -154,25 +154,26 @@ fate-acodec-ra144: CMP = stddev fate-acodec-ra144: CMP_TARGET = 4777 fate-acodec-ra144: CMP_SHIFT = -320 -FATE_ACODEC-$(call ENCDEC, ROQ_DPCM, ROQ) += fate-acodec-roqaudio +FATE_ACODEC-$(call ENCDEC, ROQ_DPCM, ROQ, ARESAMPLE_FILTER) += fate-acodec-roqaudio fate-acodec-roqaudio: FMT = roq fate-acodec-roqaudio: CODEC = roq_dpcm fate-acodec-roqaudio: ENCOPTS = -ar 22050 fate-acodec-roqaudio: DECOPTS = -ar 44100 -FATE_ACODEC-$(call ENCDEC, S302M, MPEGTS) += fate-acodec-s302m +FATE_ACODEC-$(call ENCDEC, S302M, MPEGTS, ARESAMPLE_FILTER) += fate-acodec-s302m fate-acodec-s302m: FMT = mpegts fate-acodec-s302m: CODEC = s302m fate-acodec-s302m: ENCOPTS = -ar 48000 -strict -2 fate-acodec-s302m: DECOPTS = -ar 44100 -FATE_ACODEC-$(call ENCDEC, WAVPACK, WV) += fate-acodec-wavpack +FATE_ACODEC-$(call ENCDEC, WAVPACK, WV, ARESAMPLE_FILTER) += fate-acodec-wavpack fate-acodec-wavpack: FMT = wv fate-acodec-wavpack: CODEC = wavpack -compression_level 1 FATE_ACODEC-$(call ENCDEC, TTA, TTA) += fate-acodec-tta fate-acodec-tta: FMT = tta +FATE_ACODEC-yes := $(if $(call ENCDEC, PCM_S16LE, WAV), $(FATE_ACODEC-yes)) FATE_ACODEC += $(FATE_ACODEC-yes) $(FATE_ACODEC): tests/data/asynth-44100-2.wav