From patchwork Thu Nov 24 20:43:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Vignali X-Patchwork-Id: 1552 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp390361vsb; Thu, 24 Nov 2016 12:43:48 -0800 (PST) X-Received: by 10.194.179.135 with SMTP id dg7mr3885315wjc.219.1480020228689; Thu, 24 Nov 2016 12:43:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c5si38716962wjx.186.2016.11.24.12.43.48; Thu, 24 Nov 2016 12:43:48 -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=@gmail.com; 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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5095F689747; Thu, 24 Nov 2016 22:43:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f52.google.com (mail-oi0-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20B6A680A97 for ; Thu, 24 Nov 2016 22:43:36 +0200 (EET) Received: by mail-oi0-f52.google.com with SMTP id w63so61922020oiw.0 for ; Thu, 24 Nov 2016 12:43:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to; bh=gmq/3yJZFaRelOh7XvdVWtFrgmPLIrmKsPFO+7OshEI=; b=fi4ZJwAkHxemcYn07DcbNjECjo6/uwqyjfDsVBi4RtRDQ46XmHy59oA7B1ae6DJfBG hkZ3ijGv6cg41HmMG+Kszbd5pI8Sywt0HWwFyjrr79E+de1J75XdwOSOvZ3ATX1Dydp7 VM1J9ays5//jttjc8xcQPf2J3qxr7igpH3+B3CfnniV8gHPx7EWrJaUNqg6k62ebzc0g O4INWlHvR9sN4itWiO4om1HsrAUAOJ2f0h4J6XP3MQX0bCUhwA/nnF/TwcFTVdQ+eRzV t/xMEZFm72Oon3pQFSro+kQ0m5hry7Zd0iCRf0WplHw5zDwS1NIz+pLE7bg5Vr+Y1c4Z vJvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=gmq/3yJZFaRelOh7XvdVWtFrgmPLIrmKsPFO+7OshEI=; b=NxHUZsv35sX0iF4yiSAfhC8rvOo8C/Elu9GltMeDyV/8txPJKJv/VrkrlgktM+inPT lbCOXMX+qZHmkHUlBOHOE3aCfXSpHzXDpjS86p7sunKtYny7tJWr2a0QTLKUXDMILRwp 4YqiAeFS2HLZ/BmtnMkCUGaistNJDm4uxtMJX+qhyOdas+su+oTUX2LWT3FIAqcyU6Iz JwjHYTtMm0NkhUjJ4EP5w2jWpGSr3mo4eeQrGy+O1t7P3IuPRMfNjGV4jEjnqI0Tbigx bbdVyULm7hClyAl3axGtUVufqqLh0VDAzjRM7h4pwPV4M3A9zlUpaKZUXgKmI7v37Xq8 dBPg== X-Gm-Message-State: AKaTC02nc0Lbp+t9M14Bjo3wgezuJSBFK/ixpn9DC3CHyDyJO8UjLZI+Q+YjHy+wwNBQkErFwe90F8MQv3K+7Q== X-Received: by 10.157.46.101 with SMTP id c34mr2523640otd.35.1480020218931; Thu, 24 Nov 2016 12:43:38 -0800 (PST) MIME-Version: 1.0 Received: by 10.202.196.141 with HTTP; Thu, 24 Nov 2016 12:43:38 -0800 (PST) From: Martin Vignali Date: Thu, 24 Nov 2016 21:43:38 +0100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] fate/psd : add test for psd decoder 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" Hello, In attach patch to add fate test for the psd decoder Sample can be found here : https://we.tl/KvRaABCsdY test uncompress file in all currently support colorspace test rle decompression, and odd and even dimensions. Theses samples need to be put inside ./fate-suite/psd (the folder doesn't exist) fate test can be run with make fate-psd SAMPLES=fate-suite/ Martin From 8e1e7679a89e2fc0e3155cfce98911f6012fdb85 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Thu, 24 Nov 2016 21:30:51 +0100 Subject: [PATCH 3/3] fate/psd : add tests for uncompress and rle samples --- tests/fate/image.mak | 25 +++++++++++++++++++++++++ tests/ref/fate/psd-gray16 | 6 ++++++ tests/ref/fate/psd-gray8 | 6 ++++++ tests/ref/fate/psd-lena-127x127-rgb24 | 6 ++++++ tests/ref/fate/psd-lena-rgb-rle-127x127-16b | 6 ++++++ tests/ref/fate/psd-lena-rgb-rle-127x127-8b | 6 ++++++ tests/ref/fate/psd-lena-rgba-rle-128x128-8b | 6 ++++++ tests/ref/fate/psd-rgb24 | 6 ++++++ tests/ref/fate/psd-rgb48 | 6 ++++++ tests/ref/fate/psd-rgba | 6 ++++++ tests/ref/fate/psd-rgba64 | 6 ++++++ tests/ref/fate/psd-ya16 | 6 ++++++ tests/ref/fate/psd-ya8 | 6 ++++++ 13 files changed, 97 insertions(+) create mode 100644 tests/ref/fate/psd-gray16 create mode 100644 tests/ref/fate/psd-gray8 create mode 100644 tests/ref/fate/psd-lena-127x127-rgb24 create mode 100644 tests/ref/fate/psd-lena-rgb-rle-127x127-16b create mode 100644 tests/ref/fate/psd-lena-rgb-rle-127x127-8b create mode 100644 tests/ref/fate/psd-lena-rgba-rle-128x128-8b create mode 100644 tests/ref/fate/psd-rgb24 create mode 100644 tests/ref/fate/psd-rgb48 create mode 100644 tests/ref/fate/psd-rgba create mode 100644 tests/ref/fate/psd-rgba64 create mode 100644 tests/ref/fate/psd-ya16 create mode 100644 tests/ref/fate/psd-ya8 diff --git a/tests/fate/image.mak b/tests/fate/image.mak index c19312a..4d09828 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -286,6 +286,31 @@ fate-png: $(FATE_PNG-yes) FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 +define FATE_IMGSUITE_PSD +FATE_PSD += fate-psd-$(1) +fate-psd-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-$(1).psd -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24 +endef + +PSD_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 ya8 ya16 +$(foreach CLSP,$(PSD_COLORSPACES),$(eval $(call FATE_IMGSUITE_PSD,$(CLSP)))) + +FATE_PSD += fate-psd-lena-127x127-rgb24 +fate-psd-lena-127x127-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-127x127_rgb24.psd + +FATE_PSD += fate-psd-lena-rgb-rle-127x127-16b +fate-psd-lena-rgb-rle-127x127-16b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgb_rle_127x127_16b.psd + +FATE_PSD += fate-psd-lena-rgb-rle-127x127-8b +fate-psd-lena-rgb-rle-127x127-8b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgb_rle_127x127_8b.psd + +FATE_PSD += fate-psd-lena-rgba-rle-128x128-8b +fate-psd-lena-rgba-rle-128x128-8b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgba_rle_128x128_8b.psd + +FATE_PSD-$(call DEMDEC, IMAGE2, PSD) += $(FATE_PSD) + +FATE_IMAGE += $(FATE_PSD-yes) +fate-psd: $(FATE_PSD-yes) + define FATE_IMGSUITE_SGI FATE_SGI += fate-sgi-$(1) fate-sgi-$(1)-rle fate-sgi-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/sgi/libav_$(1).sgi -sws_flags +accurate_rnd+bitexact diff --git a/tests/ref/fate/psd-gray16 b/tests/ref/fate/psd-gray16 new file mode 100644 index 0000000..668af66 --- /dev/null +++ b/tests/ref/fate/psd-gray16 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 49152, 0xce3477d3 diff --git a/tests/ref/fate/psd-gray8 b/tests/ref/fate/psd-gray8 new file mode 100644 index 0000000..1d8dc49 --- /dev/null +++ b/tests/ref/fate/psd-gray8 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 49152, 0x55121b03 diff --git a/tests/ref/fate/psd-lena-127x127-rgb24 b/tests/ref/fate/psd-lena-127x127-rgb24 new file mode 100644 index 0000000..2644f40 --- /dev/null +++ b/tests/ref/fate/psd-lena-127x127-rgb24 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 127x127 +#sar 0: 0/1 +0, 0, 0, 1, 48387, 0xd7b6bec4 diff --git a/tests/ref/fate/psd-lena-rgb-rle-127x127-16b b/tests/ref/fate/psd-lena-rgb-rle-127x127-16b new file mode 100644 index 0000000..c065939 --- /dev/null +++ b/tests/ref/fate/psd-lena-rgb-rle-127x127-16b @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 127x127 +#sar 0: 0/1 +0, 0, 0, 1, 96774, 0xaab6cc1d diff --git a/tests/ref/fate/psd-lena-rgb-rle-127x127-8b b/tests/ref/fate/psd-lena-rgb-rle-127x127-8b new file mode 100644 index 0000000..ac3b4a9 --- /dev/null +++ b/tests/ref/fate/psd-lena-rgb-rle-127x127-8b @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 127x127 +#sar 0: 0/1 +0, 0, 0, 1, 48387, 0x35b27b60 diff --git a/tests/ref/fate/psd-lena-rgba-rle-128x128-8b b/tests/ref/fate/psd-lena-rgba-rle-128x128-8b new file mode 100644 index 0000000..f3a11b7 --- /dev/null +++ b/tests/ref/fate/psd-lena-rgba-rle-128x128-8b @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 65536, 0xaaacdff3 diff --git a/tests/ref/fate/psd-rgb24 b/tests/ref/fate/psd-rgb24 new file mode 100644 index 0000000..7f8f550 --- /dev/null +++ b/tests/ref/fate/psd-rgb24 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 49152, 0xe0013dee diff --git a/tests/ref/fate/psd-rgb48 b/tests/ref/fate/psd-rgb48 new file mode 100644 index 0000000..f60cbab --- /dev/null +++ b/tests/ref/fate/psd-rgb48 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 49152, 0x0bc6503a diff --git a/tests/ref/fate/psd-rgba b/tests/ref/fate/psd-rgba new file mode 100644 index 0000000..6728980 --- /dev/null +++ b/tests/ref/fate/psd-rgba @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 49152, 0xb2563b4a diff --git a/tests/ref/fate/psd-rgba64 b/tests/ref/fate/psd-rgba64 new file mode 100644 index 0000000..e516867 --- /dev/null +++ b/tests/ref/fate/psd-rgba64 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 49152, 0xb847fd73 diff --git a/tests/ref/fate/psd-ya16 b/tests/ref/fate/psd-ya16 new file mode 100644 index 0000000..96582eb --- /dev/null +++ b/tests/ref/fate/psd-ya16 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 49152, 0xe8f08af3 diff --git a/tests/ref/fate/psd-ya8 b/tests/ref/fate/psd-ya8 new file mode 100644 index 0000000..9a59fbf --- /dev/null +++ b/tests/ref/fate/psd-ya8 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 49152, 0xfa0ee1d0 -- 1.9.3 (Apple Git-50)