From patchwork Mon Mar 20 16:49:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 40730 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1933916pzb; Mon, 20 Mar 2023 09:51:54 -0700 (PDT) X-Google-Smtp-Source: AK7set+Jby3YnDwq9JMN4Vtu3qLP4p/V3RHU0wwwFHXzgGi0xRhPhPoPbxxQNivRJA4verq1HxzO X-Received: by 2002:aa7:d489:0:b0:4fd:2127:a8bc with SMTP id b9-20020aa7d489000000b004fd2127a8bcmr129100edr.29.1679331114557; Mon, 20 Mar 2023 09:51:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679331114; cv=none; d=google.com; s=arc-20160816; b=hOrLlA9m21noBLlb6NXHUVoe3014HO0lWd+QEjoBZh0r5G1nc7rJoxgEDKrKnHb7jG OGSrhAz42COaK8u/rANyfR3LK0bZX+9YYLDKqx2vlcU8GxOqg8ebTG+HSd9ADW3K4eHS 4I+c8OwEbcCYj79PaJTrSJOLCUkIRzr5QrlZGSocwlltAuwHSVwri+amJZn0dcbw4zUX 4KSoVSoqy6ZLNmNY2mB4eC6HadLBdt8YHczyLeRLSVdFF/TQQwomBbbwgDOvCwQ3DSlV 2h0KEmOCfHTWfGXNg3u21EhwMxgOcYY7F5E8hPyYAUU7A8HzOtE1WDE+p3PRHeXHHxoC Idwg== 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=tHFdvGKF1rsXC6PoAK5adi65LsCpS107o/hKkAZbHLQ=; b=hOD21o21jA65o8XRtX0gUw1S8GtrK9VFU6d7n2vjjIIx270r9VBisATgy7QjmjhfhK GzJ1cOZL9muS51bg09KVHuqjRQDYuyAYlerUoB0xDt3mv0K1FAE1CMLQsiooB2EKM8FT h6jShpXp+O7J+olU0xni5n8I9SlCrFpkLqHTeaatgryP8dB1qmiCjJ0WnxIjXECufgBD L+m2g2ju8Mnuwl7jmoBYk5FwHvDejmjfk7HtzorZmMc5jQHi9hDQMlMrMcZPIfy1gMN0 iXF8m91Rci+UYpU342utwX+IxeSh/eMt/uxsHt/X/SlJrfqu1K0idUPKJuuFm4lwD1Nh CFcw== 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=XigMbJ4o; 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 d12-20020a056402516c00b0048e82d753a3si10858793ede.227.2023.03.20.09.51.54; Mon, 20 Mar 2023 09:51:54 -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; dkim=neutral (body hash did not verify) header.i=@obe-tv.20210112.gappssmtp.com header.s=20210112 header.b=XigMbJ4o; 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 5812568C4EE; Mon, 20 Mar 2023 18:51:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04C7468C487 for ; Mon, 20 Mar 2023 18:51:35 +0200 (EET) Received: by mail-vs1-f54.google.com with SMTP id cz11so4633418vsb.6 for ; Mon, 20 Mar 2023 09:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=obe-tv.20210112.gappssmtp.com; s=20210112; t=1679331093; 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=MuAH5FtrGJPACqSyPSMtJvri5uBmlOXLQpioN+cLU20=; b=XigMbJ4ooQf9aeZcqR1idOqZu07BXpbPCYwBgOrIFVGt+qDDE9h24LStEHAiRoSGrB WXzzkz1lD4gUjK1IDq5G6Ep9wVQTPWaQPdwUB6KOJdy+81XN7Qlt1ptEAaUSI9vXujF+ qAxl4O3Pxpw4HxJWUwnNMavOg+h4e8JUVFiSuxXczICf8GsdA4DmXMDw+sa61Zz3zNkp bMZmOffPdv3T64SZZsLKaIrGXmft0eXEZdmHLuqGpIF2YKQaMnFnQkjRnjTcwMCIYX+n rGgJhOwyDnU8T8mKBn8W1cqkN/E5BfHO349Ena116rc0W/jA92/r+X2tzDmyhFdee7pB VcxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679331093; 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=MuAH5FtrGJPACqSyPSMtJvri5uBmlOXLQpioN+cLU20=; b=BeOHiA0MamDVqxtidfphl1jQi03QW6lZMyMjuV2N/WqHvjgEC8JkWm75P9UxMzPNsW +pmAe8EJuIxCb6Z26FVhJOKOHiahMdkwqfRVevQ2hleB+iSz9uGbDPA0kLiyLJI2EkZ3 cz9re0x4v4VrTiZxlZd/4XPAL3QdT2GSO6SLqi+BsIKeGqG8KGp+2Dld4XueOeePdhaP p2DHk4npTAkAAK8O2ELD/P/i9dbYM5pRWpAZ2B1cStpag+BGsYpFFKzntV3BnEmQ2oqy ec61x98ygANP1XlYUzAx/ezbJQY47KyRcZkC8ECdkxlMP/5icInP2hMA9GbYTEZZGNbG vzAw== X-Gm-Message-State: AO0yUKUpredK7KFAO6YVkviqRvmWrvhNHXV+eEyWUktnqAaRfJyObSSt oQ1pkuAmqWp4WdiG8CsPtOKgOFNJJ9GhSjeX4l8= X-Received: by 2002:a67:f4c3:0:b0:421:db47:ced0 with SMTP id s3-20020a67f4c3000000b00421db47ced0mr3363200vsn.4.1679331093308; Mon, 20 Mar 2023 09:51:33 -0700 (PDT) Received: from Dana.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id q11-20020a056102100b00b0042590870708sm1219171vsp.0.2023.03.20.09.51.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 09:51:32 -0700 (PDT) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Mar 2023 17:49:22 +0100 Message-Id: <20230320164925.299207-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320164925.299207-1-jdarnley@obe.tv> References: <20230320164925.299207-1-jdarnley@obe.tv> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] 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: A9qKQvVVvusm --- Fixed a small bug tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 ++ tests/checkasm/checkasm.h | 1 + tests/checkasm/vf_bwdif.c | 69 +++++++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 75 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..5c2e16cffc --- /dev/null +++ b/tests/checkasm/vf_bwdif.c @@ -0,0 +1,69 @@ +/* + * 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 = 0; i < count; i++) \ + buf0[i] = buf1[i] = rnd() & mask + +void checkasm_check_vf_bwdif(void) +{ + BWDIFContext ctx_8, ctx_10; + + ff_bwdif_init_filter_line(&ctx_8, 8); + ff_bwdif_init_filter_line(&ctx_10, 10); + + 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 \