From patchwork Sun Aug 13 20:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 4702 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp3504399vsu; Sun, 13 Aug 2017 13:00:23 -0700 (PDT) X-Received: by 10.28.169.82 with SMTP id s79mr2692047wme.123.1502654423921; Sun, 13 Aug 2017 13:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502654423; cv=none; d=google.com; s=arc-20160816; b=AiCptR/klC87pq8tQGEdDlRbqa6F5SWS4zr6xFuhCrZ0lqXZFQGPV7l2GVyUxzYez9 X0jspr/WWf8zveB/1OST1H139ZSZRZnfEZCgNfWo7AfXC1teL8FdZbWN+yAnw9SeZXib IBvKDW0IifuvQTwgmjZRRXH52nj+OcNcV14CCYHn9TtcQOJVNjfILMCLhi9wHkJzX049 WTCXPj+GgLRHKZmwA9eS6ZiTWBIVuriH8B4QjFXfHiydE1lIvykZhEVQx2HZcPl53XhZ YsDhLuH0Fbjc1kfCjJ0WGagHI1AY6Lto/CVtkNZmW2X4ukSDTZBTGiH7n8R5wCtqPzoW cpoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=R1RTtX2cj1DeFzHkSSIdU4WL6LN8SmsGbMWA/DBvWJc=; b=YuaDbtrFpU0wX3ijiK6FJVNUNdHythtsJ0yfD1eKTIvDPA6Z/sj3NAzg2eCsJ3Q+QJ 456FVgGw2p2VeMiTFHuJGtQXlFZqdmst6SxQF6lhAf1k0oYUYHBmZ5dQK1EhmgECvXYK YiqHw0wOV+Bu6PFadDxDktYdG6DF78r8+EkD+jz8FUgJBG2pACWvmwr/hpBVOrGYwyaz UtCR4p1e/uuQlk1+1Ygrn45ra71bBcLv7DIXUds6XyPUWha8DL5GF+2v5Us1bT/s3kQa Gq9otQN61wJkT+ZmRPrYGgZvSefaRP76VNC1BxWrfHECd5c6ZE+fsnx+lexGIka4rWZe OpNg== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k18si4351897wre.315.2017.08.13.13.00.22; Sun, 13 Aug 2017 13:00:23 -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; 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 A2334689747; Sun, 13 Aug 2017 23:00:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAF8E680D3A for ; Sun, 13 Aug 2017 23:00:08 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id AB175102C5C; Sun, 13 Aug 2017 22:00:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v03acq5gYX1R; Sun, 13 Aug 2017 22:00:09 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id EE094100C0C; Sun, 13 Aug 2017 22:00:08 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Aug 2017 22:00:04 +0200 Message-Id: <20170813200004.27388-1-cus@passwd.hu> X-Mailer: git-send-email 2.13.1 Subject: [FFmpeg-devel] [PATCH] fate: add overlay filter tests with alpha 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 Cc: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- tests/fate/filter-video.mak | 19 +++++++++++++++++++ tests/ref/fate/filter-overlay_gbrap_gbrap | 6 ++++++ tests/ref/fate/filter-overlay_gbrp_gbrap | 6 ++++++ tests/ref/fate/filter-overlay_rgb_rgba | 6 ++++++ tests/ref/fate/filter-overlay_rgba_rgba | 6 ++++++ tests/ref/fate/filter-overlay_yuv420_yuva420 | 6 ++++++ tests/ref/fate/filter-overlay_yuv422_yuva422 | 6 ++++++ tests/ref/fate/filter-overlay_yuv444_yuva444 | 6 ++++++ tests/ref/fate/filter-overlay_yuva420_yuva420 | 6 ++++++ tests/ref/fate/filter-overlay_yuva422_yuva422 | 6 ++++++ tests/ref/fate/filter-overlay_yuva444_yuva444 | 6 ++++++ 11 files changed, 79 insertions(+) create mode 100644 tests/ref/fate/filter-overlay_gbrap_gbrap create mode 100644 tests/ref/fate/filter-overlay_gbrp_gbrap create mode 100644 tests/ref/fate/filter-overlay_rgb_rgba create mode 100644 tests/ref/fate/filter-overlay_rgba_rgba create mode 100644 tests/ref/fate/filter-overlay_yuv420_yuva420 create mode 100644 tests/ref/fate/filter-overlay_yuv422_yuva422 create mode 100644 tests/ref/fate/filter-overlay_yuv444_yuva444 create mode 100644 tests/ref/fate/filter-overlay_yuva420_yuva420 create mode 100644 tests/ref/fate/filter-overlay_yuva422_yuva422 create mode 100644 tests/ref/fate/filter-overlay_yuva444_yuva444 diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 53fc7a6528..37d3e25b1d 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -204,6 +204,25 @@ FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_F fate-filter-overlay_yuv444: tests/data/filtergraphs/overlay_yuv444 fate-filter-overlay_yuv444: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv444 +FATE_FILTER_OVERLAY_ALPHA += fate-filter-overlay_yuv420_yuva420 fate-filter-overlay_yuv422_yuva422 fate-filter-overlay_yuv444_yuva444 fate-filter-overlay_rgb_rgba fate-filter-overlay_gbrp_gbrap +FATE_FILTER_OVERLAY_ALPHA += fate-filter-overlay_yuva420_yuva420 fate-filter-overlay_yuva422_yuva422 fate-filter-overlay_yuva444_yuva444 fate-filter-overlay_rgba_rgba fate-filter-overlay_gbrap_gbrap +$(FATE_FILTER_OVERLAY_ALPHA): SRC = $(TARGET_SAMPLES)/png1/lena-rgba.png +$(FATE_FILTER_OVERLAY_ALPHA): CMD = framecrc -i $(SRC) -vf $(FILTER) -frames:v 1 + +fate-filter-overlay_yuv420_yuva420: FILTER = "format=yuva420p[over];color=black:128x128,format=yuv420p[main];[main][over]overlay=format=yuv420" +fate-filter-overlay_yuv422_yuva422: FILTER = "format=yuva422p[over];color=black:128x128,format=yuv422p[main];[main][over]overlay=format=yuv422" +fate-filter-overlay_yuv444_yuva444: FILTER = "format=yuva444p[over];color=black:128x128,format=yuv444p[main];[main][over]overlay=format=yuv444" +fate-filter-overlay_rgb_rgba: FILTER = "format=rgba[over];color=black:128x128,format=rgb24[main];[main][over]overlay=format=rgb" +fate-filter-overlay_gbrp_gbrap: FILTER = "format=gbrap[over];color=black:128x128,format=gbrp[main];[main][over]overlay=format=gbrp" + +fate-filter-overlay_yuva420_yuva420: FILTER = "format=yuva420p[over];color=black:128x128,format=yuva420p[main];[main][over]overlay=format=yuv420" +fate-filter-overlay_yuva422_yuva422: FILTER = "format=yuva422p[over];color=black:128x128,format=yuva422p[main];[main][over]overlay=format=yuv422" +fate-filter-overlay_yuva444_yuva444: FILTER = "format=yuva444p[over];color=black:128x128,format=yuva444p[main];[main][over]overlay=format=yuv444" +fate-filter-overlay_rgba_rgba: FILTER = "format=rgba[over];color=black:128x128,format=rgba[main];[main][over]overlay=format=rgb" +fate-filter-overlay_gbrap_gbrap: FILTER = "format=gbrap[over];color=black:128x128,format=gbrap[main];[main][over]overlay=format=gbrp" + +FATE_FILTER_SAMPLES-$(call ALLYES, PNG_DECODER APNG_DEMUXER COLOR_FILTER OVERLAY_FILTER) += $(FATE_FILTER_OVERLAY_ALPHA) + FATE_FILTER_VSYNTH-$(CONFIG_PHASE_FILTER) += fate-filter-phase fate-filter-phase: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf phase diff --git a/tests/ref/fate/filter-overlay_gbrap_gbrap b/tests/ref/fate/filter-overlay_gbrap_gbrap new file mode 100644 index 0000000000..49e14c643c --- /dev/null +++ b/tests/ref/fate/filter-overlay_gbrap_gbrap @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 65536, 0xbac99946 diff --git a/tests/ref/fate/filter-overlay_gbrp_gbrap b/tests/ref/fate/filter-overlay_gbrp_gbrap new file mode 100644 index 0000000000..204c9d0625 --- /dev/null +++ b/tests/ref/fate/filter-overlay_gbrp_gbrap @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 49152, 0xa905d586 diff --git a/tests/ref/fate/filter-overlay_rgb_rgba b/tests/ref/fate/filter-overlay_rgb_rgba new file mode 100644 index 0000000000..d7dc6980cc --- /dev/null +++ b/tests/ref/fate/filter-overlay_rgb_rgba @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 49152, 0xb0e3d586 diff --git a/tests/ref/fate/filter-overlay_rgba_rgba b/tests/ref/fate/filter-overlay_rgba_rgba new file mode 100644 index 0000000000..a1c85e69e4 --- /dev/null +++ b/tests/ref/fate/filter-overlay_rgba_rgba @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 65536, 0x33549946 diff --git a/tests/ref/fate/filter-overlay_yuv420_yuva420 b/tests/ref/fate/filter-overlay_yuv420_yuva420 new file mode 100644 index 0000000000..caa3442de2 --- /dev/null +++ b/tests/ref/fate/filter-overlay_yuv420_yuva420 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 24576, 0xedb7ef1c diff --git a/tests/ref/fate/filter-overlay_yuv422_yuva422 b/tests/ref/fate/filter-overlay_yuv422_yuva422 new file mode 100644 index 0000000000..7d21e1b84a --- /dev/null +++ b/tests/ref/fate/filter-overlay_yuv422_yuva422 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 32768, 0x2d88b114 diff --git a/tests/ref/fate/filter-overlay_yuv444_yuva444 b/tests/ref/fate/filter-overlay_yuv444_yuva444 new file mode 100644 index 0000000000..e1e5db2d7d --- /dev/null +++ b/tests/ref/fate/filter-overlay_yuv444_yuva444 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 49152, 0x92da3b63 diff --git a/tests/ref/fate/filter-overlay_yuva420_yuva420 b/tests/ref/fate/filter-overlay_yuva420_yuva420 new file mode 100644 index 0000000000..ef39176b6f --- /dev/null +++ b/tests/ref/fate/filter-overlay_yuva420_yuva420 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 40960, 0xdf75b2dc diff --git a/tests/ref/fate/filter-overlay_yuva422_yuva422 b/tests/ref/fate/filter-overlay_yuva422_yuva422 new file mode 100644 index 0000000000..e4d2e3977e --- /dev/null +++ b/tests/ref/fate/filter-overlay_yuva422_yuva422 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 49152, 0x369974d4 diff --git a/tests/ref/fate/filter-overlay_yuva444_yuva444 b/tests/ref/fate/filter-overlay_yuva444_yuva444 new file mode 100644 index 0000000000..f2d9c56437 --- /dev/null +++ b/tests/ref/fate/filter-overlay_yuva444_yuva444 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 1, 65536, 0xa279ff14