From patchwork Mon May 30 13:59:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2289587pzj; Mon, 30 May 2022 07:00:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0wzwxsRHZUQKZp355A6IVY6Ite4y+GudwV48psqZ7M7uQoyJV/tXzRI8YOCjevzJL2YBh X-Received: by 2002:a17:907:9689:b0:6ff:a6:eede with SMTP id hd9-20020a170907968900b006ff00a6eedemr28780042ejc.761.1653919211557; Mon, 30 May 2022 07:00:11 -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 el9-20020a056402360900b0042bdec87b25si9776780edb.291.2022.05.30.07.00.10; Mon, 30 May 2022 07:00:11 -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=nlb02yQe; 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 E2E4B68B5B3; Mon, 30 May 2022 17:00:06 +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-oln040092069052.outbound.protection.outlook.com [40.92.69.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 375C668B17E for ; Mon, 30 May 2022 17:00:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X5QBbM/RhVdlWS0PiWPKP6sVR5mKSQVjRRaeANrPJ1kUYwuX/PjpxVxNxwm6zmoGpoZ4wyqfO7ELg9NDdupSluwW6CSx3zVPc5s1JnwmzwytdEoMHBxHBONVfCDukIxp2c606qyTDyOTdQ5yaiTFV43CaPAdApT2D03XDqRkHesSvmiV4zbAyWNcZW4a5HyR894z2xeWuCl6XWA9ZyphU/rTN64P05RRtNEwRXNV+MgZAugiCfSbJJ2E8gB8hQGpvuBZEt5A1pB0dcXtSw4r54g0gqph7TozYER8HoYObBjA90sFeXZ3sisPbC/Wcddu43hGpBvVM18Yby0V4oylMA== 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=tuG+YOtLcn9HBCNEsqwLaPj0j/nOfM/S/DNrNSb6XxY=; b=QnqvfTvr2Wbprtv1b9mmYZwxSptN5MLIuaDmuGHts1ELnwaPrc00ngeAVBqwUnmeFBzgmUdg+gURCz2oD5+0XahyzYTgkHrUuMd8zXn5NiUxsou0SbWtokHwH7e0NEUINthSOXgT+/5yT1jX24zFaxXKJk/2SBRSxg2Pkx/q9R5b5+s7NvmrZ6q/arR0VOZDvKHHQUproBR1M40zdc4ui+RJejbqZCbZX9e8WU+2pGwU8Iti6GdufpjJiqXZhg8PZEfYuLHYPdU9UQdHP6mR7e7YpixyooOt+OFW54N6VvApydQ/3V9MfeSoZDumAG4stggqI8hvg/HqtmU1YIxw5w== 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=tuG+YOtLcn9HBCNEsqwLaPj0j/nOfM/S/DNrNSb6XxY=; b=nlb02yQedRJxpGRkHvkd1nhrG36AsJzVu6q3NdAXzRUyWHKlwIEAimaZ4gTH2n6gtOHQUhhc4y3qo6yXJYoudgIzA1lQlyRn8rN2e0HmwG2Tkg5xKhNd0dibSKJsBWERg4b4HGc0SfctD8Xd2EduG4/kKstNOdhqhrJfkUvgMDCDqsT3MGnpC1nNrrpJpg0ib3+0/DhD4RV636cHWra1mOPHvBL6p4LJAwRSp14+PAOlZ/xY3t6qiO89nKkbs5WLrYpdOL8kXrjYgGZRmzpjp7AtWXv3JYUXUsiyi7/VbfxaRtkCPqUBwVTRvVUi5vRUH7neghXPZ7D5lGkh/vXuug== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PA4PR01MB9018.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.19; Mon, 30 May 2022 13:59:58 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5293.019; Mon, 30 May 2022 13:59:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 May 2022 15:59:42 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [ip5qrSGoLTvhRYcDjZ2VEfS2MP+3d+ob] X-ClientProxiedBy: ZR0P278CA0152.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::10) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220530135947.635716-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0783c74-e9b7-43e7-55f6-08da4244ae2f X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wol03QlwRVv/lBa+c4/v7mrx+BrE9FN33ES1T5XrCltnwWwE62KRpMMFpsIb1F6zkmxleAXKsA+n4+BlCAUTBXdhogIVreBtCZxn+zMi2sfR1O68UJOoosRWEEuXkEMAf4rlose6aOklwEmJH46xT+06ilbXt4HpRJCTMxSFmCTrtOeh20Uv/sc3/rNudO7eVawjnnYwBDdnaF1VLTsnP83PuWaz1HHKI9eWbLoDAfKI1EXwUGpEJu5mN4mB4JooBFIGrwdYOqDUOUxzx5TnZn5CLS0Uuosmbj5dqa7zl6GtuBGSsmwEKhmUQSPuOVavWy/rgEkmyzmGobirRf3mfLy4VAkXmCe2biJXFEArTwxR2YLruBp1xz/82+0nhksCxhJneCKA0vFewu8rDjajkZHxNlWo2pked1l9xnZZePHyGKgtxtSxaiVVa8rQDuqOM8RyFSIQsg10xyrphq+ymXF6U0nL4R5an2aKpmKp7D9CgZKdnHRwuVepeyKSyPu3M92ZWaQVoxLSCST/LLx1Eotb/d6N/zoK+rdibNfFW1ps3mwt7OGAkj7PCy4gKUes5xTl2fPDDfpWXOpUUTLNMvjWtj3SSg83YQp0g10cD4IaU7UAYu8OaiGVVK8W6wR9dSjY+2uetYUZvdDluQe20c9viiyVHgtpfchFdwdpOFI2wRd+y2iQH0VJOBEx26oJvBT3vS9Hfq5uiWB7XrwDbJi4CF2Q7YKDHAClh5jxolBwVltTDapOYeVGlTQO5LZW/Z4= X-MS-TrafficTypeDiagnostic: PA4PR01MB9018:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /t8OsM0MUftWAHH7NcMEEEQN3MdO78wV8NbfxxndG/s965xTiGNKGDUoX8yDKFp9gf+1C/tuw1duteq7QSd1er6guRpAJ2J9yhnqE/Ap9jzt+cuo7Sp2e++rylD8wO+zYJk/GFUsRVtupyTTAUUlb+Cs/4gIoyKIsP9Gf62wui9O/NC40YLcBnS25g3/+AEol1jUwc1tlshoF6bfxzMZO1CVRex9cCxZH/CVPmAfySagp/9Ofy24GneCsreiLzlzxlnqjETQ19dLsObcc0tNgE8Ox6FAa9XRWj/U61DgaZFU8xyZQp5DcnrVpjfwlxeHGdcLDuYvAU7oVuuokHgmtBU3O7cu5Mz3c8Z1uf55ewihjtnQRpQJA3J99g0I7vgwMI120AfwLD53lGPIHZs1jZm8gwvhXiOLT1pnwBQyEhAeyaxD3Hd1Xqtgh7IZItLV3a/fQEFgSGNYaR5befnWsHaeZ+7tP+kkoPc83o5PTV7KEWh7fNUt6fYN45t0Bm3izBPlw3kcjfMEqFV/8AidNypm8q1tupLNh3bSBnbIP+3loG2wysMYnp+lZ3KqyT77Ot/ZGZ73AEF/zxtOLyCFAQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iXtMgwnxlvnER6PVb2qEBMjp2NQW/9U273r4mxSja6cHp5xezckUTIgx5cAudUUNnEI2LdoJC876aJv/nNIblAzOYmelY+YTieYlNn2KBVSrWrpFw/9RpajOpdTBD2o1s/MOF241OKfzedZl9jolVwMxl3emxlqvM1Di2alLXtjKb1F3Ck5lCuXi2Su7e3c73w6Z95UDkRXRG650xeasnmwFXGFtYvhK1HP/eP/PP0bsjQ7UE1Gxv8N3f6yNb2yuBWilsWpws5GHE05eaqD94GvOjoc+mQnodplwXjJAj5V9ZYwv6Y8VV0T0G1mJQmm8RLPsdmzaJAclbNsZASUfRaclK0HmkNrjmAmrJktV/+wgmnwIKwCH6TZo+y2rEZADeGyi+a58Vnh3LA30oManhhq7smoJdVIhzi8znBu4JNPNcS1CZN52RK6orgVA3GhQYbUWi3xcqQh7gqsYb8U8AOgqApNVSWUgMSlOtCbwKeWFxAqkJfCoXYQFA/TbvVtfH414SZJeBm1l4h4by0wfGbOwZo79e+r34ueM8opzwPyYZe9Gz6wMQZ02AmDFP1lipV2HFbt1MJOu8yf7232QghZN1FD9tHRyJ58xhP+9tD+ap6WEAaAfTeyFsu26jONkj5vBR5fh7M+m5OrHYf9frfAkYNVYehu1+eDJjTbuM0JYeaRuqfjfZpW5rc63lCP9VPn4FsgVAAZzzsmsw/lhnlKJs2woFV0Il5hbUFH/IG/8Q8WLPMfGU1nFh+TLoyC/HZbpUEg42wE3+q5gyP06vdm0D65O13ca211IdeI3ijO1B9/tQtzjeivtnWPIVvq5f9Joe4dWxMktTxBSlElP3Ga3YW5DeCXQYXYlcP9BPB2/GGepisjqvg3KgSFn0n5gQcwd9fda/BQRdHGNKWUYY/7M1kRmtZJ6s7QKAKtfEruoWdH6rHhZJEswUVWWOMDSAdCKGORSwWUzEVTJRnrouJgFtXfQzfg+QcAjNZ0o7Eao6+lqHD94bwh7mMsIw9MIIC8yaaxU7nQpemFTJ7E6s1yEMTXj1ocehSl2HyPzs7bv1pQ8nUkbfhvC6XaPaw/mOY3Npe4ogXGFfiDRkxB1KD3dpwf42Oav/a3fUgk311NNROF445C4Zee2sUO1Ld/w7Qa5X1eUbGdku707zUY6appd/WWb9mkg2mdi00en+gcsBfQGxZPyB62EKozeJ0m3VhiNahpe/TVr3XWOU0tkVXSavoVKHLpNq10ESXcOs7bflS220dGDKXMAr+qYMJwx86xKAx8xu6ZHiIpECU4R5H8iLW64/KwmeQjOTS3E0JJdi0TtprpuwAuKFU59huMHVyTDUBOQmJw5BWjhP/DuFmpYvuJIxOXjFRD+WL2BNB+bHk/F9Lj8vQq8YKes3IazRIO/zxzC/hXf0QPYoQ4UPhKqcboW5Ru/7ATuKHEJhAwxO7/r1W3Rfv3X0E9UWl2r X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0783c74-e9b7-43e7-55f6-08da4244ae2f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2022 13:59:57.7799 (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: PA4PR01MB9018 Subject: [FFmpeg-devel] [PATCH 1/6] fate/opus: Restore fate-opus-(celt|hybrid|silk) 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: vhdT1XfnuAC+ Also fix the test requirements. Signed-off-by: Andreas Rheinhardt --- tests/fate/opus.mak | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak index cf8eeb555d..573044ed15 100644 --- a/tests/fate/opus.mak +++ b/tests/fate/opus.mak @@ -5,21 +5,18 @@ OPUS_CELT_SAMPLES = $(addprefix testvector, 01 11) tron.6ch.tinypkts OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06) OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04) -OPUS_SAMPLES = $(addprefix testvector, 07 08 09 10 12) +OPUS_OTHER_SAMPLES = $(addprefix testvector, 07 08 09 10 12) define FATE_OPUS_TEST -FATE_OPUS += fate-opus-$(1) -FATE_OPUS$(2) += fate-opus-$(1) -fate-opus-$(1): CMD = ffmpeg -i $(TARGET_SAMPLES)/opus/$(1).mka -f s16le -af aresample - -fate-opus-$(1): REF = $(SAMPLES)/opus/$(1)$(2).dec +FATE_OPUS_$(1)-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, OPUS, PCM_S16LE, PCM_S16LE, PIPE_PROTOCOL) := $(addprefix fate-opus-,$(OPUS_$(1)_SAMPLES)) +FATE_OPUS += $$(FATE_OPUS_$(1)-yes) endef -$(foreach N,$(OPUS_CELT_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N)))) -$(foreach N,$(OPUS_HYBRID_SAMPLES),$(eval $(call FATE_OPUS_TEST,$(N),_v2))) -$(foreach N,$(OPUS_SILK_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N)))) -$(foreach N,$(OPUS_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N),))) +$(foreach N, CELT HYBRID SILK OTHER, $(eval $(call FATE_OPUS_TEST,$(N)))) -FATE_OPUS := $(sort $(FATE_OPUS)) +$(FATE_OPUS): CMD = ffmpeg -i $(TARGET_SAMPLES)/opus/$(@:fate-opus-%=%).mka -f s16le -af aresample - +$(FATE_OPUS): REF = $(SAMPLES)/opus/$(@:fate-opus-%=%).dec +$(FATE_OPUS_HYBRID-yes): REF = $(SAMPLES)/opus/$(@:fate-opus-%=%)_v2.dec $(FATE_OPUS): CMP = stddev $(FATE_OPUS): CMP_UNIT = s16 @@ -39,11 +36,8 @@ fate-opus-testvector12: CMP_TARGET = 160 fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440 fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0 -$(FATE_OPUS_CELT): CMP = oneoff -$(FATE_OPUS_CELT): FUZZ = 6 - -FATE_SAMPLES_AVCONV-$(call DEMDEC, MATROSKA, OPUS) += $(FATE_OPUS) -fate-opus-celt: $(FATE_OPUS_CELT) -fate-opus-hybrid: $(FATE_OPUS_HYBRID) -fate-opus-silk: $(FATE_OPUS_SILK) +FATE_SAMPLES_FFMPEG += $(FATE_OPUS) +fate-opus-celt: $(FATE_OPUS_CELT-yes) +fate-opus-hybrid: $(FATE_OPUS_HYBRID-yes) +fate-opus-silk: $(FATE_OPUS_SILK-yes) fate-opus: $(FATE_OPUS)