From patchwork Fri Feb 10 13:06:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 40346 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1355166pzk; Fri, 10 Feb 2023 05:09:39 -0800 (PST) X-Google-Smtp-Source: AK7set9OKaWF55lPdTNTPffOiOv33gThBe19DKZmJ+CWwwLWbkS1+UIVAj8ntDX7EbdNDBEAVE2c X-Received: by 2002:a50:c351:0:b0:4ab:15db:cfde with SMTP id q17-20020a50c351000000b004ab15dbcfdemr9382475edb.9.1676034579226; Fri, 10 Feb 2023 05:09:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676034579; cv=none; d=google.com; s=arc-20160816; b=HfX2DqyXKjN3EuJAEDxWBto5c69FQAmpBtGC4sRytZqPkmJaBLyPWIQK8B2ah/Bz2z RohDt/LV64QTLjLZESI98V/pmfVtUpCLhN+/TMV7I3Blp6cR+jxfixGyxryUbRW3sEqp X/4FaCXg/dDuOKf5TZWdbmjL0hhqUch4CjKreh1zmBXUDDqKu6DxBpYfABlmX2+qWnlU SjBggt0q6Mthop8N/Jy4FuD05dAUHsLtRr+1r4FY4yTEqAscrzLK9p9pgNdGZW+Kv86c 2P02MCLmCmv5IUOB13mi3WdQFxZpu0MS5P/HCpPwpbso20hzV7KS32eV8rRh9nMCufQ4 cNjA== 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=cPWIVkIRwkCJCqvoy3dEu0+WohVec2Kje1Vvtcz7ugI=; b=ARuo3p8QzfDumMYS5+Rosf+LnSO5fyqwI59yEYNikLROYkTUPgF0RNeS9ppQrPR6a4 T0f+ucyyyyM8DNyD2qZriHmZwDH3HBXDX5p+BMc50eptUXXnKxke3ViMnaq5EmpMVw/a gURHaKopHKDNgCfJ4ym0xkrPMU+p/HLYbiAZDWHTKqaGEuKc91qBNobqVZ91Yt7HvvVQ DLjScIxywRc+V5wzffEpH+ARYr9zz3pQvgO0uT1cjHm/BtbTu5TRp7TD4n5P5h1CD5M0 InXrl5vScq1c7YkY4TKgQeHVOyJGOsy7X5m+mnyZSjCEoXKDFRkurLK2X5oqqBSs4ocM PRHw== 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=qmao7SRz; 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 s5-20020aa7c545000000b004aa9e813d67si5479349edr.611.2023.02.10.05.09.38; Fri, 10 Feb 2023 05:09:39 -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=qmao7SRz; 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 E013E68BE4E; Fri, 10 Feb 2023 15:09:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E42668BDB9 for ; Fri, 10 Feb 2023 15:09:17 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id c1so900629edt.4 for ; Fri, 10 Feb 2023 05:09:17 -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=A3yxFMYLRuVLIWnmi5M+GIzBpAQ8ACRvNH3UF/+dsXQ=; b=qmao7SRzoZlOlac8aBeNtvfrpDPpRXcy9izpWJ9UTH4yyXFFb7hIPy9zDy6sa+Wdq6 DQ0z1WigkskSbqMgVMC5D1MH5cn44Rd0HcyHLllU/vqbxvCnKcJnRvA/DJDimGmcYWvc G+cPrsZutLM+cmM5CWIdxdlhFXOksnRbFo7dvg4FNFkNi6wbwXwLYdxDJdsLsVCRh1mF GzPn+4iTSL33lAFiXo8xxqFhd23UUKXos0Svet4D25hAnaIuHKfbuAiJLGE125cSQP6n aEZe8qiyxu55THZFtM8OChC37T7aGIW4B+5Dk5NNVMDwAwuLON6SQdq8Qr+wywRw+aDA oKlQ== 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=A3yxFMYLRuVLIWnmi5M+GIzBpAQ8ACRvNH3UF/+dsXQ=; b=h2azruSs7IQ5YcP3d9EDfQ5QjUBF5FdE9bAc4sfAXh1YsLcfy4nv3r33yuRsGSxxAr PwF6JlshtkXDrS5XzNtIbgkH9Wlv8YHKNs7RdRU53h0dCPI2JeksVNgRmo8u6WY6l7T2 tQVtmMG141PIwiePK+vSVmTW6nN2/ZagGtHFH9nhcsAUEq1Se0vqXvxaA2PmVGN4KqCV vHoe4TGTinwTF137QcD+i4R7/oeU3MDKunda0wu5hd7C2CbnbRMtaDHfjnpCqWBiP8rF J/0i0ZftjyMeut64QL0KDHbKS1K1UmXJ4GMpbfOeczUBHZORjOoNixj8Dp8sqlRdyvzR Ntyw== X-Gm-Message-State: AO0yUKVRSYh5UyPuaRl8hiame6w7N5xp0tNskH07j/iFSoAES3nVV3yO 3pxEZDQIasnmYDHYPqGFKJQ3UQYhn6AF1RO15SeFiQ== X-Received: by 2002:a50:ce55:0:b0:4ab:1992:dd8f with SMTP id k21-20020a50ce55000000b004ab1992dd8fmr6777391edj.5.1676034556563; Fri, 10 Feb 2023 05:09:16 -0800 (PST) Received: from Dana.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id x13-20020a50d60d000000b004aab23dec5csm2204059edi.4.2023.02.10.05.09.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 05:09:16 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Feb 2023 14:06:56 +0100 Message-Id: <20230210130657.455866-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230210130657.455866-1-jdarnley@obe.tv> References: <20230210130657.455866-1-jdarnley@obe.tv> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] checkasm: add test for yadif 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: oHIdLCv1qsVH --- tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 ++ tests/checkasm/checkasm.h | 1 + tests/checkasm/vf_yadif.c | 62 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 tests/checkasm/vf_yadif.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index a6f06c7007..fc65bdc77d 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -47,6 +47,7 @@ AVFILTEROBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o AVFILTEROBJS-$(CONFIG_THRESHOLD_FILTER) += vf_threshold.o AVFILTEROBJS-$(CONFIG_NLMEANS_FILTER) += vf_nlmeans.o AVFILTEROBJS-$(CONFIG_SOBEL_FILTER) += vf_convolution.o +AVFILTEROBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index e96d84a7da..2bb72cf839 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -200,6 +200,9 @@ static const struct { #if CONFIG_SOBEL_FILTER { "vf_sobel", checkasm_check_vf_sobel }, #endif + #if CONFIG_YADIF_FILTER + { "vf_yadif", checkasm_check_vf_yadif }, + #endif #endif #if CONFIG_SWSCALE { "sw_gbrp", checkasm_check_sw_gbrp }, diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 8744a81218..0b9a83b5b5 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -87,6 +87,7 @@ void checkasm_check_vf_gblur(void); void checkasm_check_vf_hflip(void); void checkasm_check_vf_threshold(void); void checkasm_check_vf_sobel(void); +void checkasm_check_vf_yadif(void); void checkasm_check_vp8dsp(void); void checkasm_check_vp9dsp(void); void checkasm_check_videodsp(void); diff --git a/tests/checkasm/vf_yadif.c b/tests/checkasm/vf_yadif.c new file mode 100644 index 0000000000..cb58519c23 --- /dev/null +++ b/tests/checkasm/vf_yadif.c @@ -0,0 +1,62 @@ +/* + * 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/yadif.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_yadif(void) +{ + YADIFContext ctx_8, ctx_10, ctx_16; + + ff_yadif_init_filter_line(&ctx_8, 8); + ff_yadif_init_filter_line(&ctx_10, 10); + ff_yadif_init_filter_line(&ctx_16, 16); + + if (check_func(ctx_8.filter_line, "yadif8")) { + uint8_t prev0[5*WIDTH + STRIDE_ALIGN], prev1[5*WIDTH + STRIDE_ALIGN]; + uint8_t next0[5*WIDTH + STRIDE_ALIGN], next1[5*WIDTH + STRIDE_ALIGN]; + uint8_t cur0[5*WIDTH + STRIDE_ALIGN], cur1[5*WIDTH + STRIDE_ALIGN]; + uint8_t dst0[WIDTH + STRIDE_ALIGN], dst1[WIDTH + STRIDE_ALIGN]; + + declare_func(void, void *dst, void *prev, void *cur, void *next, + int w, int prefs, int mrefs, int parity, int mode); + + randomize_buffers(prev0, prev1, 0xff, 5*WIDTH + STRIDE_ALIGN); + randomize_buffers(next0, next1, 0xff, 5*WIDTH + STRIDE_ALIGN); + randomize_buffers(cur0, cur1, 0xff, 5*WIDTH + STRIDE_ALIGN); + + call_ref(dst0, prev0, cur0, next0, WIDTH, WIDTH, WIDTH, 0, 1); + call_new(dst1, prev1, cur1, next1, WIDTH, WIDTH, WIDTH, 0, 1); + + 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, cur1, next1, WIDTH, WIDTH, WIDTH, 0, 1); + } + report("yadif8"); +}