From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BDF8745CA5 for ; Sun, 2 Jul 2023 12:33:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D16E668C2C7; Sun, 2 Jul 2023 15:33:16 +0300 (EEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CFBB68C26F for ; Sun, 2 Jul 2023 15:33:10 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3fbd33a57b6so15311655e9.2 for ; Sun, 02 Jul 2023 05:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kynesim-co-uk.20221208.gappssmtp.com; s=20221208; t=1688301189; x=1690893189; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=16/Pw9ePltZ218Xfhg3t993hbtfar7ORcoj+q/wUktI=; b=MQ3gfeu2fViizvVBT/5E56RpCT5rVuTdeRsZtklHHXFN/mH4gjsA3cxSgMbzGvPjds PbIjEGOHIy6MBDSl8GoBgi+aQ3HykAzwxRQqPeHn5uEyRTy5N1Z5MId1I0OZfDbUXGUT QZ65w/XyxgOXK3cFTPVt6XYW2Z/0epDbVz7gTo9NhcDdJvYbXcqhWLkBkddTqMyAivsY v+QGGWe84tBGzqn1RvCH3NsAetLV/M0akkQm4yuaiMjkaeGgH1QfbMpnAzUD6hmiN+ps YG7UJc8MV4wLE3Xz1y2BybOvGgZwbK2lUW9O2OR60DMvd7ZL/eQXMjttbxWJa8wo3MBy ExGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688301189; x=1690893189; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=16/Pw9ePltZ218Xfhg3t993hbtfar7ORcoj+q/wUktI=; b=XEK076RW8o9p6aovpNb8/3PfuaQK4+kjM6hFauG0yqKmnZ/RV/nWIwpzx1fanfJenp nO/feDJRo82T/nCFh7soVmYjLjT0SHt8s6sq6uvZWujb0KJ0Dk+7/fdX7Wz2MJW2rNeY EftwbgkvSINQQxHqeCuXXLp9q4bwfd7f5SFlXw1brkmNUHp8ZSbs25nOgKGV8vy7a3az ah8xiB6svyUQbRCjRL8RUHSnLnC1OlEGtBpG3edmxrKMTc0HxToFjduBczdD9Bv+wvcd G9kcK0duAcb2UKPOddwNx3C2R7KMIzYzB+CkTiH0h8RMIJRmXuIJiVYkhs3lfxC33Udu yRow== X-Gm-Message-State: AC+VfDxuHjBUN6XtvbVmWzHjlKTDlyaldXD21nlYoGJl96vi/NzBLfZZ GzqBxyLtAork8TjQaiiz+x3uRMGf2xr/At32wj8= X-Google-Smtp-Source: ACHHUZ4EzpJFOHdodTV8WtgYW2dpsKKaoz6jhEHHgqut2e2mZs0/6EeSC7kqSK2XEJ/VwBz7i2HY5A== X-Received: by 2002:a1c:7c0a:0:b0:3f7:f2d0:b904 with SMTP id x10-20020a1c7c0a000000b003f7f2d0b904mr9518281wmc.8.1688301189615; Sun, 02 Jul 2023 05:33:09 -0700 (PDT) Received: from sucnaath.outer.uphall.net (cpc1-cmbg20-2-0-cust759.5-4.cable.virginm.net. [86.21.218.248]) by smtp.gmail.com with ESMTPSA id f12-20020a7bc8cc000000b003fbbe41fd78sm8816167wml.10.2023.07.02.05.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 05:33:09 -0700 (PDT) From: John Cox To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jul 2023 12:32:31 +0000 Message-Id: <20230702123242.232484-5-jc@kynesim.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702123242.232484-1-jc@kynesim.co.uk> References: <20230702123242.232484-1-jc@kynesim.co.uk> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 04/15] avfilter/vf_bwdif: Add neon for filter_intra 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 Cc: thomas.mundt@hr.de, John Cox , martin@martin.st Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: John Cox --- libavfilter/aarch64/vf_bwdif_init_aarch64.c | 17 +++++++ libavfilter/aarch64/vf_bwdif_neon.S | 53 +++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/libavfilter/aarch64/vf_bwdif_init_aarch64.c b/libavfilter/aarch64/vf_bwdif_init_aarch64.c index 86d53b2ca1..3ffaa07ab3 100644 --- a/libavfilter/aarch64/vf_bwdif_init_aarch64.c +++ b/libavfilter/aarch64/vf_bwdif_init_aarch64.c @@ -24,6 +24,22 @@ #include "libavfilter/bwdif.h" #include "libavutil/aarch64/cpu.h" +void ff_bwdif_filter_intra_neon(void *dst1, void *cur1, int w, int prefs, int mrefs, + int prefs3, int mrefs3, int parity, int clip_max); + + +static void filter_intra_helper(void *dst1, void *cur1, int w, int prefs, int mrefs, + int prefs3, int mrefs3, int parity, int clip_max) +{ + const int w0 = clip_max != 255 ? 0 : w & ~15; + + ff_bwdif_filter_intra_neon(dst1, cur1, w0, prefs, mrefs, prefs3, mrefs3, parity, clip_max); + + if (w0 < w) + ff_bwdif_filter_intra_c((char *)dst1 + w0, (char *)cur1 + w0, + w - w0, prefs, mrefs, prefs3, mrefs3, parity, clip_max); +} + void ff_bwdif_init_aarch64(BWDIFContext *s, int bit_depth) { @@ -35,5 +51,6 @@ ff_bwdif_init_aarch64(BWDIFContext *s, int bit_depth) if (!have_neon(cpu_flags)) return; + s->filter_intra = filter_intra_helper; } diff --git a/libavfilter/aarch64/vf_bwdif_neon.S b/libavfilter/aarch64/vf_bwdif_neon.S index c2f5eb1f73..6a614f8d6e 100644 --- a/libavfilter/aarch64/vf_bwdif_neon.S +++ b/libavfilter/aarch64/vf_bwdif_neon.S @@ -76,3 +76,56 @@ coeffs: .hword 5570, 3801, 1016, -3801 // hf[0] = v0.h[2], -hf[1] = v0.h[5] .hword 5077, 981 // sp[0] = v0.h[6] +// ============================================================================ +// +// void ff_bwdif_filter_intra_neon( +// void *dst1, // x0 +// void *cur1, // x1 +// int w, // w2 +// int prefs, // w3 +// int mrefs, // w4 +// int prefs3, // w5 +// int mrefs3, // w6 +// int parity, // w7 unused +// int clip_max) // [sp, #0] unused + +function ff_bwdif_filter_intra_neon, export=1 + cmp w2, #0 + ble 99f + + ldr q0, coeffs + +// for (x = 0; x < w; x++) { +10: + +// interpol = (coef_sp[0] * (cur[mrefs] + cur[prefs]) - coef_sp[1] * (cur[mrefs3] + cur[prefs3])) >> 13; + ldr q31, [x1, w4, sxtw] + ldr q30, [x1, w3, sxtw] + ldr q29, [x1, w6, sxtw] + ldr q28, [x1, w5, sxtw] + + uaddl v20.8h, v31.8b, v30.8b + uaddl2 v21.8h, v31.16b, v30.16b + + UMULL4K v2, v3, v4, v5, v20, v21, v0.h[6] + + uaddl v20.8h, v29.8b, v28.8b + uaddl2 v21.8h, v29.16b, v28.16b + + UMLSL4K v2, v3, v4, v5, v20, v21, v0.h[7] + +// dst[0] = av_clip(interpol, 0, clip_max); + SQSHRUNN v2, v2, v3, v4, v5, 13 + str q2, [x0], #16 + +// dst++; +// cur++; +// } + + subs w2, w2, #16 + add x1, x1, #16 + bgt 10b + +99: + ret +endfunc -- 2.39.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".