From patchwork Mon Feb 20 19:57:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 40458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2180538pzk; Mon, 20 Feb 2023 11:59:27 -0800 (PST) X-Google-Smtp-Source: AK7set/XIYomfdnqK0HstNytxQxzdvjAqZ0frRDGsfYlXiQwGw6SdsX69W5atj8XHjc2NAF/mdPt X-Received: by 2002:a17:906:dac1:b0:8b1:2b8b:a1fa with SMTP id xi1-20020a170906dac100b008b12b8ba1famr15716511ejb.47.1676923167341; Mon, 20 Feb 2023 11:59:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676923167; cv=none; d=google.com; s=arc-20160816; b=Cc2FGYhRdFaV0MhU9rAw0RzxBS1StbruUS4nXbkzezkDdJAsYZt49TyWtHbmnG8YZf UQHwym3PhZ1nw69goFq038OpU/QBuVUcZnwPQMsDX7j/Db6qu1qgcvmg3PmUtsYnwYcq BeED/8gLX5rHSTkKwTc+cvhGUlkidIYUSbtiK/0DW1zsidqxoa5LlJUquLlv4U6wCyWT Jx7tbUEDESCNP7yROjWozzy19ow+Xm86+g84EuoHdqTR150j5rLnqW5E04pl/nhvjt5a vqsy2vhSkzL14+Hsvqy40ZuyKYv+lzTmrN7UACtOwN3ccrnVFGTRfRR62C3oixbJkyUo QcNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:dkim-signature:delivered-to; bh=K5aJAy0Vd9E4EaIkClKxBbsyWOO5xgakIFOWcal0KvI=; b=sC65XAARU4gpJufw4rDAy1HuQoNhUEjRVOWpbsEyqgqxQNycsbgJXdczeJi++J8z3N m7LASsd92FZUopf7owEsws5l8YMlDqojPugNQAnonwM09nE6h81l/nggJsH+unlLeF4c qiqL9xFfDfNa239HRH+HCmunnFGI8YKTP5DR8JoE1r8hD0urtxFoJn1WdncLvtDCYA8v g6bAsm+oEvOMwrTlYmHCgzUuygkopqHbKZsXvyNzTpZD2d9xasEpqflIIFp6SJ9B8iKz 1FsjxuvG3X5FGNAX4Ns2Qfp9DdTcuZlGNYu/Vk2HOhw2XyyBpaKSqZ0U/uUW2Z/zrOtz h5Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@obe-tv.20210112.gappssmtp.com header.s=20210112 header.b=EHikvV3+; 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 fp14-20020a1709069e0e00b008c3aa86be5csi7975704ejc.585.2023.02.20.11.59.27; Mon, 20 Feb 2023 11:59:27 -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=@obe-tv.20210112.gappssmtp.com header.s=20210112 header.b=EHikvV3+; 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 91DB868C0B2; Mon, 20 Feb 2023 21:59:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D8D768C0A3 for ; Mon, 20 Feb 2023 21:59:09 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id r7so2160199wrz.6 for ; Mon, 20 Feb 2023 11:59:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=obe-tv.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EQnmojmRyuk2GEkpfvN/8ldMrlQUqqCAD7TcslGf8dw=; b=EHikvV3+IXNoC+vMpvf8ZF0MirD8B+Hc5JptTnViLs8GcCSdNmbByWfYn/pdyZTA24 NX2DimvhGoToZ1NYj4Z7UEqFhZy2+6nVcierdcpu2boSS8pCsoSPT4dO8Kj7TJ5cz8G3 CMIOvIPIVS3FAcvUDWG3o6wRQdEyUo9nQr71mRO2ToRvpuksJZmUdpAF3vhzu/vY9nFA C6WEb4ZwP+r6ww6POIIx4a3Jccej6c+/IB89c4txUiCoMa5Pem3ULtv8sBXE1nm+PjPU 4WJsg4KTYzBVQBCCSB1SULnCq6JDRG98l0GkPy2pdrsBKEpVCjxwFZrUY13kPtmBYPH+ dGqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EQnmojmRyuk2GEkpfvN/8ldMrlQUqqCAD7TcslGf8dw=; b=KmpWeo+GyH+FRCTmbv8uwA8kEiW7P92kOoWCPhLpmsPm5rx56aOnX2MAGI2bTImkrU 0DIjeSLqDsAm0RNa1SjXdes7wIBIsJG7UIKstJiOZO7UJjjslHc/8wWMpTKOxq4/VBF3 dJws42qbe3oqj9vbNO35iEmpRXGr1JtosxMvfAd/hp8yovoPp05m+4hR+wzYBgPuQ19d XsS+RDJoKWUvKHlvH0QlCQgnzZkku5b+Vj1KWAcHRqqHsoZaIraSbGTLQ95KVcorCg7n v8Yv4oJIZ+aVcXw/cxTKYgLaUOuMsYaA9ff67nNwqDEHcMU12snU8j+8OrCY6cqo/t6u MxOA== X-Gm-Message-State: AO0yUKUniSdKRGdqw90e5209hoKB2raum7ORHz4zhjMBv3WexNiYjZ2v l7zvkjwrzKbP/glSN4eMcsdppEv++/0nASVgB5bogA== X-Received: by 2002:adf:f3c2:0:b0:2c6:e8f9:b661 with SMTP id g2-20020adff3c2000000b002c6e8f9b661mr1117889wrp.52.1676923148731; Mon, 20 Feb 2023 11:59:08 -0800 (PST) Received: from Dana.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id k9-20020a5d6289000000b002c56af32e8csm1391787wru.35.2023.02.20.11.59.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 11:59:08 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Feb 2023 20:57:02 +0100 Message-Id: <20230220195703.1297421-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230220195703.1297421-1-jdarnley@obe.tv> References: <20230220195703.1297421-1-jdarnley@obe.tv> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] checkasm: add test for bwdif 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: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TG3h+P5DK8rC --- tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 ++ tests/checkasm/checkasm.h | 1 + tests/checkasm/vf_bwdif.c | 70 +++++++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 76 insertions(+) create mode 100644 tests/checkasm/vf_bwdif.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index a6f06c7007..b6a43f181f 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -40,6 +40,7 @@ CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes) # libavfilter tests AVFILTEROBJS-$(CONFIG_AFIR_FILTER) += af_afir.o AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o +AVFILTEROBJS-$(CONFIG_BWDIF_FILTER) += vf_bwdif.o AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o AVFILTEROBJS-$(CONFIG_EQ_FILTER) += vf_eq.o AVFILTEROBJS-$(CONFIG_GBLUR_FILTER) += vf_gblur.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index e96d84a7da..5e729cf0e0 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -179,6 +179,9 @@ static const struct { #if CONFIG_BLEND_FILTER { "vf_blend", checkasm_check_blend }, #endif + #if CONFIG_BWDIF_FILTER + { "vf_bwdif", checkasm_check_vf_bwdif }, + #endif #if CONFIG_COLORSPACE_FILTER { "vf_colorspace", checkasm_check_colorspace }, #endif diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 8744a81218..e9e73c6fa0 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -82,6 +82,7 @@ void checkasm_check_utvideodsp(void); void checkasm_check_v210dec(void); void checkasm_check_v210enc(void); void checkasm_check_vc1dsp(void); +void checkasm_check_vf_bwdif(void); void checkasm_check_vf_eq(void); void checkasm_check_vf_gblur(void); void checkasm_check_vf_hflip(void); diff --git a/tests/checkasm/vf_bwdif.c b/tests/checkasm/vf_bwdif.c new file mode 100644 index 0000000000..e27f9b7494 --- /dev/null +++ b/tests/checkasm/vf_bwdif.c @@ -0,0 +1,70 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include "checkasm.h" +#include "libavcodec/internal.h" +#include "libavfilter/bwdif.h" + +#define WIDTH 256 + +#define randomize_buffers(buf0, buf1, mask, count) \ + for (size_t i; i < count; i++) \ + buf0[i] = buf1[i] = rnd() & mask + +void checkasm_check_vf_bwdif(void) +{ + BWDIFContext ctx_8, ctx_10, ctx_16; + + ff_bwdif_init_filter_line(&ctx_8, 8); + ff_bwdif_init_filter_line(&ctx_10, 10); + ff_bwdif_init_filter_line(&ctx_16, 16); + + if (check_func(ctx_8.filter_line, "bwdif8")) { + uint8_t prev0[9*WIDTH], prev1[9*WIDTH]; + uint8_t next0[9*WIDTH], next1[9*WIDTH]; + uint8_t cur0[9*WIDTH], cur1[9*WIDTH]; + uint8_t dst0[WIDTH], dst1[WIDTH]; + + declare_func(void, void *dst, void *prev, void *cur, void *next, + int w, int prefs, int mrefs, int prefs2, int mrefs2, + int prefs3, int mrefs3, int prefs4, int mrefs4, + int parity, int clip_max); + + randomize_buffers(prev0, prev1, 0xff, 9*WIDTH); + randomize_buffers(next0, next1, 0xff, 9*WIDTH); + randomize_buffers(cur0, cur1, 0xff, 9*WIDTH); + + call_ref(dst0, prev0 + 4*WIDTH, cur0 + 4*WIDTH, next0 + 4*WIDTH, WIDTH, + WIDTH, -WIDTH, 2*WIDTH, -2*WIDTH, 3*WIDTH, -3*WIDTH, 4*WIDTH, -4*WIDTH, + 0, 0xff); + call_new(dst1, prev1 + 4*WIDTH, cur1 + 4*WIDTH, next1 + 4*WIDTH, WIDTH, + WIDTH, -WIDTH, 2*WIDTH, -2*WIDTH, 3*WIDTH, -3*WIDTH, 4*WIDTH, -4*WIDTH, + 0, 0xff); + + if (memcmp(dst0, dst1, WIDTH) + || memcmp(prev0, prev1, sizeof prev0) + || memcmp(next0, next1, sizeof next0) + || memcmp(cur0, cur1, sizeof cur0)) + fail(); + bench_new(dst1, prev1 + 4*WIDTH, cur1 + 4*WIDTH, next1 + 4*WIDTH, WIDTH, + WIDTH, -WIDTH, 2*WIDTH, -2*WIDTH, 3*WIDTH, -3*WIDTH, 4*WIDTH, -4*WIDTH, + 0, 0xff); + } + report("bwdif8"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index a4e95541f5..6a7d4a1226 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -37,6 +37,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-v210enc \ fate-checkasm-vc1dsp \ fate-checkasm-vf_blend \ + fate-checkasm-vf_bwdif \ fate-checkasm-vf_colorspace \ fate-checkasm-vf_eq \ fate-checkasm-vf_gblur \