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))