From patchwork Wed Jul 19 17:32:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4370 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1085185vsb; Wed, 19 Jul 2017 10:33:37 -0700 (PDT) X-Received: by 10.223.160.174 with SMTP id m43mr4643911wrm.194.1500485617476; Wed, 19 Jul 2017 10:33:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500485617; cv=none; d=google.com; s=arc-20160816; b=avGSAGF2VvyMgYpyOV0VTEp7JPnvZeAFWoDQpN4/Yohk3wNWh1wtFqfTDxJh+fO/ta QJnDIJTnSFlfqKdNokpl8GLEGNFQJAMVndk8ATf51AdRsx7WUIze8xFOG45wR40V1zf5 OY6h0NjoEmfedY5VCyDZcXLv5cCuvoU5N8KuaiMefnMPlm/Odj+wjdhTDbDGzyNJVssv 9/52HOHF9/KYKBHmASDZBhz0gI3KzbgLOx69oQoNULCGOvpQ73Xty8xO2A41lCs4gSGa Ejye33qmQOGNTl9a2KiVPI8P4eb/OwwD4+NfQejYXayG0gpDHQT7k+QJ54UNZg7/duxR Icog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to:arc-authentication-results; bh=p9KRvmrmqraLIbwR6a759kDys96ECYaDX22yrtCzVVs=; b=lVD6sjQNs2tGtG3UcGpfBACPCrw3GauxdD3armVeRmfsLVaLXvwlfQslPwj2tI15/J 2MwqSqYOVXNf9Ib7BrrF1EOBiHu0UuvamDHDXFdJKwcpIW/2v7nw/0qUvCGDp/+qoLJA dBkdOuDJm5B6W68FxMuvIZwK1uxkVxFTh7a0QuyFGA10Qrczn07YFycfLF63MXT32fsC TftQ+jKqamCzCMQIqRFRkbQhvY3b1bN+ewCCJl6CacodY0J7m3NDDfMws75eH9BWSyHu cR4Fg2oN3vHHmVDsr3dggnFZ4bgD2RudpuQjCQUQr+Z/qWspjvHQaULcNbmSaJDpd3+G 5yDQ== 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 88si4441494wrj.35.2017.07.19.10.33.35; Wed, 19 Jul 2017 10:33:37 -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 63CA0689ACC; Wed, 19 Jul 2017 20:33:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03669689A48 for ; Wed, 19 Jul 2017 20:33:19 +0300 (EEST) Received: from mfilter25-d.gandi.net (mfilter25-d.gandi.net [217.70.178.153]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 88A1941C08F for ; Wed, 19 Jul 2017 19:33:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter25-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter25-d.gandi.net (mfilter25-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 4PmGIHJm_I6Q for ; Wed, 19 Jul 2017 19:33:25 +0200 (CEST) X-Originating-IP: 213.47.41.20 Received: from localhost (213-47-41-20.cable.dynamic.surfer.at [213.47.41.20]) (Authenticated sender: michael@niedermayer.cc) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id D5BEA41C091 for ; Wed, 19 Jul 2017 19:33:24 +0200 (CEST) Date: Wed, 19 Jul 2017 19:32:45 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20170719173245.GC3740@nb4> References: <20170718113350.GX3740@nb4> <20170718150352.19128-1-pegro@friiks.de> MIME-Version: 1.0 In-Reply-To: <20170718150352.19128-1-pegro@friiks.de> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Tue, Jul 18, 2017 at 05:03:52PM +0200, Peter Große wrote: > Signed-off-by: Peter Große > --- > tests/fate/filter-video.mak | 5 +++++ > tests/ref/fate/filter-overlay-main-alpha | 15 +++++++++++++++ > 2 files changed, 20 insertions(+) > 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 9186593c10..cbfee449b6 100644 > --- a/tests/fate/filter-video.mak > +++ b/tests/fate/filter-video.mak > @@ -341,6 +341,11 @@ FATE_FILTER_SAMPLES-$(call ALLYES, MATROSKA_DEMUXER OVERLAY_FILTER H264_DECODER > fate-filter-overlay-dvdsub-2397: tests/data/filtergraphs/overlay-dvdsub-2397 > fate-filter-overlay-dvdsub-2397: CMD = framecrc -flags bitexact -i $(TARGET_SAMPLES)/filter/242_4.mkv -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay-dvdsub-2397 -c:a copy > > +FATE_FILTER_SAMPLES-$(call ALLYES, MXF_DEMUXER OVERLAY_FILTER DNXHD_DECODER PNG_DECODER) += fate-filter-overlay-main-alpha > +fate-filter-overlay-main-alpha: SRC = $(TARGET_SAMPLES)/mxf/track_01_v02.mxf > +fate-filter-overlay-main-alpha: OVERLAY = $(TARGET_SAMPLES)/png1/lena-rgba.png > +fate-filter-overlay-main-alpha: CMD = framecrc -flags bitexact -i $(SRC) -filter_complex "movie='$(OVERLAY)'[logo];[v:0][logo]overlay" -an > + > FATE_FILTER_HQX-$(call ALLYES, IMAGE2_DEMUXER PNG_DECODER HQX_FILTER) = fate-filter-hq2x fate-filter-hq3x fate-filter-hq4x > FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_HQX-yes) > fate-filter-hq2x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf hqx=2 -pix_fmt bgra > diff --git a/tests/ref/fate/filter-overlay-main-alpha b/tests/ref/fate/filter-overlay-main-alpha > new file mode 100644 > index 0000000000..5e5cdfd0d2 > --- /dev/null > +++ b/tests/ref/fate/filter-overlay-main-alpha > @@ -0,0 +1,15 @@ > +#tb 0: 1001/24000 > +#media_type 0: video > +#codec_id 0: rawvideo > +#dimensions 0: 1280x720 > +#sar 0: 1/1 > +0, 0, 0, 1, 2304000, 0x72b48234 > +0, 1, 1, 1, 2304000, 0x72b48234 > +0, 2, 2, 1, 2304000, 0x72b48234 > +0, 3, 3, 1, 2304000, 0x72b48234 > +0, 4, 4, 1, 2304000, 0x72b48234 > +0, 5, 5, 1, 2304000, 0x72b48234 > +0, 6, 6, 1, 2304000, 0x72b48234 > +0, 7, 7, 1, 2304000, 0x72b48234 > +0, 8, 8, 1, 2304000, 0x72b48234 > +0, 9, 9, 1, 2304000, 0x72b48234 this seems not to pass, neither with nor without the other patch [...] --- ./tests/ref/fate/filter-overlay-main-alpha 2017-07-19 19:31:05.178270723 +0200 +++ tests/data/fate/filter-overlay-main-alpha 2017-07-19 19:31:33.174271056 +0200 @@ -3,13 +3,13 @@ #codec_id 0: rawvideo #dimensions 0: 1280x720 #sar 0: 1/1 -0, 0, 0, 1, 2304000, 0x72b48234 -0, 1, 1, 1, 2304000, 0x72b48234 -0, 2, 2, 1, 2304000, 0x72b48234 -0, 3, 3, 1, 2304000, 0x72b48234 -0, 4, 4, 1, 2304000, 0x72b48234 -0, 5, 5, 1, 2304000, 0x72b48234 -0, 6, 6, 1, 2304000, 0x72b48234 -0, 7, 7, 1, 2304000, 0x72b48234 -0, 8, 8, 1, 2304000, 0x72b48234 -0, 9, 9, 1, 2304000, 0x72b48234 +0, 0, 0, 1, 2304000, 0xac94c6e0 +0, 1, 1, 1, 2304000, 0xac94c6e0 +0, 2, 2, 1, 2304000, 0xac94c6e0 +0, 3, 3, 1, 2304000, 0xac94c6e0 +0, 4, 4, 1, 2304000, 0xac94c6e0 +0, 5, 5, 1, 2304000, 0xac94c6e0 +0, 6, 6, 1, 2304000, 0xac94c6e0 +0, 7, 7, 1, 2304000, 0xac94c6e0 +0, 8, 8, 1, 2304000, 0xac94c6e0 +0, 9, 9, 1, 2304000, 0xac94c6e0 Test filter-overlay-main-alpha failed. Look at tests/data/fate/filter-overlay-main-alpha.err for details. make: *** [fate-filter-overlay-main-alpha] Error 1 --- ./tests/ref/fate/filter-overlay-main-alpha 2017-07-19 19:31:05.178270723 +0200 +++ tests/data/fate/filter-overlay-main-alpha 2017-07-19 19:32:34.762271791 +0200 @@ -3,13 +3,13 @@ #codec_id 0: rawvideo #dimensions 0: 1280x720 #sar 0: 1/1 -0, 0, 0, 1, 2304000, 0x72b48234 -0, 1, 1, 1, 2304000, 0x72b48234 -0, 2, 2, 1, 2304000, 0x72b48234 -0, 3, 3, 1, 2304000, 0x72b48234 -0, 4, 4, 1, 2304000, 0x72b48234 -0, 5, 5, 1, 2304000, 0x72b48234 -0, 6, 6, 1, 2304000, 0x72b48234 -0, 7, 7, 1, 2304000, 0x72b48234 -0, 8, 8, 1, 2304000, 0x72b48234 -0, 9, 9, 1, 2304000, 0x72b48234 +0, 0, 0, 1, 2304000, 0x49ef8134 +0, 1, 1, 1, 2304000, 0x49ef8134 +0, 2, 2, 1, 2304000, 0x49ef8134 +0, 3, 3, 1, 2304000, 0x49ef8134 +0, 4, 4, 1, 2304000, 0x49ef8134 +0, 5, 5, 1, 2304000, 0x49ef8134 +0, 6, 6, 1, 2304000, 0x49ef8134 +0, 7, 7, 1, 2304000, 0x49ef8134 +0, 8, 8, 1, 2304000, 0x49ef8134 +0, 9, 9, 1, 2304000, 0x49ef8134