From patchwork Fri Apr 2 14:40:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 26710 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DCE9F44AA9A for ; Fri, 2 Apr 2021 17:40:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4FA368A5AC; Fri, 2 Apr 2021 17:40:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2A96689BDC for ; Fri, 2 Apr 2021 17:40:43 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id CC35724042A for ; Fri, 2 Apr 2021 16:40:41 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id v6LAiWSF8b6e for ; Fri, 2 Apr 2021 16:40:39 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:68fd:4bee:f4:c149]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 401F2240477 for ; Fri, 2 Apr 2021 16:40:39 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id B30ED3A060A; Fri, 2 Apr 2021 16:40:37 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Apr 2021 16:40:31 +0200 Message-Id: <20210402144033.17410-5-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210402144033.17410-1-anton@khirnov.net> References: <20210402144033.17410-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] tests/fate: add tests for PNG side/meta data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- tests/fate/image.mak | 8 ++++++ tests/ref/fate/png-frame-metadata | 4 +++ tests/ref/fate/png-side-data | 46 +++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 tests/ref/fate/png-frame-metadata create mode 100644 tests/ref/fate/png-side-data diff --git a/tests/fate/image.mak b/tests/fate/image.mak index eca8d5ab2c..226e190262 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -358,6 +358,14 @@ $(foreach CLSP,$(PNG_COLORSPACES),$(eval $(call FATE_IMGSUITE_PNG,$(CLSP)))) FATE_PNG += fate-png-int-rgb24 fate-png-int-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png -sws_flags +accurate_rnd+bitexact +FATE_PNG += fate-png-frame-metadata +fate-png-frame-metadata: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries frame_tags \ + -i $(TARGET_SAMPLES)/filter/pixelart0.png + +FATE_PNG += fate-png-side-data +fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ + -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png + FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) FATE_IMAGE += $(FATE_PNG-yes) fate-png: $(FATE_PNG-yes) diff --git a/tests/ref/fate/png-frame-metadata b/tests/ref/fate/png-frame-metadata new file mode 100644 index 0000000000..7c6d1916eb --- /dev/null +++ b/tests/ref/fate/png-frame-metadata @@ -0,0 +1,4 @@ +[FRAME] +TAG:gamma=45455/100000 +TAG:Software=GLDPNG ver 3.4 +[/FRAME] diff --git a/tests/ref/fate/png-side-data b/tests/ref/fate/png-side-data new file mode 100644 index 0000000000..c3d1030f96 --- /dev/null +++ b/tests/ref/fate/png-side-data @@ -0,0 +1,46 @@ +[FRAME] +media_type=video +stream_index=0 +key_frame=1 +pkt_pts=0 +pkt_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 +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=unknown +color_transfer=unknown +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]