From patchwork Thu Jul 28 14:50:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 37022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp326534pzb; Thu, 28 Jul 2022 07:50:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v7mxVHnJ0TyLCeV1LTOerni2sV7mkYaGpLnXQXOTWJtqSSLnJtnju7BVmpR6T4Ig619Qvs X-Received: by 2002:a05:6402:c47:b0:437:ce2d:c30d with SMTP id cs7-20020a0564020c4700b00437ce2dc30dmr27667543edb.395.1659019853035; Thu, 28 Jul 2022 07:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659019853; cv=none; d=google.com; s=arc-20160816; b=XwR8JwvdlX+Z+3e40zRZnRewL0L9N7in/cObgrFIxa4rFVzD+4tFmV+6Mj7LfYXBrO sNNXtaNgmLqgdnuvj+ONHBG9r3Zj4hCFlsIaRhfLWI5DVqGNMJl6XeSFc6RCW6uL0x56 Nqv9GkLujmmGd0CIrFf6rGmc5vL3N5agjOndYXukOR1A23UtzTdfGPx/SlqwaeHxj3tl 0wS6/1Sw5U3MRp7bdrOkIaHSFee3IHVc07iWQezK8pY2vZlmstjt7YKj3JvzHxIOtpRm +I3CIJGTmHJA7ytS8YbabfJqNBAamE8cxGfrw3fC4/jW4Gz9BTJBFRc2vg+ff2/UuzZx Bzfw== 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=2hEzOM8jQEdWOmCPa46KXYDuemArAXbHTEyhcetMPM4=; b=tqqoKZKSaMzbLcvHbdfdf6op3rUcAplYGkTZP5bLZsi2sO6iOP53LGB941lWeKPmjo 9wjl1fOljuRD9bK8Fovmuy2IJwavEC3vjpwNsXlKqUtVpesZt/lETtufyjbplRAymTCi qxveuYrl7cqJ17Hlm1y0n+vizaiE0P//tKs58ssk8MB3kT58ucpl2l8xB8+t6ZdmPT3D 3vjFB3SwuiNrxGlPhUjmeFDcHlUvy7Nk5azofacN11adf+fo9Eku+IBBFxoInGGeVGTF SZKBWGH8q11ZvzeTKyE386q330KgDyh2vwinRXXPQLsvcaG2Bs1v+9dIdgkKaLPFsmce YnuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=gt+IP5Oa; 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 n4-20020a17090695c400b0072f72e5c0b8si686565ejy.836.2022.07.28.07.50.52; Thu, 28 Jul 2022 07:50:53 -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=gt+IP5Oa; 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 A25F668B9AA; Thu, 28 Jul 2022 17:50:17 +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 226C768B99A for ; Thu, 28 Jul 2022 17:50:12 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id AF9234AAFB; Thu, 28 Jul 2022 16:50:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1659019807; bh=fDPY8qfcQSoK1Mtjmcso2wzyAEb3w84mnEYITtgwr0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gt+IP5OaHM5T6v3KRYhTWLROek5jCMZmTLXZ2ianISCWrOHUwW7Khl/dIuYgK3kvA LTW3DkgUtxh0S7PtkgxTJmi/TFp54pTWC6sKByIHCehGkq1q8psjaRGsUORng93lZe 7wuKe8nHSdYegvTfAQgCkwlrLo7p6ZoSiV7+JeHc= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jul 2022 16:50:02 +0200 Message-Id: <20220728145002.102600-8-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728145002.102600-1-ffmpeg@haasn.xyz> References: <20220728145002.102600-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 7/7] fate/png: add test for ICC profile parsing 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: SkihrO8/kDeZ From: Niklas Haas This tests the new "-flags2 icc_profiles" option by making sure the embedded ICC profile gets correctly detected as sRGB. Signed-off-by: Niklas Haas --- tests/fate/image.mak | 4 +++ tests/ref/fate/png-icc-parse | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 tests/ref/fate/png-icc-parse diff --git a/tests/fate/image.mak b/tests/fate/image.mak index fca4eaf60a..03e794dc48 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -392,6 +392,10 @@ fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ FATE_PNG_TRANSCODE-$(call TRANSCODE, PNG, IMAGE2 IMAGE_PNG_PIPE) += fate-png-icc fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png" "" "-show_frames" +FATE_PNG_PROBE-$(call ALLYES, LCMS2) += fate-png-icc-parse +fate-png-icc-parse: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ + -flags2 icc_profiles $(TARGET_SAMPLES)/png1/lena-int_rgb24.png + FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE) FATE_IMAGE_FRAMECRC += $(FATE_PNG-yes) diff --git a/tests/ref/fate/png-icc-parse b/tests/ref/fate/png-icc-parse new file mode 100644 index 0000000000..18bb18a804 --- /dev/null +++ b/tests/ref/fate/png-icc-parse @@ -0,0 +1,48 @@ +[FRAME] +media_type=video +stream_index=0 +key_frame=1 +pts=0 +pts_time=0.000000 +pkt_dts=0 +pkt_dts_time=0.000000 +best_effort_timestamp=0 +best_effort_timestamp_time=0.000000 +pkt_duration=1 +pkt_duration_time=0.040000 +duration=1 +duration_time=0.040000 +pkt_pos=0 +pkt_size=40194 +width=128 +height=128 +pix_fmt=rgb24 +sample_aspect_ratio=1:1 +pict_type=I +coded_picture_number=0 +display_picture_number=0 +interlaced_frame=1 +top_field_first=0 +repeat_pict=0 +color_range=pc +color_space=unknown +color_primaries=bt709 +color_transfer=iec61966-2-1 +chroma_location=unspecified +[SIDE_DATA] +side_data_type=ICC profile +name=Photoshop ICC profile +size=3144 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=63999/100000 +red_y=33001/100000 +green_x=30000/100000 +green_y=60000/100000 +blue_x=15000/100000 +blue_y=5999/100000 +white_point_x=31269/100000 +white_point_y=32899/100000 +[/SIDE_DATA] +[/FRAME]