From patchwork Fri Mar 11 07:58:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 34666 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1474210nkb; Thu, 10 Mar 2022 23:58:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJxgC/oLT4q+APC7O1PuSX7MpTq8NhIauvU6VCHoSCCEcqM/dYIo5rosie+HH/KzyrwU2PA2 X-Received: by 2002:a17:907:a414:b0:6da:654c:aa08 with SMTP id sg20-20020a170907a41400b006da654caa08mr7627912ejc.756.1646985516678; Thu, 10 Mar 2022 23:58:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646985516; cv=none; d=google.com; s=arc-20160816; b=FYWjEP7OOM6xcRwCwZJV2UHloAGIabBSQiZwiQRsEVnNX3f/pX4SLtLJUAnkq3xUJ7 yc6oIAyJtQ1XQbOQis8lInUJPIiKvrCwgCkfBsuE4nG7qHN2W0a4EnGudCFpGeCZiiIU 8C3RrXayCOpFs3JGBp8ZHCp9bl99n3pzNRo2K6WR4TJWoBeJr77+pD/k9R3+zGuE0IrN c2aDDYZz753/nWyYY1183An8K/RZgY0Y9ZUmU3uEtBpKDJ0rXXBarlU+pmwuZ9tEqU7g jGur3bl9k+jBizraC20edEYhwEFsnOpNZMi3GIaj2t4SWPaPnwKEU6C2a22O3c7byl5x HAtQ== 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=TIp7BD+Rkjv/7Ei7yTquo96tyuTXVzblneUmePlV804=; b=uvRHmJeSC6AW5kPmEnBCDV88pHlIaTFuSm03E/fljx4IQlm5y/OUxEypZkqHgzYnkM RpOk9zhbM91mAQWcH9LrHvuFcZB18jt7C13Gks+iNQyMC6GGqeYWbGkYK3aquvuaMDYP cpemfTc7ndTSyvRJyVzX1N1L7HvOiCLgx6+cYyF/aiosvcHc4RI6Wm42VumfBff21pKq VmmGJ0rE3TJ7FOzJWhl7+SjcO7og2crPCKqan24ntoB3r1sDyqnv7IYlQThkfcVpZxMN 33dIIBw6q5xt0NMbYBnuhkFwSuwF5Dj+EUuJQApns5nvKwYFu0UoxIi/1yN9eOUxFiKf 3g8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=POB9Jyp1; 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 kw17-20020a170907771100b006d0909c454dsi1088163ejc.533.2022.03.10.23.58.36; Thu, 10 Mar 2022 23:58:36 -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=@haasn.xyz header.s=mail header.b=POB9Jyp1; 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 6AD5168B1EB; Fri, 11 Mar 2022 09:58:33 +0200 (EET) 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 029EA68B176 for ; Fri, 11 Mar 2022 09:58:26 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 138264357E; Fri, 11 Mar 2022 08:58:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1646985506; bh=gfL0uHBOUH18xA8e2C0taadL41tpkuHDoIjV63aNIsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=POB9Jyp1DMj+cm3OOS/ueffIXulzQdeEKwvnoSrhLI6RrcuLhx5vXQjcwccUV4e6K 7AqfpRnpP5jBS8x0DsUz8Vo8QpAhlYHma/0hWtiP8XSVFRWiFk+zRg/exporJ98F/A Sn4rlWfZjIOQepyX36QJFEhOsyCSAWEXS37U61cM= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 08:58:11 +0100 Message-Id: <20220311075810.13399-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] tests: add 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: uiaoeFycMtcy From: Niklas Haas Transcoding from an existing PNG file that has an embedded ICC profile. Note that this ICC profile is smaller than 64 kB, so this doesn't test the APP2 chunk re-arranging code at all. Signed-off-by: Niklas Haas --- tests/fate/image.mak | 3 +++ tests/ref/fate/jpg-icc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 tests/ref/fate/jpg-icc diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 573d398915..8b72890fbe 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -337,6 +337,9 @@ fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg - FATE_JPG += fate-jpg-jfif fate-jpg-jfif: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/20242.jpg +FATE_JPG += fate-jpg-icc +fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "" "-show_frames" + FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG) FATE_IMAGE += $(FATE_JPG-yes) fate-jpg: $(FATE_JPG-yes) diff --git a/tests/ref/fate/jpg-icc b/tests/ref/fate/jpg-icc new file mode 100644 index 0000000000..220146555e --- /dev/null +++ b/tests/ref/fate/jpg-icc @@ -0,0 +1,42 @@ +0a323df5cdfb9574e329b9831be054a6 *tests/data/fate/jpg-icc.mjpeg +11010 tests/data/fate/jpg-icc.mjpeg +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 49152, 0xaac06b42 +[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 +pkt_pos=0 +pkt_size=11010 +width=128 +height=128 +pix_fmt=yuvj444p +sample_aspect_ratio=1:1 +pict_type=I +coded_picture_number=0 +display_picture_number=0 +interlaced_frame=0 +top_field_first=0 +repeat_pict=0 +color_range=pc +color_space=bt470bg +color_primaries=unknown +color_transfer=unknown +chroma_location=center +[SIDE_DATA] +side_data_type=ICC profile +size=3144 +[/SIDE_DATA] +[/FRAME]