From patchwork Fri Feb 10 13:06:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 40345 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1355060pzk; Fri, 10 Feb 2023 05:09:30 -0800 (PST) X-Google-Smtp-Source: AK7set+DTwfV1k/VevaZ98qVGCfwFhCkLAr/2X45xfLD+lnMyaQIfUe0ntDwz04NHqHI7YVukTVQ X-Received: by 2002:a50:f68c:0:b0:4ab:2521:7b8e with SMTP id d12-20020a50f68c000000b004ab25217b8emr4662772edn.23.1676034570569; Fri, 10 Feb 2023 05:09:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676034570; cv=none; d=google.com; s=arc-20160816; b=xvovMELwqvi18QaFGFfMaAMmYyt6fzqr4xdJ6SNfK4IoscN07rO1CR+vKG8RkHSRuh S7fzg3nxKp5JIX01c+bsy3EP4EwbTIi9eyy7i2MsU8Sem0aGY9W5m1zOKvi4My2x4MhD XHRUP4ZREjH2V13ENzuTmLNqmkTTxUEhZ/81qfCdN8zvxTeYWEJChndNTkGevQaTaVMq K93Jw29hp6ea1PnNYUIAFV9kuD6KixOqEZ3i4yo2HLX+KjImr3boq6mP1a0CkRu8zyhD Nb04re2N+rBwosYinXWljT3mTKKEGqoIggyHEAAO+SS2Z4dZ9unYNne9dHnFSaOTDdIE ZqDQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=lzAd56k5AUc5b3kVORS1rWImR25qonyttG9C48A/Y5M=; b=LjERKDWgnXclKJ6LY74AEpKRmm7pvZVv0/Zfv1OK0Tw0RKtL0QpFwy/tVxjXdyxSmD ziWzfUOBdhvC9uhYlsuP92ol1tUPFv03gCxpbTH62DH9lvYJWiZAL+/+I8RkYomS0hyd rqxgVgph2h0fzBwnS7R2NdLWePxJKs75YmgXT1M0mV/PiahIcSJHiZar2lBxPuvf9fxY 1ZuNbElaytSc+Dd5CtpotAhmA826SoYv7lbUMISf9HNWqjLV4IJP9ZMED//6ZgJMl8zS XzPCaahRLXfz1RIpvWRQYIOxzBKzh9DXQyaX1TuvCp51/h1S0EPeNa5VdhKwhN6bhLpE Nh9g== 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=6WzwkoaJ; 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 d11-20020aa7d5cb000000b00490ff375640si5326052eds.518.2023.02.10.05.09.27; Fri, 10 Feb 2023 05:09:30 -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=6WzwkoaJ; 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 91CC368BDB9; Fri, 10 Feb 2023 15:09:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94C4668BDB9 for ; Fri, 10 Feb 2023 15:09:16 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id m8so4663151edd.10 for ; Fri, 10 Feb 2023 05:09:16 -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:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=DPGkuBvm/0ukywpWHRDkcwEYD7LVps8SFlsCt2hhp5E=; b=6WzwkoaJQK3zpAGbJnXm3BsEd2X7axyBTKMTztU8iLCFMHxx4cgKuuCaIGLM9hdHAl tXT/tcNDXgxSL0hlGw1kbYbHsGMyZNRzsEh1H+TgfR3jJrZ6xVad3DsKlVWr0AZ2NRmz JsR6c8IxsaTVA6jxAmw1fiKDs+bANMWj+oTVBgug7WMOf/77wrbpNM9ww4Y4hBlPjQZx cu8GXDQKBJKlalTLthqqxMlsodsv48ATcXe+4WFRcBdS0wA1TkCwzKQSRQN+6N5os76C uBXN2SemlCPd+0SgxPcecW3RJCLXHL/2tzckbrb5jfBoso53Xd/592nWavtdzCr3h+vN u4rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DPGkuBvm/0ukywpWHRDkcwEYD7LVps8SFlsCt2hhp5E=; b=Ax3/78Eg85fNOj1sIcrJavQCi2rAV+amlsdY7o94FCs5WdQ1zltMUwHe7JvGD3bp7y Byxk6CAFi216nJ80NEO5oOFowyTL9r2/qL33xxbRLHlggvqu9LheCX4IvLVORAPpLXDO 9eP3vPQHv71Jzs/N/7Lgg3lAuDtJTeKxW4wihRg2Z+H2DMXsTgQ1I5mPitdnNQW7itzv uZbeobhWLUoIOJ/DOnvQ8pNv+p9mBZRta9ofOoFKeVVwY2qZF/DDSMlAe2p7BGlfqAhj QwhxYENbmhBWXFWKIzQUjNi4eXY6CM8FG51GLBLrE2GosXx8SPacr0g8pi+lZWneS5Hm jquA== X-Gm-Message-State: AO0yUKX2xdmaCl8P87CUbrkYpOyfwHEwis9tCYUHj44kS7usRdQZaOD4 buigGqiqaYEM6ayjaLk7vxKtuc977lZq+AppCDDUbA== X-Received: by 2002:a50:f68c:0:b0:4ab:2521:7b8e with SMTP id d12-20020a50f68c000000b004ab25217b8emr4661956edn.23.1676034555992; Fri, 10 Feb 2023 05:09:15 -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.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 05:09:15 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Feb 2023 14:06:55 +0100 Message-Id: <20230210130657.455866-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter: move yadif's filter_line init into a dedicated function 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: OO4Jfxni/qOx --- libavfilter/vf_yadif.c | 13 +++++++++---- libavfilter/x86/vf_yadif_init.c | 4 +--- libavfilter/yadif.h | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index afa4d1d53d..1f9434f961 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -303,7 +303,14 @@ static int config_output(AVFilterLink *outlink) s->csp = av_pix_fmt_desc_get(outlink->format); s->filter = filter; - if (s->csp->comp[0].depth > 8) { + ff_yadif_init_filter_line(s, s->csp->comp[0].depth); + + return 0; +} + +av_cold void ff_yadif_init_filter_line(YADIFContext *s, int bit_depth) +{ + if (bit_depth > 8) { s->filter_line = filter_line_c_16bit; s->filter_edges = filter_edges_16bit; } else { @@ -312,10 +319,8 @@ static int config_output(AVFilterLink *outlink) } #if ARCH_X86 - ff_yadif_init_x86(s); + ff_yadif_init_x86(s, bit_depth); #endif - - return 0; } diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index 257c3f9199..d648f0f835 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -47,11 +47,9 @@ void ff_yadif_filter_line_10bit_ssse3(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); -av_cold void ff_yadif_init_x86(YADIFContext *yadif) +av_cold void ff_yadif_init_x86(YADIFContext *yadif, int bit_depth) { int cpu_flags = av_get_cpu_flags(); - int bit_depth = (!yadif->csp) ? 8 - : yadif->csp->comp[0].depth; if (bit_depth >= 15) { if (EXTERNAL_SSE2(cpu_flags)) diff --git a/libavfilter/yadif.h b/libavfilter/yadif.h index c928911b35..5d8309b403 100644 --- a/libavfilter/yadif.h +++ b/libavfilter/yadif.h @@ -86,7 +86,8 @@ typedef struct YADIFContext { int current_field; ///< YADIFCurrentField } YADIFContext; -void ff_yadif_init_x86(YADIFContext *yadif); +void ff_yadif_init_filter_line(YADIFContext *s, int bit_depth); +void ff_yadif_init_x86(YADIFContext *yadif, int bit_depth); int ff_yadif_filter_frame(AVFilterLink *link, AVFrame *frame); 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"); +} From patchwork Fri Feb 10 13:06:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 40347 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1355329pzk; Fri, 10 Feb 2023 05:09:49 -0800 (PST) X-Google-Smtp-Source: AK7set9ljIUecnM7Q/4eZOASZDrWhBPcrZsXnhx0YTP0QE6v39nElTLJpA3U11ZNjGtlV6EpjEEg X-Received: by 2002:a17:906:1514:b0:88c:4f0d:85af with SMTP id b20-20020a170906151400b0088c4f0d85afmr15697074ejd.75.1676034589560; Fri, 10 Feb 2023 05:09:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676034589; cv=none; d=google.com; s=arc-20160816; b=fHY2JOUIVwdWyGXW0txwR4pDYNpXaJUX4vEQ2xWy5xrkizbgvNDLpdCwPKXdtWsWdK kMvquAQPDj/DKnPCzmUxcAEtDL2zeiRiiY6XURuBz8mPRVGc/0QuYDmCfyXJnYLZUM4F 5Q1nwr0bPoQ0GTvBN++CIXMouCuUfISKkdGf8p90laKy/7sGXClti3WHM4gVEGfzrpq7 +UOrj7BF6lrA22p+yTbPwH/XuVz9KEskoS58nGVOjOSDPgcuhp1u2cMWCc9EIP6q3RI/ pXxHejAS7Q0eWPZJ6G5grcPe7n1td0Tw39qeWdAUiVYgKY5mlIHmuUy3y/SSICamXGtg e0Og== 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=pfdG1JoBf+dZ/Hxk0HlrGUKHg69LbpkcYPqVq1H5jao=; b=N9NmeRUBWBOiwCuk7zPXc/6PnPip6afaREf3BJY6c35ZWhw9+1pnBEwreXsDju8tt0 9cxSMhHxyhPDfcegG/JEjJmZ2uXmgz5/RcVvJlMDt2KCfF4mukw9MlaPUtXIXy/UwzRe 1dcVlnYycMQM/ndt97hgJ9EjOm2KdgmN29jsnqBd7KcYI4GaW1rebu/113LuLcVJgLPu +WN8xcLzCN2Kn62mmhFKoXL1BfGWXGftHEiOt7fWQTk/2sPkXoduM/G4aKMygeuAugrX XTQjrCutwOBEqs4pQbgnjCSlMPjBCxBm+mb6xgILFg/WpF2Bu/ebjdgEV2eR0pn+z7yj CnSQ== 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=VMWAoXRb; 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 13-20020a170906028d00b0088bb8fa1182si8262983ejf.77.2023.02.10.05.09.49; Fri, 10 Feb 2023 05:09:49 -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=VMWAoXRb; 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 1349E68BE7E; Fri, 10 Feb 2023 15:09:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 988F568B840 for ; Fri, 10 Feb 2023 15:09:17 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id da9so4643817edb.12 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=+HY3u+V6re6KBUGa5o+mD8equ2cBo/ODTBSatEHBBhs=; b=VMWAoXRb+CsdzbLqaBDcrznvx/qoHq0ziEKDhzp//lSEZodW7wan2M7Rr78GSAL43Q anOKrF8gZJiL5S1ZL5eYTXvx6xyGcuUJwaAF484NXZfZluGl8jZ3YNaGWcp7YMSGbmjz QoylT9lpiZ2hUkfPxAzH9jdX28LWHOyLPm1Azr3K73daVnSNn0a8mFpWAGi3X56ScNDB Y29G3icIdqXQafyjzSvijtk/7pOlNE/OVhkrL2MMpalqBNkOlBhU01BrrzU6LrTWBEud cxI3weGvFCt7M7dP3tcOxIkqAj9Z5HQrvv9msaA1HjXKPeudePTUhXNVuVBgCX8Ia9Uq f1Hg== 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=+HY3u+V6re6KBUGa5o+mD8equ2cBo/ODTBSatEHBBhs=; b=D6d3dl2SoFapAShgSNrJCULVmw8vD4hDHlpmHlwH087K3WBm5hTpfbrEA3f1VLKiHP +eqCH5sHD8PEZXIeOoNIEKYgkrxzV5BQtFDI4zu37Rn4wCnPsLK9M+1bnmpwvlOvyY/I 7bzKQKM6yD4BTXnUont5/SYLOc+Q+R+VfUrzycDGIb2QftpM43NAvfjZzFtgv2ZIcrJc IFe/NyCfoh5bVRoNpQswZ16kZOkUeotDBwHHCnFrttJH8HLvPz3R4cMlLXNc6k5eP15r 65m1ku0azK672IEoFQL1uVmvR4j1eeC7aUJFP/7wn3cmdsl3kp0AWDa3lFdhafRjLALx 34xA== X-Gm-Message-State: AO0yUKWPUtydApQNKhvBzv+GXXP744kxJPuJUp4ePsdesG+NcyQk+O0i de0mBSIoC5QnT5knNdufLx+0GkyRNfATlKQtUmRqsA== X-Received: by 2002:a50:ce4e:0:b0:4aa:c355:bc92 with SMTP id k14-20020a50ce4e000000b004aac355bc92mr14696360edj.32.1676034557122; Fri, 10 Feb 2023 05:09:17 -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:57 +0100 Message-Id: <20230210130657.455866-3-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 3/3] avfilter/yadif: add avx2 filter_line function 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: rApjb4eU4B1x Zen 2 (Ryzen 7 3700X): 1.73x faster (3603±586.3 vs. 2082±317.1 decicycles) compared with ssse3 Using an SD y4m file speed increases from ~ 3600 fps to ~4700. --- libavfilter/x86/vf_yadif.asm | 83 +++++++++++++++++++++++---------- libavfilter/x86/vf_yadif_init.c | 4 ++ 2 files changed, 62 insertions(+), 25 deletions(-) diff --git a/libavfilter/x86/vf_yadif.asm b/libavfilter/x86/vf_yadif.asm index 809cebdd3f..571febfca3 100644 --- a/libavfilter/x86/vf_yadif.asm +++ b/libavfilter/x86/vf_yadif.asm @@ -25,11 +25,30 @@ SECTION_RODATA -pb_1: times 16 db 1 -pw_1: times 8 dw 1 +pb_1: times 32 db 1 +pw_1: times 16 dw 1 SECTION .text +%unmacro RSHIFT 2 + +%macro RSHIFT 2 +%if mmsize == 32 + vextracti128 xm7, %1, 1 + palignr xmm %+ %1, xm7, xmm %+ %1, 2 +%else + psrldq %1, %2 +%endif +%endmacro + +%macro UNPACK 1 +%if mmsize == 32 + pmovzxbw %1, xmm %+ %1 +%else + punpcklbw %1, m7 +%endif +%endmacro + %macro CHECK 2 movu m2, [curq+t1+%1] movu m3, [curq+t0+%2] @@ -40,7 +59,7 @@ SECTION .text pand m4, [pb_1] psubusb m5, m4 RSHIFT m5, 1 - punpcklbw m5, m7 + UNPACK m5 mova m4, m2 psubusb m2, m3 psubusb m3, m4 @@ -49,9 +68,9 @@ SECTION .text mova m4, m2 RSHIFT m3, 1 RSHIFT m4, 2 - punpcklbw m2, m7 - punpcklbw m3, m7 - punpcklbw m4, m7 + UNPACK m2 + UNPACK m3 + UNPACK m4 paddw m2, m3 paddw m2, m4 %endmacro @@ -81,13 +100,19 @@ SECTION .text %endmacro %macro LOAD 2 - movh %1, %2 - punpcklbw %1, m7 + %if mmsize == 32 + pmovzxbw %1, %2 + %else + movh %1, %2 + punpcklbw %1, m7 + %endif %endmacro %macro FILTER 3 .loop%1: - pxor m7, m7 + %if mmsize != 32 + pxor m7, m7 + %endif LOAD m0, [curq+t1] LOAD m1, [curq+t0] LOAD m2, [%2] @@ -95,9 +120,9 @@ SECTION .text mova m4, m3 paddw m3, m2 psraw m3, 1 - mova [rsp+ 0], m0 - mova [rsp+16], m3 - mova [rsp+32], m1 + mova [rsp+0*mmsize], m0 + mova [rsp+1*mmsize], m3 + mova [rsp+2*mmsize], m1 psubw m2, m4 ABS1 m2, m4 LOAD m3, [prevq+t1] @@ -119,7 +144,7 @@ SECTION .text paddw m3, m4 psrlw m3, 1 pmaxsw m2, m3 - mova [rsp+48], m2 + mova [rsp+3*mmsize], m2 paddw m1, m0 paddw m0, m0 @@ -134,9 +159,9 @@ SECTION .text psubusb m3, m4 pmaxub m2, m3 mova m3, m2 - psrldq m3, 2 - punpcklbw m2, m7 - punpcklbw m3, m7 + RSHIFT m3, 2 + UNPACK m2 + UNPACK m3 paddw m0, m2 paddw m0, m3 psubw m0, [pw_1] @@ -150,7 +175,7 @@ SECTION .text CHECK 1, -3 CHECK2 - mova m6, [rsp+48] + mova m6, [rsp+3*mmsize] cmp DWORD r8m, 2 jge .end%1 LOAD m2, [%2+t1*2] @@ -161,9 +186,9 @@ SECTION .text paddw m3, m5 psrlw m2, 1 psrlw m3, 1 - mova m4, [rsp+ 0] - mova m5, [rsp+16] - mova m7, [rsp+32] + mova m4, [rsp+0*mmsize] + mova m5, [rsp+1*mmsize] + mova m7, [rsp+2*mmsize] psubw m2, m4 psubw m3, m7 mova m0, m5 @@ -182,15 +207,21 @@ SECTION .text pmaxsw m6, m4 .end%1: - mova m2, [rsp+16] + mova m2, [rsp+1*mmsize] mova m3, m2 psubw m2, m6 paddw m3, m6 pmaxsw m1, m2 pminsw m1, m3 - packuswb m1, m1 - movh [dstq], m1 + %if mmsize == 32 + vextracti128 xm4, ym1, 1 + packuswb xm1, xm4 + movu [dstq], xm1 + %else + packuswb m1, m1 + movh [dstq], m1 + %endif add dstq, mmsize/2 add prevq, mmsize/2 add curq, mmsize/2 @@ -201,10 +232,10 @@ SECTION .text %macro YADIF 0 %if ARCH_X86_32 -cglobal yadif_filter_line, 4, 6, 8, 80, dst, prev, cur, next, w, prefs, \ +cglobal yadif_filter_line, 4, 6, 8, 4*mmsize, dst, prev, cur, next, w, prefs, \ mrefs, parity, mode %else -cglobal yadif_filter_line, 4, 7, 8, 80, dst, prev, cur, next, w, prefs, \ +cglobal yadif_filter_line, 4, 7, 8, 4*mmsize, dst, prev, cur, next, w, prefs, \ mrefs, parity, mode %endif %if ARCH_X86_32 @@ -233,3 +264,5 @@ INIT_XMM ssse3 YADIF INIT_XMM sse2 YADIF +INIT_YMM avx2 +YADIF diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index d648f0f835..48858dc295 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -29,6 +29,8 @@ void ff_yadif_filter_line_sse2(void *dst, void *prev, void *cur, void ff_yadif_filter_line_ssse3(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); +void ff_yadif_filter_line_avx2(void *dst, void *prev, void *cur, void *next, + int w, int prefs, int mrefs, int parity, int mode); void ff_yadif_filter_line_16bit_sse2(void *dst, void *prev, void *cur, void *next, int w, int prefs, @@ -68,5 +70,7 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif, int bit_depth) yadif->filter_line = ff_yadif_filter_line_sse2; if (EXTERNAL_SSSE3(cpu_flags)) yadif->filter_line = ff_yadif_filter_line_ssse3; + if (EXTERNAL_AVX2(cpu_flags)) + yadif->filter_line = ff_yadif_filter_line_avx2; } }