From patchwork Thu Jul 4 11:52:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50328 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp3664132vqv; Thu, 4 Jul 2024 05:04:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW05cTCEVfzTedhVijRtTfosep6za7qdPsjbbfop6jHfv5Fr2ZmLCFaYhU7IFmWvq1D8UNSrivOyXXsVA/LO+VsVAHEdceNN/JAgQ== X-Google-Smtp-Source: AGHT+IHhcQ2YGYRM3H+dX9iuYcPR4PXvwPq3t2yWsVE6CVXQbx2mmk1y8CUT6ksCvXlHbOJqIskQ X-Received: by 2002:a50:eb4c:0:b0:58c:7b28:f1c7 with SMTP id 4fb4d7f45d1cf-58e5b7a42cemr925054a12.38.1720094646255; Thu, 04 Jul 2024 05:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720094646; cv=none; d=google.com; s=arc-20160816; b=CaF2uP5ingKIb9lU4MGLHnvdumzod8wZBWuKIYZEUEMs3wqPh28310Hdsaw1PVqZ2a qoKOiOk3/nXw8KFYq8iSa4a1i/cIRXvqHLR0YmCDYcy3q0Cgvk+GlQdIMM507yATX8mo vIMNR1KAlzvqKJlD+nb7J/88X7KH7eSgs9qnnbP9sWgiR9UWYQw5i9LKl2+I9gdtnwkr hWM3lGBnTLXfcjOb2G0VMJK+A8xMkZGTJZqVRi5TgOeZfqebFpMUtUEiupHoRBAD+Vz6 a+tdwTrrvb6km56FkgNn+MWJ2nJK/cxDK2gp9nm4gszy9WBM+yU35t+L8rVMlP4oSLOz 2MBw== 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=Ay9rV7Kkv1lLyi2AvqdIyXe7wj1QoE70pdDojtGgLnw=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=pjkfhJwj60+taK3AOLDySOwy6K+WMg4NcSN+Sy31i98HAFwmeknvxreOjRAyxR3P10 wiuV/C0mYEvdDAQPC9G8s2vf/Y3kYw7J8NaduxB8E7d0DObSdmbyTWII9oNmyuwtNDRB zru6c3Rkq1uqibrKTbbukU/8lrd2aCTvqcb6KLC1jdCTyXZDg+z94gE8sJ/CzeQSyYKT sIPEIEJBka+gTf6duKZ05GeTDrAVjBE8LPB44YtGuncSM8KHfvBZzBNCSA6l8e0RABE6 DOUrFbs3rEnm0x3008USPl7aKX9I32WLOAq8SBmwRABS6GsnRjHkdJJZxO6eKrlX+ePt r2EQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=MsmuVWvQ; 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 4fb4d7f45d1cf-58b7fa229f8si2852585a12.123.2024.07.04.05.04.05; Thu, 04 Jul 2024 05:04:06 -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=@haasn.xyz header.s=mail header.b=MsmuVWvQ; 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 2156168DA1E; Thu, 4 Jul 2024 14:54:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 432FB68DA14 for ; Thu, 4 Jul 2024 14:53:56 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1720094031; bh=G8WTONKekV0epJ37oE1b2mJ08sFe7lI7Hu6EiAbNwNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MsmuVWvQTb/69dgULDPAlVGl0wFVWtxioAD0N1iRqs0l6FJ37ZP29ZODdVnUGkNcD jC8hHebPLsUCwwZKjEsbnUPMRl8IO+3YTzwptBmiEDgwEDwl+79Hl5AttM+kLSbXN8 uD6wcEM9ov8IooNhaIRF4cGwRaHJtFqIu04KT7w4= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id EC002408E3; Thu, 4 Jul 2024 13:53:50 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jul 2024 13:52:02 +0200 Message-ID: <20240704115202.1235954-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240704115202.1235954-1-ffmpeg@haasn.xyz> References: <20240704115202.1235954-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] fate/scalechroma: switch to standard chroma location 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FJWgYAWZRHtB From: Niklas Haas Replace the manually specified chroma location by one using standard notation, arbitrarily "bottomleft" as it is a less common path. Required if we want to phase out the use of manual chroma locations. --- tests/fate/filter-video.mak | 2 +- tests/ref/fate/filter-scalechroma | 50 +++++++++++++++---------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 7f8dc3aa27..cffd67b1f8 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -433,7 +433,7 @@ fate-filter-scale2ref_keep_aspect: CMD = framemd5 -frames:v 5 -/filter_complex $ FATE_FILTER_VSYNTH-$(call FILTERDEMDEC, SCALE, RAWVIDEO, RAWVIDEO) += fate-filter-scalechroma fate-filter-scalechroma: tests/data/vsynth1.yuv -fate-filter-scalechroma: CMD = framecrc -flags bitexact -s 352x288 -pix_fmt yuv444p -i $(TARGET_PATH)/tests/data/vsynth1.yuv -pix_fmt yuv420p -sws_flags +bitexact -vf scale=out_v_chr_pos=33:out_h_chr_pos=151 +fate-filter-scalechroma: CMD = framecrc -flags bitexact -s 352x288 -pix_fmt yuv444p -i $(TARGET_PATH)/tests/data/vsynth1.yuv -pix_fmt yuv420p -sws_flags +bitexact -vf scale=out_chroma_loc=bottomleft FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip fate-filter-vflip: CMD = video_filter "vflip" diff --git a/tests/ref/fate/filter-scalechroma b/tests/ref/fate/filter-scalechroma index 842769c2d5..dbe08600ab 100644 --- a/tests/ref/fate/filter-scalechroma +++ b/tests/ref/fate/filter-scalechroma @@ -3,28 +3,28 @@ #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 1, 152064, 0xdcab783a -0, 1, 1, 1, 152064, 0x79c7f1f6 -0, 2, 2, 1, 152064, 0x3b810afb -0, 3, 3, 1, 152064, 0x892aca1d -0, 4, 4, 1, 152064, 0x52fdd093 -0, 5, 5, 1, 152064, 0xaa643426 -0, 6, 6, 1, 152064, 0x9ad020ed -0, 7, 7, 1, 152064, 0x5c179057 -0, 8, 8, 1, 152064, 0xa56bf155 -0, 9, 9, 1, 152064, 0x61dcffca -0, 10, 10, 1, 152064, 0x0d51a1d3 -0, 11, 11, 1, 152064, 0x652f9e8d -0, 12, 12, 1, 152064, 0xdc0bb4d8 -0, 13, 13, 1, 152064, 0x561437cf -0, 14, 14, 1, 152064, 0x69ef8e4f -0, 15, 15, 1, 152064, 0xe7244350 -0, 16, 16, 1, 152064, 0xe65651cf -0, 17, 17, 1, 152064, 0xfc9ff646 -0, 18, 18, 1, 152064, 0x6ae10bc4 -0, 19, 19, 1, 152064, 0xd3d1898a -0, 20, 20, 1, 152064, 0xf3f8b139 -0, 21, 21, 1, 152064, 0x68c129be -0, 22, 22, 1, 152064, 0xc3922593 -0, 23, 23, 1, 152064, 0x2b14d96e -0, 24, 24, 1, 152064, 0xab119489 +0, 0, 0, 1, 152064, 0x77bb80f8 +0, 1, 1, 1, 152064, 0x3a21f6e8 +0, 2, 2, 1, 152064, 0xcc0907b0 +0, 3, 3, 1, 152064, 0xaa5cd87b +0, 4, 4, 1, 152064, 0x410bd74d +0, 5, 5, 1, 152064, 0x7a763b14 +0, 6, 6, 1, 152064, 0x3e4020d4 +0, 7, 7, 1, 152064, 0x46be8b5d +0, 8, 8, 1, 152064, 0x8021f16c +0, 9, 9, 1, 152064, 0x82ca033d +0, 10, 10, 1, 152064, 0xa76ca6ca +0, 11, 11, 1, 152064, 0x49019bb7 +0, 12, 12, 1, 152064, 0x3590adf5 +0, 13, 13, 1, 152064, 0xf21235dc +0, 14, 14, 1, 152064, 0x6b5f93a9 +0, 15, 15, 1, 152064, 0x4b8c5137 +0, 16, 16, 1, 152064, 0x698b67cc +0, 17, 17, 1, 152064, 0x3cebef62 +0, 18, 18, 1, 152064, 0x77770da1 +0, 19, 19, 1, 152064, 0xecdd84d4 +0, 20, 20, 1, 152064, 0x873fbc32 +0, 21, 21, 1, 152064, 0x55043c82 +0, 22, 22, 1, 152064, 0xee2b3669 +0, 23, 23, 1, 152064, 0xa64ae990 +0, 24, 24, 1, 152064, 0xb3499e12