From patchwork Mon Feb 20 19:57:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 40457 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2180491pzk; Mon, 20 Feb 2023 11:59:18 -0800 (PST) X-Google-Smtp-Source: AK7set+riq/Gib7Y8j542YXm1cWR+hjH7kvxBg393LJUSufUrtOJOwA/wfGKWw85TWaIQudO5buV X-Received: by 2002:a17:907:c10:b0:87b:da74:d272 with SMTP id ga16-20020a1709070c1000b0087bda74d272mr12648874ejc.45.1676923158681; Mon, 20 Feb 2023 11:59:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676923158; cv=none; d=google.com; s=arc-20160816; b=DjrnstznVwh2+XbXkPQVggaPxu+1PhanvRs0GOGSC8AtBOhwXu8IyD9GeIZtfeOUuT A+iv27FBu/tBbrF6XL3eCp+u+0YVhILZWvue5VGn/Dhydh3rPLKHVYrCmZDrvPbN7CCR ew8DHsoYwxOI1VFG/I5wl6UZexz4yBYCAWsC+xHpy9q6ymhYZFV3iEP7tYOpxKDeFD5t 9poly0pLDwKpBYkpO2SsmDZ0Sbga/zMdz+Bkv506Kl9cpKPFDiYcQ2+hyPuyf4TD0Ryi 4fmlw3P5KB1Phc6XQm8Cou20YVvJrepJsHlpduGFKdHGtkgBpWDrF515vI+b9qyBywtw a/mQ== 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=u7ntB30sv9nnSlSqBQv0YA7PnyTBHY4pNxC+ATuLB84=; b=dGNbk29KQm9GdKkr91gfcNVn7/cqHn0wGGkPlgcZqYX/dNvKtTlMiFayTUBxJY5QOz k8eEMIhnHVQ6k4OnK0WPCzbWN5UeCOPvut9lEWD+72niW5I7ZiLyuSJM666z7iIVspr0 naswlFt+z5odSsNwzPRIiJryzHChHa/h5CfrBMzozkiv5Q42GQfyUWX6nsSyDGhEPKPa +QEFMEUH8mJtk6cuSCeylrINb254PX/wl2DEnYp0FnQgXqO/CrljBNOpOn8hDKTJ+zlx J5MwSm0aiJxVrpNzchk6YMMbpU480E27Fy9hkcsFEgy5QjrEk2xtOt9HCk6fXvsm9Nvp Up/Q== 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=jBH1tyxk; 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 j23-20020a170906535700b008b17fe95457si15384581ejo.1004.2023.02.20.11.59.18; Mon, 20 Feb 2023 11:59:18 -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=jBH1tyxk; 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 9296F68C0A3; Mon, 20 Feb 2023 21:59:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D47D368BE7D for ; Mon, 20 Feb 2023 21:59:08 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id l25so1926270wrb.3 for ; Mon, 20 Feb 2023 11:59:08 -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=PSB1aYOyVDVWYUW11lRD6MbXwYhxp2TMfvAYBrA27p4=; b=jBH1tyxkoXoEdWFKUS8eGlssZoTGW+iRiXCyG1XMyr+mtrAoN8/m/WDkzlSVYZzGC6 hJITL6WWxgK2v1LbqJ5e+QJJVkJqL/YVmzeh+l5KgRupCw7odqQngInLD1k5TWt0suZ+ 7WqA5HwbRdWITZIV2XP9s5EEh/zQQAnNXuJ4X7lgWEGxFcAQDXKY2OlHOqJ65om6djkU VVZSTD6TBdefXQIfpYmLYwY1Xt/idYHt/CqsmWVoopEi9yzGIe22zivdmn3W6DJIUhmc 6mspCWGtLr/pRgihPEpp3YTVeNi8gSiLtfT7dej8l49jlCfwvkJG+oOcutLpJYJukU+f udBg== 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=PSB1aYOyVDVWYUW11lRD6MbXwYhxp2TMfvAYBrA27p4=; b=x8PBM89ZfcFNr59UioU0Kwj3osd48GeERsBz2GbYMbEAIRaAwz44Fd6WbxlLbiGtwq phFm6mMnF17OksAoTj9JFlO88/Y1udJEuHz1fCEgtmg2gd31hiyOx0YCTWHnoa716LJD vpldwE1TUbj04UE1v+Ycq6vtda1wH2dSFYVPkA/A/S4qcBcqLIb6W93ZTaczr5S08RSr zutseNcHvL5Pkfq/r+WY8+UFVITVNWyQxpX96lZ7H36blWJ5xMjpbL1BSrdhOh3jwhDj z0mtABOixH2P6YzIn4/aVBNv1KAxv62oRJRRatDyE1R+LknmXofsRisFETUNDm2OTkT2 QsTA== X-Gm-Message-State: AO0yUKV6qJ0b10jwbI2SqeSupSlO/tLhHc+ezm1k3cjjk7TQV/+6HFdx 2fwklWMWpk5c0V+A4rLW+geMNsOmndSuuyOliuo1GQ== X-Received: by 2002:a05:6000:c9:b0:2c5:52ff:445d with SMTP id q9-20020a05600000c900b002c552ff445dmr1965376wrx.40.1676923148185; 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.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 11:59:07 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Feb 2023 20:57:01 +0100 Message-Id: <20230220195703.1297421-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter: move bwdif'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: vZ6PCcyDRyTU --- libavfilter/bwdif.h | 3 ++- libavfilter/vf_bwdif.c | 13 +++++++++---- libavfilter/x86/vf_bwdif_init.c | 4 +--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libavfilter/bwdif.h b/libavfilter/bwdif.h index 889ff772ed..5749345f78 100644 --- a/libavfilter/bwdif.h +++ b/libavfilter/bwdif.h @@ -37,6 +37,7 @@ typedef struct BWDIFContext { int parity, int clip_max, int spat); } BWDIFContext; -void ff_bwdif_init_x86(BWDIFContext *bwdif); +void ff_bwdif_init_filter_line(BWDIFContext *bwdif, int bit_depth); +void ff_bwdif_init_x86(BWDIFContext *bwdif, int bit_depth); #endif /* AVFILTER_BWDIF_H */ diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index 65c617ebb3..34e8c5e234 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -340,7 +340,14 @@ static int config_props(AVFilterLink *link) yadif->csp = av_pix_fmt_desc_get(link->format); yadif->filter = filter; - if (yadif->csp->comp[0].depth > 8) { + ff_bwdif_init_filter_line(s, yadif->csp->comp[0].depth); + + return 0; +} + +av_cold void ff_bwdif_init_filter_line(BWDIFContext *s, int bit_depth) +{ + if (bit_depth > 8) { s->filter_intra = filter_intra_16bit; s->filter_line = filter_line_c_16bit; s->filter_edge = filter_edge_16bit; @@ -351,10 +358,8 @@ static int config_props(AVFilterLink *link) } #if ARCH_X86 - ff_bwdif_init_x86(s); + ff_bwdif_init_x86(s, bit_depth); #endif - - return 0; } diff --git a/libavfilter/x86/vf_bwdif_init.c b/libavfilter/x86/vf_bwdif_init.c index e24e5cd9b1..ba7bc40c3d 100644 --- a/libavfilter/x86/vf_bwdif_init.c +++ b/libavfilter/x86/vf_bwdif_init.c @@ -42,11 +42,9 @@ void ff_bwdif_filter_line_12bit_ssse3(void *dst, void *prev, void *cur, void *ne int mrefs2, int prefs3, int mrefs3, int prefs4, int mrefs4, int parity, int clip_max); -av_cold void ff_bwdif_init_x86(BWDIFContext *bwdif) +av_cold void ff_bwdif_init_x86(BWDIFContext *bwdif, int bit_depth) { - YADIFContext *yadif = &bwdif->yadif; int cpu_flags = av_get_cpu_flags(); - int bit_depth = (!yadif->csp) ? 8 : yadif->csp->comp[0].depth; if (bit_depth <= 8) { if (EXTERNAL_SSE2(cpu_flags)) 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 \ From patchwork Mon Feb 20 19:57:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 40459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2180584pzk; Mon, 20 Feb 2023 11:59:35 -0800 (PST) X-Google-Smtp-Source: AK7set//znLI/45hW8+GMtHjZJ/prXhPfxE6GUN9hCWOk0rOrxfgIh7R8jKIen11CtJ9uHZoXTTu X-Received: by 2002:a05:6402:1b05:b0:4ab:4ad1:a381 with SMTP id by5-20020a0564021b0500b004ab4ad1a381mr3276553edb.10.1676923175735; Mon, 20 Feb 2023 11:59:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676923175; cv=none; d=google.com; s=arc-20160816; b=NReyNeIJBxUycLjBvGfgTHZ/b8nPs7msdUQWb9Ux1sgSMDfJOxNaEBhwJQfWdK5muZ lQ5Mfg3etITTOwWcKyc9dKAgsAvQBNGUD/BY5rD4AQJMw5B2/OnPIzDhFSF7ajdVqcDb uOOWsu4VMNPX4cuaWCImvj+gEHFzHkipYwQt3abp6fR3TetSOn0xn8GhLpOjjAfCS8EV XzJNRVJOxkYGmhwKTgn0JBLhJLhphZBQJZ+f8QMlHb0uS4d6AnQ0GwW9U+NhTxBfqBAP 08uPF5t1PUqw3Ac4gCth05B9UKnnVkG4A2I1cB6N3Lsfo+3sY4Vkqb/yOqfHDqfybNVN SJWQ== 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=IPjJg7xguXB2MF3UsQw8iBElqAZDH1n5NSIbW5687ZY=; b=vhFNi1FeYPMuREEAOuU0vXGNJbacTHP+i08sG/Hciq/m/zIOyFjS9atcLFhedkvI1k 2ZurH5popgiH4EpB8/UA5bLSqByWBifEHmE3GmHYtvaf7V7w0UeK7UhoS6W7JVowgSVO rFRRbAtsalC51LTGo1tyMeKCDR0UwZChDn9iwJDLuoxzRdROYTeCE6BKCQK6qdR9Ff8j K2ZQha6hMw9coPeiEL13FebfIP5McsPQy0XX/yliXqDQVAQjtOtnNW3RVtOfC0zZ8tdF kFr4GjlgAda+WeI9G1Y2EKiOyEyGlFfkQAcsQWeoKHkYx2eAU1SLNamsQF9oa8eAiV72 1zIg== 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="x++gt/On"; 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 e15-20020aa7d7cf000000b004acc28218e7si1472675eds.581.2023.02.20.11.59.35; Mon, 20 Feb 2023 11:59:35 -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="x++gt/On"; 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 8D3B368C0BA; Mon, 20 Feb 2023 21:59:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF84A68BE7D for ; Mon, 20 Feb 2023 21:59:09 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id v3so2253110wrp.2 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=uKIXicLH7OplCg7ap8YwJSrqgWdlwNOLDSn8nKoFYos=; b=x++gt/OnwcWb5DnLil9onb9UcCwFxpSNjmabLq4l8gVPP55AtUA16dWfV3iFjwLs67 I4ky/gndbhON7O7/ljpNn441futMS6254ogkHNqf4nSbieNplFZPrlj78SZmaFagXtd7 2iKe4h9Z5d6FsEdmccqBU473DDZ44NK/pwKdd/T8nnAb9Pw5vgZuHlvk9AHNZSfJrkrr jMpF10MyS6BCSwwS1tb/cdFXaZWk2HjfrHSPYGtc2J0tFlQdqhJdquDcots53hMXXO3T JnW6X0808inlgM13NbukQUYb+mQieNhesBuuFNjnySovY5oU721EMMpTrTMdN9svT63k jVCA== 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=uKIXicLH7OplCg7ap8YwJSrqgWdlwNOLDSn8nKoFYos=; b=RcV8T35YGMgAn7HRGx0OpJMPboS3gWbABGcazFsd3ZimCAedxYr4URZU0sdCkqf3pE ufyylABEWQqPED7FHEmgira8sjGS54CGPYWIpo3pBUZgwJ/PTXCpyMKp2Sv/9RtR51Bm qOe/eQ3U5jGGulPB8XL+IAmPHTkcMZdyA2r70KHBL4GeQI8lSa76xNwoeZ1WnCwN/xkA +G7794ZYdNzZWNrAa0Ru4+/cyzrS0junz5nLGmf3OiF0JkNnHePUIGQprsxnFwVOAaxq HaLjiBmmmMtdwL9QngMG3+uebRqqxoKLpSRpkD3hLVt35TVP7dUKLKPudy4NltJpEXnD pdfw== X-Gm-Message-State: AO0yUKV1aLDKpbzDWVXwQOVXu0s17oxL0BoaphruoffRMxvH2SQr2X+h U1lzF84g6rxNntoqNiaRRsOCUWM9l4BO4HEmaLGqlw== X-Received: by 2002:adf:e241:0:b0:2c3:ddbe:d7b2 with SMTP id bl1-20020adfe241000000b002c3ddbed7b2mr1245676wrb.62.1676923149260; Mon, 20 Feb 2023 11:59:09 -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:03 +0100 Message-Id: <20230220195703.1297421-3-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 3/3] avfilter: add avx2 filter_line function 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: jjCbjGoXrREC 2.24x faster (1925±1.3 vs. 859±2.2 decicycles) compared with ssse3 --- libavfilter/x86/vf_bwdif.asm | 29 ++++++++++++++++++++++++----- libavfilter/x86/vf_bwdif_init.c | 12 ++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/libavfilter/x86/vf_bwdif.asm b/libavfilter/x86/vf_bwdif.asm index 0b453da53b..5cc61435fd 100644 --- a/libavfilter/x86/vf_bwdif.asm +++ b/libavfilter/x86/vf_bwdif.asm @@ -26,18 +26,22 @@ %include "libavutil/x86/x86util.asm" -SECTION_RODATA +SECTION_RODATA 32 -pw_coefhf: times 4 dw 1016, 5570 -pw_coefhf1: times 8 dw -3801 -pw_coefsp: times 4 dw 5077, -981 -pw_splfdif: times 4 dw -768, 768 +pw_coefhf: times 8 dw 1016, 5570 +pw_coefhf1: times 16 dw -3801 +pw_coefsp: times 8 dw 5077, -981 +pw_splfdif: times 8 dw -768, 768 SECTION .text %macro LOAD8 2 + %if mmsize == 32 + pmovzxbw %1, %2 + %else movh %1, %2 punpcklbw %1, m7 + %endif %endmacro %macro LOAD12 2 @@ -45,8 +49,14 @@ SECTION .text %endmacro %macro DISP8 0 + %if mmsize == 32 + vextracti128 xm1, m2, 1 + packuswb xm2, xm1 + movu [dstq], xm2 + %else packuswb m2, m2 movh [dstq], m2 + %endif %endmacro %macro DISP12 0 @@ -244,8 +254,12 @@ cglobal bwdif_filter_line_12bit, 4, 9, 13, 0, dst, prev, cur, next, w, \ prefs, mrefs, prefs2, mrefs2, \ prefs3, mrefs3, prefs4, \ mrefs4, parity, clip_max + %if mmsize == 32 + vpbroadcastd m12, DWORD clip_maxm + %else movd m12, DWORD clip_maxm SPLATW m12, m12, 0 + %endif %else cglobal bwdif_filter_line_12bit, 4, 6, 8, 80, dst, prev, cur, next, w, \ prefs, mrefs, prefs2, mrefs2, \ @@ -264,3 +278,8 @@ INIT_XMM ssse3 BWDIF INIT_XMM sse2 BWDIF + +%if HAVE_AVX2_EXTERNAL && ARCH_X86_64 +INIT_YMM avx2 +BWDIF +%endif diff --git a/libavfilter/x86/vf_bwdif_init.c b/libavfilter/x86/vf_bwdif_init.c index ba7bc40c3d..f833318c10 100644 --- a/libavfilter/x86/vf_bwdif_init.c +++ b/libavfilter/x86/vf_bwdif_init.c @@ -32,6 +32,10 @@ void ff_bwdif_filter_line_ssse3(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); +void ff_bwdif_filter_line_avx2(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); void ff_bwdif_filter_line_12bit_sse2(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int prefs2, @@ -41,6 +45,10 @@ void ff_bwdif_filter_line_12bit_ssse3(void *dst, void *prev, void *cur, void *ne int w, int prefs, int mrefs, int prefs2, int mrefs2, int prefs3, int mrefs3, int prefs4, int mrefs4, int parity, int clip_max); +void ff_bwdif_filter_line_12bit_avx2(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); av_cold void ff_bwdif_init_x86(BWDIFContext *bwdif, int bit_depth) { @@ -51,10 +59,14 @@ av_cold void ff_bwdif_init_x86(BWDIFContext *bwdif, int bit_depth) bwdif->filter_line = ff_bwdif_filter_line_sse2; if (EXTERNAL_SSSE3(cpu_flags)) bwdif->filter_line = ff_bwdif_filter_line_ssse3; + if (ARCH_X86_64 && EXTERNAL_AVX2(cpu_flags)) + bwdif->filter_line = ff_bwdif_filter_line_avx2; } else if (bit_depth <= 12) { if (EXTERNAL_SSE2(cpu_flags)) bwdif->filter_line = ff_bwdif_filter_line_12bit_sse2; if (EXTERNAL_SSSE3(cpu_flags)) bwdif->filter_line = ff_bwdif_filter_line_12bit_ssse3; + if (ARCH_X86_64 && EXTERNAL_AVX2(cpu_flags)) + bwdif->filter_line = ff_bwdif_filter_line_12bit_avx2; } }