From patchwork Sun Aug 20 15:10:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cox X-Patchwork-Id: 43272 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:47ca:b0:130:ccc6:6c4b with SMTP id ey10csp936345pzb; Sun, 20 Aug 2023 08:10:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG7UkMGcdfwSqTKHtIgD+4M0H+KSkoaNDJ/HI11gOBgpbM8p6f9haV2DtNx96o85ggGLNPd X-Received: by 2002:a17:906:8a7a:b0:99d:f8f0:fcc0 with SMTP id hy26-20020a1709068a7a00b0099df8f0fcc0mr3209253ejc.32.1692544255119; Sun, 20 Aug 2023 08:10:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692544255; cv=none; d=google.com; s=arc-20160816; b=YCHQuAOhsuKVkuT6ehelMFPHBcp21xH615+7qTtDOhaIUXmnjglneKIxh6VXFVXtMb oNhh2KXHyd1lOz2g4s9eKEe8Fmcgj7hOqtdLOpp4ZPm8bdzBQ6KIvlOmamZXqtJzKQGx KZfFMI+eYUaDfev/mdvjJfFfcvdt/5/HyyHG5xKuBj6BjlWt0YHTEPY9jAeXIEOKe90H UX2ONEwn8CKfXxavZhwxWQuiJWZl1Xn+pU7RvXXvhZ26RatAB0cn7a6IeFnWMfcgIKty HpTGwposaikp+gwpAzgOw+58VKTZaiKZcICCsLkvdmwWJZp8HAwCaucAiKExVpzoCweg MtBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=q5D/Z8xUYF6tOIAEDNDxLc6pg1QXnGqhXzqjFc4JgiA=; fh=9QDi6dFFPFAV43XzYhuUbqo2pwrpR9p92hw/7eQiArk=; b=sd0FrgQ4qsR5FavQdwMJYDu5IlQtdpcljBAbBi1yUCWBKfmmZ4/flZESQ1SUul9uZg fF2xMdE5OpFVPTTlUjbDkbPp0gksIV7deI6kVf3N+B/rOyft0xVrwQxf8m9WshESxVGZ 7SJY3TICEZqgQUyr7aLkN0VcHSVXYchCIVl8xG9SmR0Bskcu+5Bm0pyoxvWjbC7zXjX/ n/0+7utVDY60qSNfj6UXedxymhS643/SGttBahlKdfDdj4QY2mTesdasx1hHUZvTj5Jn skLfB9bmq2y8ZiVxJoRCrCpJueugHv6M6sc0nlka9gnuThCSZT5PzOH42qN5UuVdb3AQ FQOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kynesim-co-uk.20221208.gappssmtp.com header.s=20221208 header.b=y5i1gJGW; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t9-20020a1709066bc900b00992e26642ddsi4373999ejs.251.2023.08.20.08.10.54; Sun, 20 Aug 2023 08:10:55 -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=@kynesim-co-uk.20221208.gappssmtp.com header.s=20221208 header.b=y5i1gJGW; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 641AB68C394; Sun, 20 Aug 2023 18:10:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 463C668BBC9 for ; Sun, 20 Aug 2023 18:10:34 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-3175f17a7baso2228928f8f.0 for ; Sun, 20 Aug 2023 08:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kynesim-co-uk.20221208.gappssmtp.com; s=20221208; t=1692544233; x=1693149033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/bZxdHX+AutDK7SgdwiIYGC7H6WWqqRHYiDIlR4OlOg=; b=y5i1gJGWzDC215xy9viqCrHdi0EjN5PtjEsr5p97mh29VgZFIUzlFCF0GRGFPcVLP2 Fx/3MhDjW8TWZrIqdwfuHYYNqqdHNnYuicYf4crUGwQ/9yc3wqYdBSTNNRdKCYYSRZq5 ugcTEL1xcAJC0D55kR0TokJYzvE+4w4xYFBIs8nhmpcEaYizKvCcd4LQDqgEiD1q3Bso 8Bs5ZxrU1w7wA3TY5Fd07gZMt22vHsf5WLLypSez8DY8xP0+lSIelEVO5j87cWeDAuSD 4v9+pBth2LJa0tVw+88RQBMxXpBTbJUyTggrz5gq8T5X4ir9CtN5iCur9wvWSygyRp74 FkNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692544233; x=1693149033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/bZxdHX+AutDK7SgdwiIYGC7H6WWqqRHYiDIlR4OlOg=; b=D6hiJGaHDPWOhZVFyc7BWojgGZJTiBuD2tWRCD1A7pPrMam8UPoFGr5AlI2h49SISI wDdMBDvMDOfUBKlfddCLOoJlYeMgWaxVVvu2CO7NvqhJ1pnr7YuHHS3kj8jqjYtR6XMk +9twnrqJTzu2QlskBW0FA88eWsOJlVemlLz4q078HtN2WI86qqSb4sKK3GXXhwhUyt/2 /MXViaUrb9erO3FdjFXIcsTd450miskf27LR2vVuMC6pB/LOgiysfYCCWA45xi4om+UQ 697GABnVSjAwvbDvepm8ORE0rcCgoz58hIKJxDnERCg2F29O35EqwVXqeUUHdnYi/Bo6 xw+g== X-Gm-Message-State: AOJu0YzfE4Y9BN0iLv2/KR+ORLfah4/kxrY5ibsmJiXTgkXxAfdsg99z CT1TmTjO0yHd24sCfMEAYVQALtboovsjQpqIDMY= X-Received: by 2002:adf:ea4b:0:b0:317:7068:4997 with SMTP id j11-20020adfea4b000000b0031770684997mr2978871wrn.60.1692544233390; Sun, 20 Aug 2023 08:10:33 -0700 (PDT) Received: from sucnaath.outer.uphall.net (cpc1-cmbg20-2-0-cust759.5-4.cable.virginm.net. [86.21.218.248]) by smtp.gmail.com with ESMTPSA id b4-20020adff904000000b003197c7d08ddsm9494476wrr.71.2023.08.20.08.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Aug 2023 08:10:33 -0700 (PDT) From: John Cox To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Aug 2023 15:10:17 +0000 Message-Id: <20230820151022.2204421-2-jc@kynesim.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230820151022.2204421-1-jc@kynesim.co.uk> References: <20230820151022.2204421-1-jc@kynesim.co.uk> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 1/6] fate-filter-fps: Set swscale bitexact for tests that do conversions 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: John Cox Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nOl+4igfl2vU -bitexact as a general flag doesn't affect swscale so add swscale option too to get correct CRCs in all circumstances. Signed-off-by: John Cox --- tests/fate/filter-video.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 789ec6414c..811a96d124 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -391,8 +391,8 @@ fate-filter-fps-start-drop: CMD = framecrc -lavfi testsrc2=r=7:d=3.5,fps=3:start fate-filter-fps-start-fill: CMD = framecrc -lavfi testsrc2=r=7:d=1.5,setpts=PTS+14,fps=3:start_time=1.5 FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, FPS SCALE, MOV, QTRLE) += fate-filter-fps-cfr fate-filter-fps -fate-filter-fps-cfr: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vsync cfr -pix_fmt yuv420p -fate-filter-fps: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -vf fps=30 -pix_fmt yuv420p +fate-filter-fps-cfr: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vsync cfr -vf scale=sws_flags=bitexact -pix_fmt yuv420p +fate-filter-fps: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -vf fps=30,scale=sws_flags=bitexact -pix_fmt yuv420p FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE := $(addprefix fate-filter-alphaextract_alphamerge_, rgb yuv) FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, SCALE_FILTER FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += $(FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE)