From patchwork Thu Jul 20 16:58:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_Gro=C3=9Fe?= X-Patchwork-Id: 4391 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2383163vsb; Thu, 20 Jul 2017 09:59:06 -0700 (PDT) X-Received: by 10.28.194.138 with SMTP id s132mr2771003wmf.29.1500569946218; Thu, 20 Jul 2017 09:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500569946; cv=none; d=google.com; s=arc-20160816; b=uuEzPIXR/f+4yggNHKZ7mTFdaAeJMmaaxGO4bjMxPrKEpG5IUWd8ccxISKy3UsXqb4 h7MwQ3kVc5Pb3SMTyF1sgGfVZSXTvqqo/pchGGwNFPtiYa+c6258PHwNJQ7JNASZaX24 pvvnaDLYyJHacNfPIquoCXao2f9QSwlK8FkBJkGS5CtT5xgYUaiUzV0USgtctDOLM6YR 7PbubjMFFn8sKxOZHdzVKmnP93IALLW61PCRMcAbkdRQxGY0Unrwp8QYwTX1FMZOA1FR NVgKuLpIubivAxxC9+tk7FfdfiKuArut3xK/uPcq48TVPIkbQ8EVnsaOljVAPePfgirK Mhww== 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:delivered-to:arc-authentication-results; bh=qhUFBXP2COIQniML+dc9pmPFBGmig+T61el0IcbWQJE=; b=Z1qeBwzbF2maKS8TN/3OGMPi7vlj+S1xzgsdSQZg5O5JMDOUo8LRcOrFxFDKDzgE5G 7Yjx59ssUvH7VGQ7uIvW4or1DOzKpz3sWppc2bOcQdfWxDIXakrm2bxxn3Bo+bi8oFX0 dRjxtzZ41DfukXv2vn4FkiBKxAG+a9kgAPZaDptPL9IdTyYzxBpU4I2bh0w0HyY+pPsT 4IidPp5S42SyVfsDzTB4klsaXuCfluZhEo8cUlgRg7HAv1he4iC9h3FP8DrMe1LYhsUi e2CX8ki+BxKso49lkDWgcSWDFEX8K/EQx+s4CMS79oe8N1BFUItoOIq1psN8RJC8n6Ou UGmg== 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 s105si2511718wrc.511.2017.07.20.09.59.05; Thu, 20 Jul 2017 09:59:06 -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 429B8689A33; Thu, 20 Jul 2017 19:58:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from james.theweblords.de (james.theweblords.de [217.11.55.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BE74689953 for ; Thu, 20 Jul 2017 19:58:49 +0300 (EEST) Received: (qmail 5963 invoked by uid 210); 20 Jul 2017 16:58:57 -0000 X-Qmail-Scanner-Diagnostics: from wl-r3-89.rz.tu-ilmenau.de (petronios@theweblords.de@wl-r3-89.rz.tu-ilmenau.de) by james (envelope-from , uid 201) with qmail-scanner-2.10st (mhr: 1.0. spamassassin: 3.4.1. perlscan: 2.10st. Clear:RC:1(141.24.16.89):. Processed in 0.04348 secs); 20 Jul 2017 16:58:57 -0000 Received: from wl-r3-89.rz.tu-ilmenau.de (HELO montepegro.fem.tu-ilmenau.de) (petronios@theweblords.de@141.24.16.89) by james.theweblords.de with ESMTPA; 20 Jul 2017 16:58:57 -0000 From: =?UTF-8?q?Peter=20Gro=C3=9Fe?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2017 18:58:51 +0200 Message-Id: <20170720165851.29794-1-pegro@friiks.de> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170720154203.GA3798847@phare.normalesup.org> References: <20170720154203.GA3798847@phare.normalesup.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] fate: add vf_overlay test for main source with alpha channel 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: =?UTF-8?q?Peter=20Gro=C3=9Fe?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Peter Große --- This depends on patch "lavfi/testsrc2: fix completely transparent alpha." The test fails without the patch "avfilter/vf_overlay: fix alpha blending when main source has an alpha channel". tests/fate/filter-video.mak | 4 ++++ tests/filtergraphs/overlay_main_alpha | 4 ++++ tests/ref/fate/filter-overlay_main-alpha | 30 ++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 tests/filtergraphs/overlay_main_alpha create mode 100644 tests/ref/fate/filter-overlay_main-alpha diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 53fc7a6528..ee2e7aff50 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -379,6 +379,10 @@ fate-filter-concat: CMD = framecrc -filter_complex_script $(TARGET_PATH)/tests/d FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER FPS_FILTER MPDECIMATE_FILTER) += fate-filter-mpdecimate fate-filter-mpdecimate: CMD = framecrc -lavfi testsrc2=r=2:d=10,fps=3,mpdecimate -r 3 -pix_fmt yuv420p +FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER, OVERLAY_FILTER) += fate-filter-overlay_main-alpha +fate-filter-overlay_main-alpha: tests/data/filtergraphs/overlay_main_alpha +fate-filter-overlay_main-alpha: CMD = framecrc -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_main_alpha + FATE_FILTER_SAMPLES-$(call ALLYES, MOV_DEMUXER FPS_FILTER QTRLE_DECODER) += fate-filter-fps-cfr fate-filter-fps fate-filter-fps-r fate-filter-fps-cfr: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vsync cfr -pix_fmt yuv420p fate-filter-fps-r: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vf fps -pix_fmt yuv420p diff --git a/tests/filtergraphs/overlay_main_alpha b/tests/filtergraphs/overlay_main_alpha new file mode 100644 index 0000000000..95cc1d4c61 --- /dev/null +++ b/tests/filtergraphs/overlay_main_alpha @@ -0,0 +1,4 @@ +sws_flags=+accurate_rnd+bitexact; +testsrc2=d=1:s=1024x768:alpha=255[a]; +testsrc2=d=1:alpha=128[b]; +[a][b]overlay=x=100:y=50 \ No newline at end of file diff --git a/tests/ref/fate/filter-overlay_main-alpha b/tests/ref/fate/filter-overlay_main-alpha new file mode 100644 index 0000000000..071c7435ae --- /dev/null +++ b/tests/ref/fate/filter-overlay_main-alpha @@ -0,0 +1,30 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1024x768 +#sar 0: 1/1 +0, 0, 0, 1, 1966080, 0xbb0752de +0, 1, 1, 1, 1966080, 0x2eaa3ef1 +0, 2, 2, 1, 1966080, 0x6159c6b2 +0, 3, 3, 1, 1966080, 0x03403179 +0, 4, 4, 1, 1966080, 0x905a86ce +0, 5, 5, 1, 1966080, 0x5c95b051 +0, 6, 6, 1, 1966080, 0xd0989f23 +0, 7, 7, 1, 1966080, 0x2f345dc0 +0, 8, 8, 1, 1966080, 0x2d854f97 +0, 9, 9, 1, 1966080, 0xc589e999 +0, 10, 10, 1, 1966080, 0x8c2d7938 +0, 11, 11, 1, 1966080, 0x457b26ad +0, 12, 12, 1, 1966080, 0x5ee36f1e +0, 13, 13, 1, 1966080, 0x2947c30c +0, 14, 14, 1, 1966080, 0x5a031a29 +0, 15, 15, 1, 1966080, 0xc278a4d0 +0, 16, 16, 1, 1966080, 0x849a0f9d +0, 17, 17, 1, 1966080, 0xaea83654 +0, 18, 18, 1, 1966080, 0xd3054386 +0, 19, 19, 1, 1966080, 0x1fae5492 +0, 20, 20, 1, 1966080, 0xc8b95b6b +0, 21, 21, 1, 1966080, 0x8634fdf9 +0, 22, 22, 1, 1966080, 0x3627c5cb +0, 23, 23, 1, 1966080, 0x8c1c5b90 +0, 24, 24, 1, 1966080, 0x2c54109d