From patchwork Fri Sep 15 13:16:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 43743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca2:b0:149:dfde:5c0a with SMTP id fx34csp309344pzb; Fri, 15 Sep 2023 06:17:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENt7+6VuBkxyfE0+LCcOVA6nN+FJsZfjRGdES2ubEAHx7mB6yCGuIQTF5igbDoA/QjAFtc X-Received: by 2002:a17:907:75fb:b0:9ad:b046:bc50 with SMTP id jz27-20020a17090775fb00b009adb046bc50mr2226304ejc.10.1694783852118; Fri, 15 Sep 2023 06:17:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694783852; cv=none; d=google.com; s=arc-20160816; b=fq1Ai3BokyBKYYtiBs6PlfH4JX6pReP1FihpQAHAUiVM0hKNvYt0sPReRkx6GMWSXf hTl2+dQOdWKMI13ZDJ8Nb+RCP6E/LqdGMufduD+62Sno/Em3lUX47MCAB5sY8TZCjClR 28tQhb9AqSjk0z+u1BeDsuuUWHxr9/Nvo48uKUumxpI6drjIAq2A0GRWa289g/hzD5U6 JM9ZmnxIRdtdyYoM6bv2WIA2rFYZ/64HRRKzqknuqIVgms7KQRHBGLFJSbuRUawwpUnb 45Xcc5xDFR+J7gqt1uTvhGIPxPvmIY+B+54xU5y+vZs10jYjKBLXTP7vjkANzqjYmv/R VDnA== 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=b/mUrHuvz//EvNlPq0G6oeTT3IaXJZaFEyccsVAMvbU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=C575fsW/Y/v2+x9UVG6ibo04C+2aj9L/NAa2XmwQCAGotKt6Um6080xm+IKCl0B1Z+ mWEZNOgTCvoME77p5uq44ByxwnaClhTqXf8jgNVL8SRFTAt7FCkPIHH2ci+4dOSu+N0l mT0U9Ty+3bwTk1nayPEUiysAwIvIZSAObQ9rsBMNBPUfHrC+iFQKxDzOLUjpFO2YgE6y PaoH4UkEhzM9bMcB6insfrH/ZIQbifRnZK2FeCtWWQPxy9I+bk79QVcAFrF49DSyJykd rnb5UtpedI7ygkluSNBcVf2qsiSdSPg5UvAZFPEu8trZfCHYXwWDGnZSDeqaAClNHjH5 qPgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=SJRrJdYE; 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 lc20-20020a170906dff400b009a0f9f9d779si3417092ejc.436.2023.09.15.06.17.30; Fri, 15 Sep 2023 06:17: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=@gmail.com header.s=20230601 header.b=SJRrJdYE; 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 02B2368C77C; Fri, 15 Sep 2023 16:17:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7661968C69F for ; Fri, 15 Sep 2023 16:17:11 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2be5e2a3c86so38782891fa.0 for ; Fri, 15 Sep 2023 06:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694783830; x=1695388630; 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=fejj0JwkiKSgCPo9ki2iTaLGNGfrgkA8OSKVFAXbYW4=; b=SJRrJdYEIiUGdKZGllzxlGXFSAMve2WkyGcJC71pf6kzS9zjvmZ4iPzas7/wUJn7pK GOiDzGJ+i/oqPNB2EkdRba5MwC39G46utCpgjUEaIzdWcYfgiisz/nHXOG9Rde6uT5Ik MWgLmJa3PKXI2ROzj7nCwW79P1NhaYY1ySlnhEQKi+a/LQLwyjbxS4U8WhGwRt7NbRzo xXT03S2brJom2F5QLjgozQ7mgyUv7ovjthm8c1GjJfKDVJ9BcR3Ddf7pGo+lZQ/2M7jV Kwb+JBsd7DiSpkN2BcFFEqssWaMSK1VFFz+wpzNmMaGu1/WVUCaKvMlGBp2F2tIpNQGA JAeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694783830; x=1695388630; 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=fejj0JwkiKSgCPo9ki2iTaLGNGfrgkA8OSKVFAXbYW4=; b=b58OY4+CWPQlgAj3DBCAq42o7kQaeED4OBrqnLNNy/tvc2GYmFeFcCfsH3tNgzxFG8 qGEaf+/H3m1OeJFnaFoHlyZtw62cT2Y13nDYvKWazft+eOcLCF+/7D6YW5+TCxaqWf4W q97NQaZgaUWMXTmNeiT0dp0bcyuy2Kjo1JZYPMlKfDD7TT0XT49alsHEgFaFCmxfIo0h OkGiDIXDWUPWCyvR9vJ1uMyd8mjYwFcM65XpLMwYkRiIXWGTGAlzQYxedBwr90WjucQH zQJgyRDvaUSO5Vn2ijmqiDIZHZzUfl99rsCSt81Y7uVA3/Ifo7TuKv3xs3lrqgjMb6wL AfLg== X-Gm-Message-State: AOJu0YzNG3Obf6rcEZ9q8HehgPy/3nL8bQsuWliDTpUy8Qnhgt0FHbYY UGFWIDVV8U2w70KkyJ3JDG6UIdgYfPs= X-Received: by 2002:a2e:b5a4:0:b0:2bc:cee7:7a1d with SMTP id f4-20020a2eb5a4000000b002bccee77a1dmr1665960ljn.23.1694783830472; Fri, 15 Sep 2023 06:17:10 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k22-20020a2e8896000000b002b9ccbe074bsm715869lji.73.2023.09.15.06.17.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 06:17:10 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Sep 2023 16:16:58 +0300 Message-ID: <20230915131704.45235-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230915131704.45235-1-jeebjp@gmail.com> References: <20230915131704.45235-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] tests/fate-run: add support for specifying the final encode muxer in `transcode` 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: EgCCEFchSSJI From: Jan Ekström This allows for direct dumping of the packets' contents (useful for text based formats), while getting the timestamps/sizes etc from ffprobe. If used via TRANSCODE, the actually utilized muxer should be added within the last argument as an additional dependency, as that is not done automatically. Signed-off-by: Jan Ekström --- tests/fate-run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 743d9b3620..9ef1d9b23a 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -257,7 +257,9 @@ transcode(){ additional_input=$7 final_decode=$8 enc_opt_in=$9 + final_encode_muxer="${10}" test -z "$additional_input" || additional_input="$DEC_OPTS $additional_input" + test -z "$final_encode_muxer" && final_encode_muxer="framecrc" encfile="${outdir}/${test}.${enc_fmt}" test $keep -ge 1 || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) @@ -267,7 +269,7 @@ transcode(){ do_md5sum $encfile echo $(wc -c $encfile) ffmpeg $DEC_OPTS $final_decode -i $tencfile $ENC_OPTS $FLAGS $final_encode \ - -f framecrc - || return + -f $final_encode_muxer - || return test -z $ffprobe_opts || \ run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return }