From patchwork Thu Mar 14 23:00:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47080 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp760638pzb; Thu, 14 Mar 2024 16:03:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWpVYDvujfEIp0sUXIa2FmW0Z7dya1UdOheWguo8Gla9nhGnXT8KP0t7T2whjCu/EQnhkw+FV9AJfIBEo0xo6EoBrIaFVtjh3X2Yg== X-Google-Smtp-Source: AGHT+IGulkbZS2hj64jSFkNFxBaNmSxIRTX5gmtyksV6ou6Co/UzbEmJ2ZPDVRKa/1wzruA85vLb X-Received: by 2002:a05:6402:910:b0:568:4b7b:acd2 with SMTP id g16-20020a056402091000b005684b7bacd2mr2561033edz.0.1710457411286; Thu, 14 Mar 2024 16:03:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710457411; cv=none; d=google.com; s=arc-20160816; b=JdrTCt6iKZCxa7N/XADhi1U8gUXnfLCLrC0+BzqJH5Ploqw3ZAp62+XDFmx3XsDwwT 7OIvrezjdhtqtHtcJKbVel78A1NuD/0uuT6N+w61RosfzwXW2G2lnN9E3PS0y7M/VmqX Zdk15ubQHrw97pQHijNe6S/z5WVhbf+fSadUtJxDqgJD6GOuH6gEphveg10bmncjySvq LYOZ4fBTbM4IwYhGif5SZ4IYchhmQGF6l6EnkRq8WNqMJJ89deBts6LKKKhRAz9YylDN evRuavUhu90glUDJZ3bymR/3gILoYkHw7Db4ada73wMYbLZpnLQlKhckkvQu9w/8GYNd z7Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=cdCRniaI1b5DCRA1dJNXFGNLGhGmpziPwWkUCCb3XDU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=oNqTLGFFbohJMrjGeyx0614DAfJOk4QrTGkneQw+dWl/P7tQIkdV3LBxEfw3Ar0UDu aSeqOAg/ZUlYyAmqKxQnpbBAyM2ugUH/0aro5IV5K1HSJjWzrHz5gRF8QZGOY2gwGcUa mPctO7Ma5FEbCxuL5fIox2a76fLxln6zyxdHFzZDSgGRKUKY4c0e1+EzHM+kqmDdrh+b kmFmzeGOZILGGyHhwrFN/DZhG9pKl93cVuv47KUrw/41klJ68NfG+jV4VDqBSeLRpwW4 DWGoU+wydYFDqyvH3pHFkVWz3Xv2y4fmEvP0mfYWj5QPZ6vRuzsk+R0mJmclPT/vDCA2 rTrg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=V5+JGNja; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x1-20020a05640226c100b00568a7b01147si473089edd.546.2024.03.14.16.03.30; Thu, 14 Mar 2024 16:03:31 -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=@gmail.com header.s=20230601 header.b=V5+JGNja; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C47468D192; Fri, 15 Mar 2024 01:01:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E23C568D16C for ; Fri, 15 Mar 2024 01:01:44 +0200 (EET) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6e6ca2ac094so1403925b3a.0 for ; Thu, 14 Mar 2024 16:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710457302; x=1711062102; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7PMnq2TIhsFhZGPgEkgwwGW2jlGIiQ4F4fEGZxt+h/Y=; b=V5+JGNjag/ujayx0k8JFovPUVEtzstv5cIj40AwPlIyLSYO/Ee+3TdVT4hfBe3+Pl1 vhUU90/t+XEseSfTNwcofihPnzH4/rzb5rxHuqIwnBguqdOKRltfWKIRH7eVYKa7295+ SlM0EaEklgb9pTxJpJkpvUmGHoKMFr5Dpn16evF8DDAgjiE8xOG8NbYG4+0FEiJyQCDJ 8pLyzGlPvWlxr7mxxTOmLNqq2r5Jb22mM47z3nTK/CJE9rTKXUI65f4v//66jbymTayl qpwv5WytZ56locz4i6UGxSRYo35Ac8P8X+9XKh9yIqyYInhI5aIfaHWfth7d3saNQmVw nc+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710457302; x=1711062102; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7PMnq2TIhsFhZGPgEkgwwGW2jlGIiQ4F4fEGZxt+h/Y=; b=tri8FuoKkJxsAg7tmRjxsO56D0Z8wGYaVHmKq5FhiMKo3RdlxglXl0crk6uKpWP3kP tp/Ce3UaB08Sy8ne716n+rLTQDXw4X7TH2tWWqIDrgo5WH1IGZWUb7b8m8tQ+eTki+6a TqamWmzKfYMfhyVDF24UlCPPj4QMzeHrbkn57CEf28aYP1AcIr1Zj3YLL76QhS4LYehy XUQn52TzGbRrUaXfedTHEP6NIR6a6Hqxp7Nl9bhp4n39tfogCkXEl3z9gkVz4nCwJUPu geVHxEmhWWuUw7sJTO7gkEj1sK4zXWy/weKJGKU2BlKij2j3p4VbTWpt1zkQpE5Rk4U1 8ggg== X-Gm-Message-State: AOJu0Yyd/J1OLyqBtMvz2Cb14/rW/mNWygQAGBj8UAIIFTsZhIomXWyE Vg5m457zDCu5CyfHaG0UBl6vIgqFwkVeI95u5LApNOoHJjT3oyTNdEaBxzQX X-Received: by 2002:a05:6a20:3d88:b0:1a3:1752:9960 with SMTP id s8-20020a056a203d8800b001a317529960mr4107355pzi.55.1710457302438; Thu, 14 Mar 2024 16:01:42 -0700 (PDT) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id i17-20020a17090332d100b001dd7de61656sm2303943plr.37.2024.03.14.16.01.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 16:01:41 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 20:00:51 -0300 Message-ID: <20240314230104.19624-14-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240314230104.19624-1-jamrial@gmail.com> References: <20240314230104.19624-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/26] fate/iamf: add missing aresample filter dependency 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /ywOHIWZO3oS Signed-off-by: James Almer --- tests/fate/iamf.mak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/fate/iamf.mak b/tests/fate/iamf.mak index 6fe0d54762..cf56a67e6f 100644 --- a/tests/fate/iamf.mak +++ b/tests/fate/iamf.mak @@ -1,4 +1,4 @@ -FATE_IAMF += fate-iamf-stereo +FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER) += fate-iamf-stereo fate-iamf-stereo: tests/data/asynth-44100-2.wav tests/data/streamgroups/audio_element-stereo tests/data/streamgroups/mix_presentation-stereo fate-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-iamf-stereo: CMD = transcode wav $(SRC) iamf " \ @@ -7,7 +7,7 @@ fate-iamf-stereo: CMD = transcode wav $(SRC) iamf " \ -streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" \ "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_IAMF += fate-iamf-5_1_4 +FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-iamf-5_1_4 fate-iamf-5_1_4: tests/data/asynth-44100-10.wav tests/data/filtergraphs/iamf_5_1_4 tests/data/streamgroups/audio_element-5_1_4 tests/data/streamgroups/mix_presentation-5_1_4 fate-iamf-5_1_4: SRC = $(TARGET_PATH)/tests/data/asynth-44100-10.wav fate-iamf-5_1_4: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \ @@ -17,7 +17,7 @@ fate-iamf-5_1_4: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \ -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" \ "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_IAMF += fate-iamf-7_1_4 +FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-iamf-7_1_4 fate-iamf-7_1_4: tests/data/asynth-44100-12.wav tests/data/filtergraphs/iamf_7_1_4 tests/data/streamgroups/audio_element-7_1_4 tests/data/streamgroups/mix_presentation-7_1_4 fate-iamf-7_1_4: SRC = $(TARGET_PATH)/tests/data/asynth-44100-12.wav fate-iamf-7_1_4: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \ @@ -27,7 +27,7 @@ fate-iamf-7_1_4: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \ -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" \ "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_IAMF += fate-iamf-ambisonic_1 +FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-iamf-ambisonic_1 fate-iamf-ambisonic_1: tests/data/asynth-44100-4.wav tests/data/filtergraphs/iamf_ambisonic_1 tests/data/streamgroups/audio_element-ambisonic_1 tests/data/streamgroups/mix_presentation-ambisonic_1 fate-iamf-ambisonic_1: SRC = $(TARGET_PATH)/tests/data/asynth-44100-4.wav fate-iamf-ambisonic_1: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \ @@ -37,8 +37,8 @@ fate-iamf-ambisonic_1: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -map [MONO0] -map [MONO1] -map [MONO2] -map [MONO3] -c:a flac -t 1" "-c:a copy -map 0" \ "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER) += $(FATE_IAMF) +FATE_IAMF += $(FATE_IAMF-yes) -FATE_FFMPEG_FFPROBE += $(FATE_IAMF-yes) +FATE_FFMPEG_FFPROBE += $(FATE_IAMF) -fate-iamf: $(FATE_IAMF-yes) +fate-iamf: $(FATE_IAMF)