From patchwork Tue Mar 21 18:35:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 40773 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2817883pzb; Tue, 21 Mar 2023 11:36:06 -0700 (PDT) X-Google-Smtp-Source: AK7set/hZkGlguCw2dcIAimeY9pqfL0PJAAgRr3XjH7Hj87igPFFbDfCotIZDa9CufnmTmwfnz/X X-Received: by 2002:aa7:d753:0:b0:4c0:9bd7:54cc with SMTP id a19-20020aa7d753000000b004c09bd754ccmr4384237eds.11.1679423766657; Tue, 21 Mar 2023 11:36:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679423766; cv=none; d=google.com; s=arc-20160816; b=gsyQ8qKrzNuFH+2ViedwfndszRkiPNhx2bk5KnGBNE2UvBDCrWZ6jjZ+fFtk/157/r akfgXiNjoU/DwQEzIIW+LLVhX5oL+VORl5SXidS6XHdG8Tq9LgclXwK4vSwuirXa5eii 9U8Ldg1H/xxUb41vCXFvVJ5Vs9vhUNBnEKG2rLD31KMS5X2zOYYDDYu+/DSecp867t5K OuGm59hQh8uvqe8NU5G2TrTDlyYoy6TNx5V2E+CokUxs2UQZO/EAGgPRXdMXfcy4rbre C/o7Wq0JSsG6RCvMpv6TKSI5T7bb3UVDybZploPPtnJEpjZ7Dxg6gEvnlXLa4cYh0zG5 ZZ/Q== 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:feedback-id :dkim-signature:dkim-signature:delivered-to; bh=qFTmfUR6+P5Sv7g1zOLjms/q6glF3VAgCm26VsdIQ/g=; b=XBQRYhEpmWk+33phn9qH0b4XJtA5Y3GUUy/WJdY9QBFP6uvGdP8oQjzujKDRuWj/FC rLBXDivuf1jL2Xb6Tn+bxTQXCjNeCqe29JnDj7qNMRWqNik86V2DcRUzcHnbZ+dOpTLU U++AIwKWlsJzsIsL8QAI/gFEws0VZLr5zpk1Nxe7c52rqJgcF2Y76Vw0JeGWmtgBn//q uqGBABFuek9jKkU5gO1tQD8OgU9PKwajYCrLtZ5uSpVTGm/EjJ7ONlr4nOOgkcd3bHjn 8M6taxFFMLWWcTeheybMeH48XNvrDsnLzat5ixJ6sgE27IB/SrdHP88cM05M6/YXVkCl vbmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=FNeF1YQ0; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=noyOxZ5v; 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 e19-20020a50ec93000000b004ad8bff8f1dsi14167162edr.204.2023.03.21.11.36.05; Tue, 21 Mar 2023 11:36:06 -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=@itanimul.li header.s=fm3 header.b=FNeF1YQ0; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=noyOxZ5v; 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 5B79168C431; Tue, 21 Mar 2023 20:36:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D35F568C1A9 for ; Tue, 21 Mar 2023 20:35:55 +0200 (EET) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 9940E5C0135 for ; Tue, 21 Mar 2023 14:35:52 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 21 Mar 2023 14:35:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm3; t=1679423752; x=1679510152; bh=lSH9Fa7kHZ naPxKlCp7gQXJ7nlP9FSoN2pO9bLbfeKQ=; b=FNeF1YQ06/iaHcjVBFyHVHRUQX PCxuAjJhG8kxbFpUo6X8jqj2KZwJzZdk9GEeLGxO5wGOC7B8g5UkqjG2WaRHlNXG /S6rONcNIQ5MKk2anxX7cmBecgk86LUYHQGRZfkaotjioaYPy/W/LEl2FYJe2JkI A0cV8rf13uDeybDoavweS7yx8Gxi89Elahaizu/Am2n/hUKsDorUYGgl5mgG9qMa bh6aC8QOpu7+ubRYO9Mqc2FESwISFcV8ScrwWFxyRD8EBKR/sAiCLHaCDThLINMz 7uihVzJL2nmYXSIfiW+7Cohk1JHCANx05FTggqsyIpYgXAVBUmQaTVi6bZKA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1679423752; x=1679510152; bh=lSH9Fa7kHZnaPxKlCp7gQXJ7nlP9 FSoN2pO9bLbfeKQ=; b=noyOxZ5v3rsol7YsXhQ7U5RmB6/HSdEz6m0utZCuQX8b AvUTYvpyFhfEE68YIxlkMzytomCdKw4fncBim4m7E6sn0Gwpw/jp0fvCUiV1kjLm hclpxR/vO7S4kKpLE99e14OmrmWTTub7gDNrVgUPsUiv2vHhy0yZNbfrbMjenUR+ rtuY+IEcX6ACP/c4sGJM2Vu83HmQi+4ZO+PbXrHhTSohzEHOo6kKd9aMf/8toLRu cHKuokLY4Io9/kK+zLiGpQAzfse7dDrtG/Nhf8gsFmyPpgjLtRVe29Vb9QJFNnhN 71xwqsjUKIuqezaG0Sfmcn1qFpzs5exyj3HwrdZGXw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdegtddguddufecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeeutefgtdeuvdejjeejvdetleffueehtdefte dugfelhfejueektedvvddtveeiieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Feedback-ID: i84994747:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 21 Mar 2023 14:35:52 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 19:35:47 +0100 Message-Id: <20230321183548.81720-1-jdek@itanimul.li> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] checkasm: add hevc_deblock chroma test 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: SXcCJpZ8MYEv Signed-off-by: J. Dekker --- Only the chroma part, writing the luma part alongside the NEON asm. tests/checkasm/Makefile | 2 +- tests/checkasm/checkasm.c | 1 + tests/checkasm/checkasm.h | 1 + tests/checkasm/hevc_deblock.c | 87 +++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 tests/checkasm/hevc_deblock.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index a6f06c7007..3e62a22bd6 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -28,7 +28,7 @@ AVCODECOBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuvdsp.o AVCODECOBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dsp.o AVCODECOBJS-$(CONFIG_OPUS_DECODER) += opusdsp.o AVCODECOBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o -AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_idct.o hevc_sao.o hevc_pel.o +AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_deblock.o hevc_idct.o hevc_sao.o hevc_pel.o AVCODECOBJS-$(CONFIG_UTVIDEO_DECODER) += utvideodsp.o AVCODECOBJS-$(CONFIG_V210_DECODER) += v210dec.o AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index e96d84a7da..c2184d260d 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -116,6 +116,7 @@ static const struct { #endif #if CONFIG_HEVC_DECODER { "hevc_add_res", checkasm_check_hevc_add_res }, + { "hevc_deblock", checkasm_check_hevc_deblock }, { "hevc_idct", checkasm_check_hevc_idct }, { "hevc_pel", checkasm_check_hevc_pel }, { "hevc_sao", checkasm_check_hevc_sao }, diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 8744a81218..89c643e6a0 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -60,6 +60,7 @@ void checkasm_check_h264dsp(void); void checkasm_check_h264pred(void); void checkasm_check_h264qpel(void); void checkasm_check_hevc_add_res(void); +void checkasm_check_hevc_deblock(void); void checkasm_check_hevc_idct(void); void checkasm_check_hevc_pel(void); void checkasm_check_hevc_sao(void); diff --git a/tests/checkasm/hevc_deblock.c b/tests/checkasm/hevc_deblock.c new file mode 100644 index 0000000000..06c9c1969e --- /dev/null +++ b/tests/checkasm/hevc_deblock.c @@ -0,0 +1,87 @@ +/* + * 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 "libavutil/intreadwrite.h" +#include "libavutil/mem_internal.h" + +#include "libavcodec/avcodec.h" +#include "libavcodec/hevcdsp.h" + +#include "checkasm.h" + +static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff }; + +#define SIZEOF_PIXEL ((bit_depth + 7) / 8) +#define BUF_STRIDE (8 * 2) +#define BUF_LINES (8) +#define BUF_OFFSET (BUF_STRIDE * BUF_LINES) +#define BUF_SIZE (BUF_STRIDE * BUF_LINES + BUF_OFFSET * 2) + +#define randomize_buffers(buf0, buf1, size) \ + do { \ + uint32_t mask = pixel_mask[(bit_depth - 8) >> 1]; \ + int k; \ + for (k = 0; k < size; k += 4) { \ + uint32_t r = rnd() & mask; \ + AV_WN32A(buf0 + k, r); \ + AV_WN32A(buf1 + k, r); \ + } \ + } while (0) + +static void check_deblock_chroma(HEVCDSPContext h, int bit_depth) +{ + int32_t tc[2] = { 1, 1 }; + uint8_t no_p[2] = { 0, 0 }; + uint8_t no_q[2] = { 0, 0 }; + LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); + LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); + + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, ptrdiff_t stride, int32_t *tc, uint8_t *no_p, uint8_t *no_q); + + randomize_buffers(buf0, buf1, BUF_SIZE); + if (check_func(h.hevc_h_loop_filter_chroma, "hevc_h_loop_filter_chroma_%d", bit_depth)) { + call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + } + + randomize_buffers(buf0, buf1, BUF_SIZE); + if (check_func(h.hevc_v_loop_filter_chroma, "hevc_v_loop_filter_chroma_%d", bit_depth)) { + call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + } +} + +void checkasm_check_hevc_deblock(void) +{ + int bit_depth; + + for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) { + HEVCDSPContext h; + ff_hevc_dsp_init(&h, bit_depth); + check_deblock_chroma(h, bit_depth); + } + report("chroma"); +}