From patchwork Thu Mar 14 23:00:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp760980pzb; Thu, 14 Mar 2024 16:04:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3sLy4FU/EZHl9gYXl1+wUTeKV/AVgQcg7d0GQDpG0HXngu0OMPMCn9i7t2f4OCGUDmwyDzCd6sOQWO8O2Me38rDKLisTH0fuhtA== X-Google-Smtp-Source: AGHT+IEeu5qkCabPgEu6QBhPH3gjdCQ4OyXJKU8c+NS2m3C5Tsc67KKxLqS7uhfEdfUfmIMEGWH+ X-Received: by 2002:a17:906:e286:b0:a46:220b:25b4 with SMTP id gg6-20020a170906e28600b00a46220b25b4mr1514774ejb.11.1710457445691; Thu, 14 Mar 2024 16:04:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710457445; cv=none; d=google.com; s=arc-20160816; b=gKQYwXKDeT+Amu+q3fdievbdoECNyEcNM4qgXlda2X3XvZzSqkvHlb3YEMcQTuqZVT GK2+pD6hOd8fbdWyZV7q8b0Xdfg3af0/5hZs/wkJfKL1x21GIDlWe25iO8aFgNxb3qYl 7h0FRIezlkZz+eipk0n87wocttLWgpbrekG5aQPFVuZSuRuGRfsPkcheCmTosvS13A4z xZ9QZ5ZVebpJvCH40QkmR21/9i/0uHY5MXPH53DeSaHIzxFsTGIMcqsbHW+hu+fLMh5O k3hh6ZX14mG2lV3KPIuFPLzoJ47lFn02EHiDrW4KeRXMorwL7EM8KskJayZGuQHTEGJb Zgjw== 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=C3UH/u6b5C9gKDz5rKyEcKYR7AwQGP0wlChFoQ1nLwg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=QdftzQsinEEINx9YRjxTJZcKr+0pGtleEiHKtwsyPZq8TRA69Rr+h4zIdxo5mIMZeV ZFxUf/AW+0si3J4SRv3Edupt1PZ8f6ctW8fazBANSwnqnxmD9pNdO2TXCUafVoHAi1a7 z3qS6AAoZnumtNGmgw8MGY+98BjCIAKSZfWq2yAHq3KrlPOiTzXd7Fs8QeYWGbLO8y4v hNxFK6eXmn/4r3vZDOyctJxkbcOpNiK5fOwd3SaDhlaqn1uQcSpV8FhCk+2xwi5tRWWy 6LSe9j1jfdbf0HiqqqglU24U3OSe6ru7LSV5fDczEbzeWPIxqCzx+OWc8rJvaiTk6HJQ TvQA==; 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=bBWToNu1; 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 w19-20020a1709064a1300b00a4637d96b53si1116869eju.172.2024.03.14.16.04.05; Thu, 14 Mar 2024 16:04:05 -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=bBWToNu1; 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 6837168D1DC; Fri, 15 Mar 2024 01:01:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C63868D1C4 for ; Fri, 15 Mar 2024 01:01:50 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1dee27acf7aso6387695ad.2 for ; Thu, 14 Mar 2024 16:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710457308; x=1711062108; 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=kiVGNQLLXklGMjHDLHV/OwT6xCRWXJ75EE4LqNm0PWA=; b=bBWToNu190BCvj3b+LMYyNzaaQ6gOCxnW4XlcwFU5e2rKQxdH+eZRNVc5vFs7xnXN8 WycTvxY6JTuJ8J2oFmFl0BEyfHDmfTD6QrHY4sPn1qtjYiSSwC4CEFwHrt3PLV6Cz+Nv fmCaIb6maKogYhHX0OZcmVetqPoNK6OopCeIzdPV81ic14RjD898bza/dyxBoUUbuNPt MVgjRfpx8teijky1N1R6AYPXPCmPKq2uuT06pCMn7jmPcwT4hZTDtg3V/swQHm/FdWVl Sh2qsMMsnIRg5BWRXpBcFym6xJtyFRR3jRnVfwq1w9QlTQJzXF1VaFhthCYkhRmqqE9W ypAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710457308; x=1711062108; 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=kiVGNQLLXklGMjHDLHV/OwT6xCRWXJ75EE4LqNm0PWA=; b=JZnC+tw3e82ZsqbWOIvmBwwqMSVT6pEaECaXCnQa5JgkaeIMXl5U6GloECHWzOhbxj xDSNAMP+UlW4PYjXkmyWUD86v5xXh/Q36kI5bXBhJ9UzBM8ri/Iv47JKSB1W70Li4aD1 E0sU8BQiqH5pqwdYodgZtwkns8I8/YHmdpWEseveqVAn8R2T9prXL+O6cn67R6NCUaGp HAPlYVbsynl1k0o0w1fxIJXEk9CKl+8sLQ3ewn4YuNHBcohc2eNUWalKRmn98lnyvHLK SxHHCDJKlrqu6Z43JkIj1eZVgRHFchKP+DNyuuRTOS+p0gbaKEhrYCtVahX7w7zNQGjc dTPA== X-Gm-Message-State: AOJu0YyM0vXJFPqPKHDtLkugnIXrOZW8TtDElHxf21lQmsFJhwAs4mc6 gqEYSkxdqUxmuVdHMTnY0KUJhjPJMimZgoi/aL4G+odq9jZGWYTCorT8TGfP X-Received: by 2002:a17:902:82c9:b0:1dd:abb1:e17 with SMTP id u9-20020a17090282c900b001ddabb10e17mr1532310plz.32.1710457308065; Thu, 14 Mar 2024 16:01:48 -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.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 16:01:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 20:00:55 -0300 Message-ID: <20240314230104.19624-18-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 18/26] fate/mov: 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: MxKULj09XwrQ Signed-off-by: James Almer --- tests/fate/mov.mak | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 51fd5fa2f3..b54fe19620 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -10,11 +10,9 @@ FATE_MOV = fate-mov-3elist \ fate-mov-tenc-only-encrypted \ fate-mov-invalid-elst-entry-count \ fate-mov-gpmf-remux \ - fate-mov-440hz-10ms \ fate-mov-ibi-elst-starts-b \ fate-mov-elst-ends-betn-b-and-i \ fate-mov-frag-overlap \ - fate-mov-bbi-elst-starts-b \ fate-mov-neg-firstpts-discard-frames \ fate-mov-stream-shorter-than-movie \ fate-mov-pcm-remux \ @@ -69,6 +67,8 @@ fate-mov-2elist-elist1-ends-bframe: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov- fate-mov-elst-ends-betn-b-and-i: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/elst_ends_betn_b_and_i.mp4 # Makes sure that we handle edit lists and start padding correctly. +FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, AAC, ARESAMPLE_FILTER) \ + += fate-mov-440hz-10ms fate-mov-440hz-10ms: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/440hz-10ms.m4a -af aresample # Makes sure that we handle invalid edit list entry count correctly. @@ -87,6 +87,8 @@ fate-mov-frag-overlap: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/frag_overlap.mp4 # Makes sure that we pick the right frames according to edit list when there is no keyframe with PTS < edit list start. # For example, when video starts on a B-frame, and edit list starts on that B-frame too. # GOP structure : B B I in presentation order. +FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, AAC_FIXED, ARESAMPLE_FILTER) \ + += fate-mov-bbi-elst-starts-b fate-mov-bbi-elst-starts-b: CMD = framemd5 -flags +bitexact -acodec aac_fixed -i $(TARGET_SAMPLES)/h264/twofields_packet.mp4 -af aresample # Makes sure that the stream start_time is not negative when the first packet is a DISCARD packet with negative timestamp. @@ -225,7 +227,7 @@ fate-mov-mp4-iamf-stereo: CMD = transcode wav $(SRC) mp4 " \ -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_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-5_1_4 +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-5_1_4 fate-mov-mp4-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-mov-mp4-iamf-5_1_4: SRC = $(TARGET_PATH)/tests/data/asynth-44100-10.wav fate-mov-mp4-iamf-5_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \ @@ -235,7 +237,7 @@ fate-mov-mp4-iamf-5_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filter -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_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-7_1_4 +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4 fate-mov-mp4-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-mov-mp4-iamf-7_1_4: SRC = $(TARGET_PATH)/tests/data/asynth-44100-12.wav fate-mov-mp4-iamf-7_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \ @@ -245,7 +247,7 @@ fate-mov-mp4-iamf-7_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filter -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_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-ambisonic_1 +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-ambisonic_1 fate-mov-mp4-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-mov-mp4-iamf-ambisonic_1: SRC = $(TARGET_PATH)/tests/data/asynth-44100-4.wav fate-mov-mp4-iamf-ambisonic_1: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \