From patchwork Wed Mar 22 00:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 40775 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2995299pzb; Tue, 21 Mar 2023 17:07:41 -0700 (PDT) X-Google-Smtp-Source: AK7set8ypkvzJ8hgnL2daup0xjBBIDNYp6nF5mefY5xYtdK9d5PjB3AUyx6Xsk/sQNjsS0+xwE9X X-Received: by 2002:a17:906:498a:b0:93b:752:d2a9 with SMTP id p10-20020a170906498a00b0093b0752d2a9mr1097228eju.31.1679443661636; Tue, 21 Mar 2023 17:07:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679443661; cv=none; d=google.com; s=arc-20160816; b=FZPB+P1hAlAGD2jrpZU9k+/Lp+oRfIqcWUcmkq5TunyErLibDDoup5Y18C8ED4vgLX SpGz988CXdbUx6k2HluRk/lwNHD+HvYuWOz5qx+1RlEWU7G5N9Hvabdv/lALOIn5rW8z Um+TFlW87ykDXJIBaVijf7rzqGjp89Jgu3B6EUX+EVvgqUnxXzIGlCrHkpeCcwKzD5R+ hM0PqJBI1/uHUHaNYTtAPiECgL5qC6X1zsK4T0x7EQZjqxUDXwZJRDE7Zk8Ys0Ur2+Jn v6oMLW+ksEjjynLuMSnfqKWpPsxYnwU58jxpItkeK1+76gu7r7vDn/FwBBGIkalyYsMG GMbw== 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:feedback-id:dkim-signature:dkim-signature:delivered-to; bh=4i0HyH4T1486Uey0lXrnMnVvu+zIYUYQLdwOCv2v5rE=; b=yw3+Q7D3Vz0UBlDA/piB7LMSe3a+bqEIGqw331+Z00T6IFrOREaW1kllDXpFgOaN+M e8c4Ul8BEkCD+SNmpUZ2O++51+LvOTHNe1nkgIjxH+nalNCRpKuWo3tRITeihljP+yP8 cXj23ndtguRX7BF0gQKOuyXcq9b10jB2i20oGACnjDBnzCfLFaRjwfhuiTIZDTOS52Ar AOvqp1+YGlzgX1sOXioYHzHJ7/SfsQaO3zBQYAWqWZBAlFhpdrxGfoGIRqhaPY1hWj1D 94eJd7BneBLcTPpFw3l/t3awe//UCtSD2799M+fJB4yOsy9cCJBZR7EEcZ4zJkEHikRb 6ESA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=1ZuLbqTl; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=s3a7kAZO; 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 a3-20020a1709062b0300b0093105432da9si12988727ejg.151.2023.03.21.17.07.40; Tue, 21 Mar 2023 17:07:41 -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=1ZuLbqTl; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=s3a7kAZO; 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 845EE68C340; Wed, 22 Mar 2023 02:07:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D6D268C170 for ; Wed, 22 Mar 2023 02:07:31 +0200 (EET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 6EBFF5C012B for ; Tue, 21 Mar 2023 20:07:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 21 Mar 2023 20:07:29 -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:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1679443649; x= 1679530049; bh=yv4OxHevU0Hi33ficKgGOuda/+o9sN0+gl1urVwfx58=; b=1 ZuLbqTly3GwcDac55K6lq4oKZT3yuHEelmec3U6DUCGnkZ4orGq7GjvmXnGbhIHo gTVhoqwDcgmTZ5w/Dlbh9GlSIsy4T5Xwc6a4Pb/zY7oJb5/zbo4c9FXSxiLaoqkL 7+XVMWpYRWu9GWTzPq+W2GXimNMEQCfkIBKk/4DiUkf7pqUI7T4DOhMoG/BivsaM nq0GKM2O5/zSl7Bu2l3c0A5YSfdZiMZOxjLsuAuL+eEFFuTLg6eUIBRQTgckCHq2 6om3SdhDdv3UxG7u2a3fnP1FQoF9IFmWE1dUZrTeAexO0EJzxzSeF+hC+UBg1M3z 3SK5czAnovl1eTdjb1x7w== 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 :in-reply-to:message-id:mime-version:references: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=1679443649; x=1679530049; bh=y v4OxHevU0Hi33ficKgGOuda/+o9sN0+gl1urVwfx58=; b=s3a7kAZOMixUDh14n LeI65DUnYdW3wsSzpvsZcJA+OCl+uob7SKcVPuEFqEHJucLsjod2wfLPFonQAiEa F8xB/VHhlz6xGxOc4wgIG1r+1Pp+juo5CeJJ9oR72PhMhqMjCow7e/Phb9F+hxOI cFSGM3+LAqkqbqHNqxem2kh+ak++0UGt7ALnm63fsXFsYbNZdhZ6oGpoNI+03euU s8vt+wVGKig6DHztiDVgyYTB0DxKyiwBML74hp8t3coWojtEGSWrgMnEjnHTki7E a5FZu8NgCxca1hK09MhuB1a1ZgbpBa4KU8cOSvYE1IBfZrMjuOKafiPO/CKRTrba Qdn6Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeguddgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehjuggvkhesihhtrghnihhm uhhlrdhliheqnecuggftrfgrthhtvghrnhepgedvhfffuddugeehveeikeeifeefgfevff ektdehkeeifefhveeuteeufefhteetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomhepjhguvghksehithgrnhhimhhulhdrlhhi X-ME-Proxy: Feedback-ID: i84994747:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 21 Mar 2023 20:07:28 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Mar 2023 01:07:09 +0100 Message-Id: <20230322000710.47513-2-jdek@itanimul.li> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322000710.47513-1-jdek@itanimul.li> References: <61cbba0-956c-86ff-340-26a23453e0d@martin.st> <20230322000710.47513-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/3] 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: xBJFipZGLWz3 Signed-off-by: J. Dekker --- Added missing FATE target. tests/checkasm/Makefile | 2 +- tests/checkasm/checkasm.c | 1 + tests/checkasm/checkasm.h | 1 + tests/checkasm/hevc_deblock.c | 87 +++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 91 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"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index a4e95541f5..faac764388 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -15,6 +15,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-h264pred \ fate-checkasm-h264qpel \ fate-checkasm-hevc_add_res \ + fate-checkasm-hevc_deblock \ fate-checkasm-hevc_idct \ fate-checkasm-hevc_pel \ fate-checkasm-hevc_sao \