From patchwork Sat Dec 16 08:13:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 45173 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp6178209pzf; Sat, 16 Dec 2023 00:13:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyUnNr+TxiPtZNjPKuFWTroWkEgmPHqO7ZmHm/6GkWkIf3lO+wubD9ktDjMIA4rrz4lp3g X-Received: by 2002:a17:907:d384:b0:a1a:541c:561b with SMTP id vh4-20020a170907d38400b00a1a541c561bmr14364302ejc.6.1702714431884; Sat, 16 Dec 2023 00:13:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702714431; cv=none; d=google.com; s=arc-20160816; b=HSKEjxpPVhrZXMe2+uNotPw0kCUdj7aO8/FhksHinlduc/YOVdITCl0+0QtEV5YK/X 8HeBj6aMVdFHaf/Tz012tZEOGYynLmbcNqB6NGN1q4SGGk9dKDK8vfbKcS7tb9Qnf547 Rz44bE1BVgReiLlyB1MTj/He7hhYMkAWn2N4olpNaRl8JsaYO8kIbxoVsiJeOuGwZ7Zw RYHq9kkjPnTSf/QK+t245BOkpBvM8sA3GsX36MA8QVObWvXc2kjjohZxR3f54kqEbhuK aP0ZJvBBPaVx5up21uCb26pRNKvqS5K9eCDR0X0tkd3jzLbB2A0Xu11dbethlSX8XCpq F25Q== 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:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=EAC0sBb9mvFijwVVpSlRRIn8Tv+cHr3rJvi/nNqTAVs=; fh=uZWItAgYCSLFS5Zum7Ip+PilGyWYOeCwun+We0BTHAs=; b=OdiZDzSDzRAgpdeM43ql8TxbCkyDFQEuLqJpJkxH8yIVKihzcHFjANFq6KJgyFREUK pbFwLpNx9UuD2dqavaHFuwaj/Tw9J2GPqepCWK1FsQ5/WEkyKYiAe/uGqEfAHaeyi/A+ CJCWzVyRVpmVglVExhM5Kjw4gp2uVS4B5O+6ADVRlIqSKoCd9jjlnUbYrT0iPLngnu1/ 9IuB/1bXG6iRgoz6jKdFpPAacYN+OH/zKLvD7zderKqadqNCex+yJE3aSbx0V+kmWLGl ep3L8VeJ02dsb04t2309E237c+iLufi5BrYSLRD59CI8x+kgq62EuGhDAdgh7B7fbcWd 4Gsg== 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 mj20-20020a170906af9400b00a1f5e366b66si8297329ejb.238.2023.12.16.00.13.51; Sat, 16 Dec 2023 00:13:51 -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; 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 6649B68CBEC; Sat, 16 Dec 2023 10:13:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout01.mail.de (shout01.mail.de [62.201.172.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A388F68D048 for ; Sat, 16 Dec 2023 10:13:24 +0200 (EET) Received: from postfix02.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout01.mail.de (Postfix) with ESMTP id 35876240BE9 for ; Sat, 16 Dec 2023 09:13:24 +0100 (CET) Received: from smtp01.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix02.mail.de (Postfix) with ESMTP id 1BE0CA00E2 for ; Sat, 16 Dec 2023 09:13:24 +0100 (CET) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp01.mail.de (Postfix) with ESMTPSA id DD04C2409F4 for ; Sat, 16 Dec 2023 09:13:23 +0100 (CET) To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Dec 2023 09:13:22 +0100 Message-Id: <20231216081322.53623-3-thilo.borgmann@mail.de> In-Reply-To: <20231216081322.53623-1-thilo.borgmann@mail.de> References: <20231216081322.53623-1-thilo.borgmann@mail.de> MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 8658 X-purgate-ID: 154282::1702714403-94FEA338-50DFA8B0/0/0 Subject: [FFmpeg-devel] [PATCH v3 2/2] fate: Add fsync filter tests 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: , X-Patchwork-Original-From: Thilo Borgmann via ffmpeg-devel From: Thilo Borgmann Reply-To: FFmpeg development discussions and patches Cc: Thilo Borgmann Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Y+Tiyu5RFhlV --- tests/Makefile | 6 +++- tests/fate/filter-video.mak | 6 ++++ tests/maps/fsync-down | 7 ++++ tests/maps/fsync-up | 57 +++++++++++++++++++++++++++++ tests/ref/fate/filter-fsync-down | 12 +++++++ tests/ref/fate/filter-fsync-up | 62 ++++++++++++++++++++++++++++++++ 6 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 tests/maps/fsync-down create mode 100644 tests/maps/fsync-up create mode 100644 tests/ref/fate/filter-fsync-down create mode 100644 tests/ref/fate/filter-fsync-up diff --git a/tests/Makefile b/tests/Makefile index 444c09b3de..c7892a9313 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -23,7 +23,7 @@ FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF) $(AREF): CMP= APITESTSDIR := tests/api -FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR) +FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/maps tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR) OUTDIRS += $(FATE_OUTDIRS) $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1 @@ -66,6 +66,10 @@ tests/data/filtergraphs/%: TAG = COPY tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs $(M)cp $< $@ +tests/data/maps/%: TAG = COPY +tests/data/maps/%: $(SRC_PATH)/tests/maps/% | tests/data/maps + $(M)cp $< $@ + RUNNING_FATE := $(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS))) # Check sanity of dependencies when running FATE tests. diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index b57ef88c9b..072169ac7e 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -395,6 +395,12 @@ FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, FPS SCALE, MOV, QTRLE) += fate-filter-f fate-filter-fps-cfr: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -fps_mode cfr -pix_fmt yuv420p fate-filter-fps: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -vf fps=30 -pix_fmt yuv420p +FATE_FILTER_SAMPLES-$(call FILTERFRAMECRC, TESTSRC2 FSYNC, FILE_PROTOCOL) += fate-filter-fsync-up fate-filter-fsync-down +fate-filter-fsync-up: tests/data/maps/fsync-up +fate-filter-fsync-up: CMD = framecrc -lavfi testsrc2=r=25:d=1,fsync=f=tests/data/maps/fsync-up +fate-filter-fsync-down: tests/data/maps/fsync-down +fate-filter-fsync-down: CMD = framecrc -lavfi testsrc2=r=25:d=1,fsync=f=tests/data/maps/fsync-down + FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE := $(addprefix fate-filter-alphaextract_alphamerge_, rgb yuv) FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, SCALE_FILTER FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += $(FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE) $(FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE): fate-filter-alphaextract_alphamerge_%: tests/data/filtergraphs/alphamerge_alphaextract_% diff --git a/tests/maps/fsync-down b/tests/maps/fsync-down new file mode 100644 index 0000000000..107761ecbe --- /dev/null +++ b/tests/maps/fsync-down @@ -0,0 +1,7 @@ +1 0 1/7 +5 1 1/7 +8 2 1/7 +12 3 1/7 +16 4 1/7 +19 5 1/7 +23 6 1/7 diff --git a/tests/maps/fsync-up b/tests/maps/fsync-up new file mode 100644 index 0000000000..c37a1fae14 --- /dev/null +++ b/tests/maps/fsync-up @@ -0,0 +1,57 @@ +0 0 1/57 +0 1 1/57 +1 2 1/57 +1 3 1/57 +1 4 1/57 +2 5 1/57 +2 6 1/57 +3 7 1/57 +3 8 1/57 +4 9 1/57 +4 10 1/57 +5 11 1/57 +5 12 1/57 +5 13 1/57 +6 14 1/57 +6 15 1/57 +7 16 1/57 +7 17 1/57 +8 18 1/57 +8 19 1/57 +8 20 1/57 +9 21 1/57 +9 22 1/57 +10 23 1/57 +10 24 1/57 +11 25 1/57 +11 26 1/57 +12 27 1/57 +12 28 1/57 +12 29 1/57 +13 30 1/57 +13 31 1/57 +14 32 1/57 +14 33 1/57 +15 34 1/57 +15 35 1/57 +16 36 1/57 +16 37 1/57 +16 38 1/57 +17 39 1/57 +17 40 1/57 +18 41 1/57 +18 42 1/57 +19 43 1/57 +19 44 1/57 +19 45 1/57 +20 46 1/57 +20 47 1/57 +21 48 1/57 +21 49 1/57 +22 50 1/57 +22 51 1/57 +23 52 1/57 +23 53 1/57 +23 54 1/57 +24 55 1/57 +24 56 1/57 diff --git a/tests/ref/fate/filter-fsync-down b/tests/ref/fate/filter-fsync-down new file mode 100644 index 0000000000..d3f04060ad --- /dev/null +++ b/tests/ref/fate/filter-fsync-down @@ -0,0 +1,12 @@ +#tb 0: 1/7 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 115200, 0x7ed43658 +0, 1, 1, 1, 115200, 0x5418f45b +0, 2, 2, 1, 115200, 0x9872fad9 +0, 3, 3, 1, 115200, 0x4dbbf2e0 +0, 4, 4, 1, 115200, 0xcce711f5 +0, 5, 5, 1, 115200, 0xaa341025 +0, 6, 6, 1, 115200, 0xb41eeaac diff --git a/tests/ref/fate/filter-fsync-up b/tests/ref/fate/filter-fsync-up new file mode 100644 index 0000000000..ea7f7efe2d --- /dev/null +++ b/tests/ref/fate/filter-fsync-up @@ -0,0 +1,62 @@ +#tb 0: 1/57 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 115200, 0xeba70ff3 +0, 1, 1, 1, 115200, 0xeba70ff3 +0, 2, 2, 1, 115200, 0x7ed43658 +0, 3, 3, 1, 115200, 0x7ed43658 +0, 4, 4, 1, 115200, 0x7ed43658 +0, 5, 5, 1, 115200, 0x8cd87e03 +0, 6, 6, 1, 115200, 0x8cd87e03 +0, 7, 7, 1, 115200, 0xbb1ca0c4 +0, 8, 8, 1, 115200, 0xbb1ca0c4 +0, 9, 9, 1, 115200, 0x5fdfd474 +0, 10, 10, 1, 115200, 0x5fdfd474 +0, 11, 11, 1, 115200, 0x5418f45b +0, 12, 12, 1, 115200, 0x5418f45b +0, 13, 13, 1, 115200, 0x5418f45b +0, 14, 14, 1, 115200, 0xb16cf929 +0, 15, 15, 1, 115200, 0xb16cf929 +0, 16, 16, 1, 115200, 0xe1f7f824 +0, 17, 17, 1, 115200, 0xe1f7f824 +0, 18, 18, 1, 115200, 0x9872fad9 +0, 19, 19, 1, 115200, 0x9872fad9 +0, 20, 20, 1, 115200, 0x9872fad9 +0, 21, 21, 1, 115200, 0x02a4f220 +0, 22, 22, 1, 115200, 0x02a4f220 +0, 23, 23, 1, 115200, 0x9ae2fcc9 +0, 24, 24, 1, 115200, 0x9ae2fcc9 +0, 25, 25, 1, 115200, 0x9b56f029 +0, 26, 26, 1, 115200, 0x9b56f029 +0, 27, 27, 1, 115200, 0x4dbbf2e0 +0, 28, 28, 1, 115200, 0x4dbbf2e0 +0, 29, 29, 1, 115200, 0x4dbbf2e0 +0, 30, 30, 1, 115200, 0x1953f828 +0, 31, 31, 1, 115200, 0x1953f828 +0, 32, 32, 1, 115200, 0xc42403b8 +0, 33, 33, 1, 115200, 0xc42403b8 +0, 34, 34, 1, 115200, 0xeb4615f6 +0, 35, 35, 1, 115200, 0xeb4615f6 +0, 36, 36, 1, 115200, 0xcce711f5 +0, 37, 37, 1, 115200, 0xcce711f5 +0, 38, 38, 1, 115200, 0xcce711f5 +0, 39, 39, 1, 115200, 0x297b12cf +0, 40, 40, 1, 115200, 0x297b12cf +0, 41, 41, 1, 115200, 0x625f10e9 +0, 42, 42, 1, 115200, 0x625f10e9 +0, 43, 43, 1, 115200, 0xaa341025 +0, 44, 44, 1, 115200, 0xaa341025 +0, 45, 45, 1, 115200, 0xaa341025 +0, 46, 46, 1, 115200, 0x139821b1 +0, 47, 47, 1, 115200, 0x139821b1 +0, 48, 48, 1, 115200, 0x1e7e09a0 +0, 49, 49, 1, 115200, 0x1e7e09a0 +0, 50, 50, 1, 115200, 0xa7d80776 +0, 51, 51, 1, 115200, 0xa7d80776 +0, 52, 52, 1, 115200, 0xb41eeaac +0, 53, 53, 1, 115200, 0xb41eeaac +0, 54, 54, 1, 115200, 0xb41eeaac +0, 55, 55, 1, 115200, 0xe00dd55d +0, 56, 56, 1, 115200, 0xe00dd55d