From patchwork Mon Mar 20 16:49:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 40729 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1933829pzb; Mon, 20 Mar 2023 09:51:45 -0700 (PDT) X-Google-Smtp-Source: AK7set/A7C5rfyIlK6VOuWw+sfGvCWyPpkyFQJKZVia/NYdxzl1QoAH0PzIFTIz3/jhl/jz/HsuW X-Received: by 2002:a05:6402:742:b0:4fa:56dc:b6e6 with SMTP id p2-20020a056402074200b004fa56dcb6e6mr185769edy.16.1679331105783; Mon, 20 Mar 2023 09:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679331105; cv=none; d=google.com; s=arc-20160816; b=ZTh1RuFDavsvpBnnOrNkLAZHUYR2bk/uz+ysmWtlHKYs7MZbTL3Q/xrFU0Ydbw4Vv/ fTp0HP6kMcZsiHUT6HCmsZcwriOOKUIp6qDkphis7sGJfALCxkWAhhHZYlB0b5Hlfind TLTFwnPWemANMnIYwClMKDsRAJgZ89kLwof8jof9DVAzUgXUkm3ip4i2fA8LW+lYvKvo JRYmZIiwrmP+hD3BvD8r9bQfy7eaCVxfhlcXMMjrFjKOHEVLbzdgWJHMZ6kUCf1OTaks ywFocdrMERIRJWpXAQd/twbUsEnNPxBFOv06cc0d4aYnXbMtnWEOlAq5WGhT2wXpG/zL a1AA== 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=nooedw9gw8XdXufVaIJDM9bR0zTJfC0qQcIjb7pbVA8=; b=PFQ9tTJoGVpXBtsZV1q4qgZiT1ut+MBzlIUyh2vwF9uKNCwnGI3UNztgJmQ1vDASLP a5HgGlLdyRDbr7DI+ipx8qU1WQSKaW+CZcB0kiS1zJS7W3GV9E3YiMlXMipj5vq0kcSS qtHqtBPbeaEsWkOCj1sCb/hmkWZAwjp0rulqZ+eirFNyrK5wnogXZJp9pFGQCNS8eN40 c4cbsFfku/5CFzidyroqGs+Xp1dJ5biDffFW2M3qEhm5EX+x6X9YnHwuDuAReojefUki Il8kGOCipJwoAz5HNKuymsiTwrNFhDc498y3WN5N6wPK+uB/EZlHXVSPYP/RzFJ/NxFf Mncg== 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=F8tBRqDc; 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 d24-20020aa7d698000000b004c056644702si10811645edr.400.2023.03.20.09.51.44; Mon, 20 Mar 2023 09:51:45 -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=F8tBRqDc; 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 6EEE768C3A5; Mon, 20 Mar 2023 18:51:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f42.google.com (mail-vs1-f42.google.com [209.85.217.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DC5168C3A5 for ; Mon, 20 Mar 2023 18:51:34 +0200 (EET) Received: by mail-vs1-f42.google.com with SMTP id c10so3898580vsh.12 for ; Mon, 20 Mar 2023 09:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=obe-tv.20210112.gappssmtp.com; s=20210112; t=1679331092; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WElLzVKXn1Kv/7XJYT8UeM3+2MMKgaLLC+PWt3IWRxY=; b=F8tBRqDcjzSWnxSx053KChO1eUukvmAUDAVIwSOdDO9okEUOHBFXMWM0bl0Kfafjt7 5trlN1s9LvPSABwf4DlmaYaRMKj8dVlx3GM5x42XeLWfDaRZ7oy2IsGyAwS10bpb21Py 0Z6TXo0QHsNULUB/+t4EngtETvxfTbQFF584h5SjAZvk/WW2yDXRqdXDyzM912vV8GjR Apb+T4uJMuAaO7pESVkoAiB/MqiUm2CAfg/8v6kUw2XUer3ZzeGQM4ueBYvQ0JoAzNy0 VsPEn2CQXhmS12mhwdbq9cn2rwL1xNOXxDc/afSo10x5z1Ow2qtxdigNzZwFMcl7hN+w wCQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679331092; 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=WElLzVKXn1Kv/7XJYT8UeM3+2MMKgaLLC+PWt3IWRxY=; b=3dmGBtRUloOG5YX+RgsqAwvlAGGRLIpEnRBhlDsAoV2c7Pw08qxgbBBAepVwyGS60l S3NepnLCf3HxLSm73qdgcI0wxZihyWecc0OXry1mp0XbT06aMMQkotSU3dl1voAPTD0a AYpVRh4n+NuTvvs2b0MlLNO8tXUP9auEJK1uOgplcKG3CAaNYeb1HjnjSipWERjK31nR vXs0shsr1LtX3/6lQkqMcjT6Y/vY7/mnJmwtpzRpUjJM11Y7rbJx7RraZVS6l8wvN9VP GrZ48VQcj7202JtS0Wkay2P8wSchnJmLKYKYTfKxAW0a4CLm6yMEquZRCA5JzYgo2TrS adQA== X-Gm-Message-State: AO0yUKVHHCvLUjpJM46o6gW8iLQbE5xFPFvbTqHP9lSsCwPNc02PVkSr ikqUWM7GKpKKN7lO5Ne0QcALPQB1FnFLxpvh78M= X-Received: by 2002:a05:6102:2045:b0:425:de64:c614 with SMTP id q5-20020a056102204500b00425de64c614mr2890570vsr.8.1679331092190; Mon, 20 Mar 2023 09:51:32 -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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 09:51:31 -0700 (PDT) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Mar 2023 17:49:21 +0100 Message-Id: <20230320164925.299207-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/5] avfilter/bwdif: move filter_line init to 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: MP/GDirUHMXw --- No changes 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))