From patchwork Fri Oct 13 14:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44247 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b15:b0:15d:8365:d4b8 with SMTP id fp21csp1039831pzb; Fri, 13 Oct 2023 07:28:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9KPNiJbahyjLgy/WBQrcS6pf6Lz8V1YuDHAE+zAqd0igj2L7gSq/0AdsYpillIl9ETDKl X-Received: by 2002:a17:907:ea2:b0:9ad:f60c:7287 with SMTP id ho34-20020a1709070ea200b009adf60c7287mr205609ejc.28.1697207321589; Fri, 13 Oct 2023 07:28:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697207321; cv=none; d=google.com; s=arc-20160816; b=PFlNlV4ztOziNA5zMggpUxwPswSqIUVZLzVaN5eVjvo03uxAug9yZ6Ik2JtZQ4juLX yVwV9L28puunSos9vB1bKvfZJzDY6bP47TNFHjOQIPlNv5K9qpBMId7CS6pP4HprJ1v4 QLG0tXaI6c9t8u3uPeTsUux6/Og1PvbUbdOwva/k92kE7FbYedcXF8M5g0mfl4lS4Oh3 g29cU84IBNlcyP4eHyWeN7MXCWg/XCP/W9zAvZGmOLARKRMaA3kH/Wk55dErQacb4+E/ T9gubO1kMlbrCxy2IdEVjFcZR/GD4x12r1Jnv6F1Wiq6Zbg9mU6kcNGM9XJV8FQqoviQ I8Dw== 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=RLYGSumGdIyYVq0NNvRoI9GiIIBBAZ0WEnrssSUgAWA=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=AhLU+ezvklHYP6GfXCJb1trxSqf+c51bp5LOt0xSiBomoNy2GsMlGXDInvB1UvkgDQ MgN5pw2hZYxWOBa/wdA5mDpVfOr3OA78nQ7CDRdZ6t2kHla9mefSNbsMGZYWHXYrcbMC F9gGMn2Pr9FOBB9ByC9bO0HK6r5pqqj34KWY9tvh93UngQW4iHD0ZQx176ZmrzDI+5zy tXRYgz9NPYJhX+S3v6jujZWfdGZPPLjYkNW1w1M/0o83kauGqZSvTGwQrOHXxHduAyCA 8wDN7xu6BoGl1pD8Jumo2Q99mpuLlQ212dQvkuRGHqKYrNl34j/UsGB7kJaWi3NDzvR4 qP/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=sKp099BO; 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 fy22-20020a170906b7d600b009ae3f7f47c2si8786198ejb.890.2023.10.13.07.28.41; Fri, 13 Oct 2023 07:28:41 -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=sKp099BO; 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 4702868C9FE; Fri, 13 Oct 2023 17:27:26 +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 9C13368C9BC for ; Fri, 13 Oct 2023 17:27:15 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 806334BC30; Fri, 13 Oct 2023 16:27:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1697207232; bh=NUNnxsKp0Olrp9c8zNIbpxn0tNFQVm0eNm7Oj/Fka8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sKp099BOJqZw/iJK43WXvUf746i4elXGt8Wz7UgZ9hQtL4Z61WCeo9aJSyHYncasv eNlPCrg+FjnZ6z4f9MIjdzvS/JBPw9vLbVYIj3OIBVKssB27T5XEM9E3RD7B7X0y5N uDbP5OlWUHRw0aZgpkTbLf0m9Z1NKpYEpdVheH3M= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Oct 2023 16:24:46 +0200 Message-ID: <20231013142706.23971-9-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231013142706.23971-1-ffmpeg@haasn.xyz> References: <20231013142706.23971-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 08/13] tests/fate: allow conversion filters in jpg-icc test 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: VM7KFrbk+qLB From: Niklas Haas This requires conversion from full to limited range JPEG, as mjpeg only accepts limited range (without extra strictness options). The old solution to this problem was to manually insert -vf scale, but this does not work in the absencee of YUVJ as vf_scale cannot (yet) negotiate the required colorspace range. The simple solution is to enable auto-conversion filters, which allows fftools to insert the correct conversion filter. --- tests/fate/image.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 400199c28a..22c809be36 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -358,7 +358,7 @@ FATE_JPG += fate-jpg-rgb-5 fate-jpg-rgb-5: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/jpg-8930-5.jpg FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIPE_DEMUXER PNG_DECODER SCALE_FILTER) += fate-jpg-icc -fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "-show_frames" +fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-auto_conversion_filters" "" "-show_frames" FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG) FATE_IMAGE_FRAMECRC += $(FATE_JPG-yes)