From patchwork Fri Mar 8 13:19:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46904 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp931659pzb; Fri, 8 Mar 2024 05:19:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUyVR4LAtAh5QuPHp7Cxcqd9cs6fZv0sKm7B8EQ7Qj7WUnyV4vLfTFmNcZFPegyKlx/b0cUiJxIrqVbDFvaIyX0qj4pKtvrLOjifQ== X-Google-Smtp-Source: AGHT+IHZYTM4Gtk1ERGUhqvgcUO35CWMCqYpWbI5+gTe/AzHV6SdOLzGgngZzZVPtPIBmwsP+98W X-Received: by 2002:a17:907:7da2:b0:a45:74fb:f5c3 with SMTP id oz34-20020a1709077da200b00a4574fbf5c3mr286810ejc.28.1709903990004; Fri, 08 Mar 2024 05:19:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709903989; cv=none; d=google.com; s=arc-20160816; b=T5v7lCGikHsw+XJcfSm6wIxJ0iYII78MzG3Kc/HFOLe/VzeXXRaDUBpYXRwXJrUH/u UMy8ftX5HODE1oVBGtu35MNcONMH0aK5BtpmtRKdOMLIRpu7Wp7m+5A+9glwethdt6cZ 4tQcBFBUJ3tX3q88yf84GmrLdHSFooPAewwbZwA/jjvIqfVPTfEczoANm5vmbjtUZKAg j02xgm1MeXXsd4qhWe2SNoGysGMlYKiiIVrK9dOmj4HDaXgTzkz0E/nHtBtci/B/b601 r7APx/SjYPkzmNnva2u9TZpSnKOjfojTs8L1QOo/acm4K1i8BOD2rThqghVTlUaHQg1D LD8A== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=wnaMsuVxHScnnJIjNt1vMNC7F4Hz1mdOAeJrzoU4VLM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=uzvS13xak3v6xN1MrU5QwVm01+plMWn4eBVwNzgjm8RpRFmw+WSJ7x+y9E4Cq3wjTs yqM+pXFf/b0/cJFg82j3yYqm1Wlh0RoVx7djM+LQQTLD/qlTfv/gwl2kHyjuPxZAi8SV TSwPCbVQXQ3D180AoJR5uM1fZGYQ6Eh5HG6QnsX1txCQpG0iamPcpypR5GtuNjKP6ROZ qRiKhCQKh46hypnaIbwbCmp0IHMHBrE0jrMCYrQkL7/1oMLxMELrXmp6Fdhikb6D8uWr TgQ9zwCLKsITLiLXiqU7J0DZPnBe4MLxp1zAlydu8sKgD1zT2cf76l/xUPORxFcrF3F/ /7Zw==; 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=ayWvJfli; 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 c26-20020a17090603da00b00a45bb232eecsi2321068eja.57.2024.03.08.05.19.49; Fri, 08 Mar 2024 05:19:49 -0800 (PST) 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=ayWvJfli; 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 A22C868CF3F; Fri, 8 Mar 2024 15:19:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C2FB68CE16 for ; Fri, 8 Mar 2024 15:19:40 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1dd3bdb6e9eso14395855ad.3 for ; Fri, 08 Mar 2024 05:19:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709903977; x=1710508777; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Y64kjPUCh72MXiTpq7xN9jwrDLn6+VSLqK43I9lt3ZM=; b=ayWvJflirMBjaxgACX2Fo2X4+clVClgpcRwfXFN2uG/rcsW9x5xLU/1r4Df/onO9sJ /L//58dgC+VyJfQX7DHNSlx/hfJuVkeS0WK1uzlABd9wGYXuo8aNh+rOxLOM0TB9gqtS CBLGtrXKUOEv9zgZ1A5wiBvRWKjBNLe+P2VS5oo4WLxmOehKLK3xTpvaZKZLxwqot8Dr 2efmFQTA54TNjvCuIJKkekAnqnqWAZ4mhB1XVQ12BIeawlZ5fl0G7DUaKY7GBwciY7MU 1C8EwbPkCtVh05qdGyjfikK5dTsguO/bAxv/rC1EjHNFmFQGkAXs4v7mjc7DAEVpHp3G nyjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709903977; x=1710508777; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Y64kjPUCh72MXiTpq7xN9jwrDLn6+VSLqK43I9lt3ZM=; b=XeeB0vqSR72rE2noQrqhG7SKQd5xDvxLuiMPGjgefXQ5ezekOfR9zOf33vH6CSSjIr QokzpAQwUWPEsWqYgvq9vQm9al/NiSXpgpc5dudB0dwUbLe+5jCUvCrk+4H6TaG0fasm pSAVcbMnmdcszV4laFIG0jSsCpURgcUbs+Yn3NE64lle40evUXMNPkr+5RqPAy0gkLAk jo7h9UmPETMuaKmKYtTjR6UjpaJHH7Ozqx1p2IZImfkvtQHns8UqQd1e0A8uSRxaJ4Ne DO81xzlrEUy6glmSJx1Y+77aRQOaz/5UkkkOIdgPd0kLFsusIcLuwoKqm18ooViNRCoV qrhQ== X-Gm-Message-State: AOJu0YwME5qTjwQrQEkrpf8Nph/eVHhxb9+oM6yJUx9rd5mUh/NtiAWk 38z3U6g0wdWQZbkLQ/YecYP/LpbJl6Mku+H42Z25RyveYrWV7yCoo4mK4u7B X-Received: by 2002:a17:902:7848:b0:1db:e7a4:90a8 with SMTP id e8-20020a170902784800b001dbe7a490a8mr9435669pln.10.1709903977348; Fri, 08 Mar 2024 05:19:37 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id b3-20020a170902650300b001dcf7c2939csm12749546plk.105.2024.03.08.05.19.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 05:19:36 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 10:19:40 -0300 Message-ID: <20240308131940.1568-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fate/flvenc: force the av1 decoder in all steps for fate-enhanced-flv-av1 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: 3ILs+nv3KC0T Signed-off-by: James Almer --- tests/fate-run.sh | 5 +++-- tests/fate/flvenc.mak | 2 +- tests/fate/mpegps.mak | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 2de560354f..0fead78c58 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -292,14 +292,15 @@ stream_remux(){ enc_fmt=$4 stream_maps=$5 final_decode=$6 - ffprobe_opts=$7 + final_encode=$7 + ffprobe_opts=$8 encfile="${outdir}/${test}.${enc_fmt}" test $keep -ge 1 || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) ffmpeg -f $src_fmt $src_opts -i $tsrcfile $stream_maps -codec copy $FLAGS \ -f $enc_fmt -y $tencfile || return - ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ + ffmpeg $DEC_OPTS $final_decode -i $tencfile $ENC_OPTS $FLAGS $final_encode \ -f framecrc - || return test -z "$ffprobe_opts" || \ run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak index 3cfe930e43..e3703a8cc5 100644 --- a/tests/fate/flvenc.mak +++ b/tests/fate/flvenc.mak @@ -11,7 +11,7 @@ fate-enhanced-flv-vp9: CMD = transcode ivf $(TARGET_SAMPLES)/vp9-test-vectors/vp FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV IVF, FLV_DEMUXER AV1_DECODER AV1_PARSER) += fate-enhanced-flv-av1 fate-enhanced-flv-av1: CMD = stream_remux ivf $(TARGET_SAMPLES)/av1/seq_hdr_op_param_info.ivf "-c:v av1" \ - flv "-c copy" "-c copy" + flv "-c copy" "-c:v av1" "-c copy" FATE_FFMPEG_FFPROBE += $(FATE_FLVENC_FFMPEG_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_ENHANCED_FLVENC_FFMPEG-yes) diff --git a/tests/fate/mpegps.mak b/tests/fate/mpegps.mak index ae301fd5e1..43cd2aa22b 100644 --- a/tests/fate/mpegps.mak +++ b/tests/fate/mpegps.mak @@ -1,7 +1,7 @@ # This tests that a 16-bit pcm_dvd stream is correctly remuxed in mpegps FATE_MPEGPS-$(call DEMMUX, MPEGPS, MPEG1SYSTEM) += fate-mpegps-remuxed-pcm-demux fate-mpegps-remuxed-pcm-demux: $(SAMPLES)/mpegps/pcm_aud.mpg -fate-mpegps-remuxed-pcm-demux: CMD = stream_remux "mpeg" "$(TARGET_SAMPLES)/mpegps/pcm_aud.mpg" "" "mpeg" "-map 0:a:0" "-codec copy" +fate-mpegps-remuxed-pcm-demux: CMD = stream_remux "mpeg" "$(TARGET_SAMPLES)/mpegps/pcm_aud.mpg" "" "mpeg" "-map 0:a:0" "" "-codec copy" FATE_SAMPLES_FFMPEG += $(FATE_MPEGPS-yes) fate-mpegps: $(FATE_MPEGPS-yes)