From patchwork Fri Nov 8 01:20:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52631 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2fe5:b0:4a6:1c7:11b7 with SMTP id kw5csp1860322vqb; Thu, 7 Nov 2024 17:21:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVpUiNWD/hbwVLcUTUxz+gD6OAtgDeB2wbsG8pWztSLprWFd/wrm1t0EQUV7vHrdQjvthWV+wTJnKCQEVg6tlLi@gmail.com X-Google-Smtp-Source: AGHT+IGaIwPShSwfy4UBvTUlt4sO7ovR6CW/qvGtMz+QT5mQNjtrTAMdA7ym8HbMPW6DqBHhSNNv X-Received: by 2002:a17:907:6d0d:b0:a9a:61d:7084 with SMTP id a640c23a62f3a-a9ef00234b8mr75487466b.50.1731028879232; Thu, 07 Nov 2024 17:21:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731028879; cv=none; d=google.com; s=arc-20240605; b=fVpaHPJFbY9tZwunfvdS+AC6vDkog6xNJgJm/v7XqyVWsu5cxoFFOsIBNLP8ltWg3x Z8GckpPB8NeC0lzkhDZwUW05IFKC8leZ9EeyIT3bkGhuYgnW2tw02xBRKBftgR1yIaCl GjjiOficFozdXv4vZzB9XEuNWEPL/OUh6BjnRcLwQKc+hTny4ELpgEUh0rkC+3POb1wC S2YO2p0KgVhEUi/xPLluJ99nCr29wuzKCa/dOX1yhCAvfgQgaTHE51/k2KmVyhkc0wPl Zbxcybxb2bgZ9dNQ1dL9eY0DUvN9qc9cyH5BWQCJoFJHoXcFzIs2SXLAEEN5EfyP0Ner gtmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=h60t+H2tNTsMwYz7Jeggi0EzJhEK3qLbdE67kI3gMZI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gIpEv0zI2B24phG9d2rAJOXtAX7yh9twwQoLaR1IZLkfu82EEb9GZGqSGG88b4Bpx1 /CYIJHrsgsJOIG/vZ8CUfLh25WkuIt7wFD+rzxpL20fpGqxx35dUdnDXHinbHLVYT+t5 0V07Wt3aDEoUqUwQZP0DE0Mg4XquFKZR3PSFRQZfYTtT9W/7uE1WaTXAYyc45rR/oQYK kpzo7hcmdJrQnG5qV6eQFaUIsw2sCPDOqoThq6Mbdq8miyPZ5awN3UKWLoRBff6tOHm3 F0kps4ndp4gK6DxBZYOB3dImAzXz8KWZUCkfZehZm5RyLASIv+QfjiUgXoVV1RQtjKPT 0atg==; 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=RPgnSWDs; 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; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTPS id a640c23a62f3a-a9ee0dc1de3si167221066b.428.2024.11.07.17.21.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 17:21:19 -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=RPgnSWDs; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B386D68DBA8; Fri, 8 Nov 2024 03:21:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E2FC68D653 for ; Fri, 8 Nov 2024 03:21:08 +0200 (EET) Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-71822fabf4fso979851a34.2 for ; Thu, 07 Nov 2024 17:21:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731028866; x=1731633666; 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=3gz/PnEPat+yyH4aJKBdDhhdQUwyTIBeL5arxvZm2Cg=; b=RPgnSWDsWBfFX861azaVs2zDF5gKRppndC6p0eLSsO+V77ybnh6JXnz6wHa2l3nRZu wWl9vePK9eXPXkCAchxApLGv22LMVes8vDgFkI/VjBGadj1O/JSJ3j4boNW+ZNklh6Po yUqQQmIszxRMcLvsfqnQFNtfK/NrLSESp7z6Yz44oqgz47vxHTba/ItAO0771uVq9ml0 FClQ1dfuIUbaHjtbIdMiR3lAGQ3m5APhRZyL946ouod0hN7schlbaAcimwj1oGqJMnNv K0nanhpndk4TtZBAT/H25/dF9aQ23hnKAbqqo9ka8hnh/jd2kfuJ1xwszk5GBEi+PXOa DreQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731028866; x=1731633666; 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=3gz/PnEPat+yyH4aJKBdDhhdQUwyTIBeL5arxvZm2Cg=; b=BkiniIQxrASv6lpF53JiqWE7mcLryxWTTM9S0rm9K0xKo4NqPdzIl1kCMAWcJZpJhj Ilq8zSBr1BJWzGiKTmwrSCNVm8DYCkE6GyIjSvfxMnt5Ac1qBNm6keI1tThm2srCmvis 4UdsNeOH8H0m10CUntlm3Hb9yORS04iDdFzyybKoan84cDCmyWpTcG00On2mwjKDJuXr uRYAWwidsdJKCNDTrCVEfM7zQI9B4dnIA7Gk8GPZQSCy32Y11+Qp+7Tcmswe9VhfnS0a 3Lkb3fZoTTwG10C2DZiGWXexNvmu8L0NAB+m5hf17L8FcIv71dOREvQsLXfxMt2XimTx okDg== X-Gm-Message-State: AOJu0YwhYjFLTvJifBM72HZzdtqZ8BrMdEeVzjBuKIBGlkXFOBrYQ/Ef 51L1+hIthgm8kjNGrJB0ojQYFNlykGgObsd1tS8qY8GgUnk4xIwEWf/jAQ== X-Received: by 2002:a05:6830:6015:b0:718:41b8:5d6d with SMTP id 46e09a7af769-71a1c26b141mr1425033a34.24.1731028864695; Thu, 07 Nov 2024 17:21:04 -0800 (PST) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7f41f644bbdsm2190530a12.68.2024.11.07.17.21.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 17:21:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Nov 2024 22:20:49 -0300 Message-ID: <20241108012049.63632-1-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fate/pixfmt: disable dithering in the scale filter 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: 8ZAEtzP9BnG+ Should fix fate failures across different systems. Signed-off-by: James Almer --- This only hides the bug in the dither path for unscaled planar yuv 8bit to hbd and vice-versa. Someone more familiar with the code should check what exactly is going on. tests/fate-run.sh | 2 +- tests/ref/pixfmt/yuv444p10-yuv444p | 2 +- tests/ref/pixfmt/yuv444p12-yuv444p | 2 +- tests/ref/pixfmt/yuv444p12-yuv444p10be | 2 +- tests/ref/pixfmt/yuv444p12-yuv444p10le | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index ef9c7ef064..c61a4dc992 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -513,7 +513,7 @@ pixfmt_conversion_ext(){ outdir="tests/data/pixfmt" file=${outdir}/${color_range}-${conversion}.yuv cleanfiles="$cleanfiles $file" - do_avconv $file $DEC_OPTS -lavfi ${prefix}testsrc=s=352x288,format=${color_range},scale=flags=$SCALE_FLAGS,format=$conversion \ + do_avconv $file $DEC_OPTS -lavfi ${prefix}testsrc=s=352x288,format=${color_range},scale=flags=$SCALE_FLAGS:sws_dither=none,format=$conversion \ $ENC_OPTS -t 1 -f rawvideo -s 352x288 -pix_fmt ${color_range}${suffix} -color_range mpeg } diff --git a/tests/ref/pixfmt/yuv444p10-yuv444p b/tests/ref/pixfmt/yuv444p10-yuv444p index c39314523a..44cd8a40a6 100644 --- a/tests/ref/pixfmt/yuv444p10-yuv444p +++ b/tests/ref/pixfmt/yuv444p10-yuv444p @@ -1,2 +1,2 @@ -67d5749f3b40b343008f9a62db1b2abd *tests/data/pixfmt/yuv444p10-yuv444p.yuv +1b783c5b90f43945b91b0b5be254aded *tests/data/pixfmt/yuv444p10-yuv444p.yuv 15206400 tests/data/pixfmt/yuv444p10-yuv444p.yuv diff --git a/tests/ref/pixfmt/yuv444p12-yuv444p b/tests/ref/pixfmt/yuv444p12-yuv444p index a59328f3c0..fc5e8e53ad 100644 --- a/tests/ref/pixfmt/yuv444p12-yuv444p +++ b/tests/ref/pixfmt/yuv444p12-yuv444p @@ -1,2 +1,2 @@ -1ece60e7894b113b09c86575c66a2ec8 *tests/data/pixfmt/yuv444p12-yuv444p.yuv +9339fb7fd327f4131639c3b718eeccce *tests/data/pixfmt/yuv444p12-yuv444p.yuv 15206400 tests/data/pixfmt/yuv444p12-yuv444p.yuv diff --git a/tests/ref/pixfmt/yuv444p12-yuv444p10be b/tests/ref/pixfmt/yuv444p12-yuv444p10be index 90740e0467..9785443799 100644 --- a/tests/ref/pixfmt/yuv444p12-yuv444p10be +++ b/tests/ref/pixfmt/yuv444p12-yuv444p10be @@ -1,2 +1,2 @@ -284113a13f5c2378e87ff5e53aff23cb *tests/data/pixfmt/yuv444p12-yuv444p10be.yuv +6f9fb7022d197765457c7a39645d8a3f *tests/data/pixfmt/yuv444p12-yuv444p10be.yuv 15206400 tests/data/pixfmt/yuv444p12-yuv444p10be.yuv diff --git a/tests/ref/pixfmt/yuv444p12-yuv444p10le b/tests/ref/pixfmt/yuv444p12-yuv444p10le index 317094ed20..829a350417 100644 --- a/tests/ref/pixfmt/yuv444p12-yuv444p10le +++ b/tests/ref/pixfmt/yuv444p12-yuv444p10le @@ -1,2 +1,2 @@ -284113a13f5c2378e87ff5e53aff23cb *tests/data/pixfmt/yuv444p12-yuv444p10le.yuv +6f9fb7022d197765457c7a39645d8a3f *tests/data/pixfmt/yuv444p12-yuv444p10le.yuv 15206400 tests/data/pixfmt/yuv444p12-yuv444p10le.yuv