From patchwork Wed Mar 29 14:13:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 40905 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp537901pzb; Wed, 29 Mar 2023 07:14:03 -0700 (PDT) X-Google-Smtp-Source: AKy350b3rHX6wv8UF7jeA51s2UFXeNWYZq45TvUXQdf18jsBJk2YWx3BssQcanv8XmTTcUKNz8ww X-Received: by 2002:a17:906:46c7:b0:902:874:9c31 with SMTP id k7-20020a17090646c700b0090208749c31mr2333181ejs.35.1680099243187; Wed, 29 Mar 2023 07:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680099243; cv=none; d=google.com; s=arc-20160816; b=k6GhwHQ6/VBmloSZf0AQ3D/1C0eTw4v5xgLJoalHmg2wvXZ0RLLYH+fku8V8Bdvohh EiM5KzNM3SOXhzMaMGgcan7MGsRsgsAHX98BMKz5FqFDWgpevAcktDVlaj8KsSxmXl1o eRre9WahTOENe3Bytd1u5NVdAJhQuKboX0VuG5l9Ndiai2wYIC15GR9nYei3vNxEgyIF Xrr2QSxmMsUq8n7m6/cvZgF4AqWwsmccM9tK5xPtDGtSahPIGqKRznrjz+rN9IU1KdeA fbC48MD05KG1lqCEre1dNqqMzUSS78cUEhu5R8+8KomzAlm/7w7/8xcL+OdajIf5j8MR Ejqw== 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=PZUomG+E1Ln+9WbOC204ydNyNq6SxEQDkZYVsKx6vDc=; b=RqYsmaHjOS/OHz8FEIeGgcF9/2QGGJdRX+FMfzvdKB7ekdve7a2XUgnVO4/XO6zaUO YBN179mP4O+InCADxku4k6/S675i2jJOxoAPepRJg4fdWiHmYd4KyHr5+pK3rqIIrbPU uzabPoWqJe5o3+yjrPvFyITO1TApIVuxnrIS/DcC9hEXOsyWrdAi/oFAxUM6kvNpxRlz oHtIAZxldbMfInstbCDh25ud0vDCGhi6cl4i7gUQyPBWwQE48TgFzLr1GZLFKewcs80X mGceTQoTG6Nvx7/+EUR7cJU0BAMYugb/fWjcm8L/wg5gLdGndOFSNJtByK9DJPmA2Pm4 Mw6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b="c5/jFc8N"; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=QofjbV83; 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 f14-20020a056402160e00b005024da27f37si5192289edv.510.2023.03.29.07.14.02; Wed, 29 Mar 2023 07:14:03 -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="c5/jFc8N"; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=QofjbV83; 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 A917668C2F3; Wed, 29 Mar 2023 17:13:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wout4-smtp.messagingengine.com (unknown [64.147.123.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2721E68C2F3 for ; Wed, 29 Mar 2023 17:13:52 +0300 (EEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id EBE673200319 for ; Wed, 29 Mar 2023 10:13:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 29 Mar 2023 10:13:50 -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=1680099229; x=1680185629; bh=EQnRFXQYjJ yvlthmod6KQEFWTH5kLrlFhjypjg8x27Y=; b=c5/jFc8NTJHC5YBr5EXjUX7iyT rn9S9XQOH8bnCKSZJcu/7WZfXkEbMjDpuuQrS/pksWFOmwc1PLRjzB4lyKKMFlQK FU6qa6PJ39TGtdkyUvyt+FneqhUX5kho+qx3dgWwLAqMDSRluHxNuS6cGJ8Mm4Ue Hzi+gSh7pGs7RuD6F6HSVNUK1VTZbi/E+qVYmIz1dKLoqTJYQXTE+UAUCfk7BF9B vgVwc+akmilWFat7jgL1Lqkpt4gh7kCoVqB89jysAjoC4PLVABbVgaDwh1lB5hhp N9ZDXxWKyzkEq9k2zEoZZegVsNKhJLPR12Vr6CysLCtVlDITJcsDF9DN4OuQ== 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=1680099229; x=1680185629; bh=EQnRFXQYjJyvlthmod6KQEFWTH5k LrlFhjypjg8x27Y=; b=QofjbV83katUAZ4O34U6UQRtB4dTn3/Vf9OmoH6SYFYg yUG/LsFWbtKutV7g9UkOu3dQZ38i0aCs9LhqXGwzRyflLfct7WlTtX1LYZ8UCwS9 OUvLty/4N1ysXMgt4sjF+a8csTjMS6qls7ocLwV8xFzkY10gB33A9Laq8ltPO6iq KAbn0422TTPonU7kJVN47BqI/WdC2xvlfngVJIT2MQewE0VV4Z6Edj/0PMnOdsOU kVz7u9XzOGOS+SVYxmHPO0bQVZN13uMAi4aiz6fdDItso3YzPHDWaN1k6J0cGktf lBBG3haDi6+3fgATm0B4811rx5PdxCm4S0iuB4KhYQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehiedgjeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehjuggvkhesihhtrghnihhmuhhl rdhliheqnecuggftrfgrthhtvghrnhepueetgfdtuedvjeejjedvteelffeuhedtfeetud fglefhjeeukeetvddvtdevieeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomhepjhguvghksehithgrnhhimhhulhdrlhhi X-ME-Proxy: Feedback-ID: i84994747:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 29 Mar 2023 10:13:48 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Mar 2023 16:13:45 +0200 Message-Id: <20230329141346.3718-1-jdek@itanimul.li> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: eFv8RoR0xUa/ Signed-off-by: J. Dekker --- Will support other variants in the second version of these tests. tests/checkasm/Makefile | 2 +- tests/checkasm/checkasm.c | 1 + tests/checkasm/checkasm.h | 1 + tests/checkasm/hevc_deblock.c | 100 ++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 104 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..f73e68e8a6 --- /dev/null +++ b/tests/checkasm/hevc_deblock.c @@ -0,0 +1,100 @@ +/* + * 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] = { 0, 0 }; + // no_p, no_q can only be { 0,0 } for assembly functions, see deblocking_filter_CTB() in hevc_filter.c + 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); + + if (check_func(h.hevc_h_loop_filter_chroma, "hevc_h_loop_filter_chroma%d", bit_depth)) { + randomize_buffers(buf0, buf1, BUF_SIZE); + for (int i = 0; i < 4; i++) { + // see betatable[] in hevc_filter.c + tc[0] = (rnd() & 63) + (rnd() & 1); + tc[1] = (rnd() & 63) + (rnd() & 1); + + 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); + } + + if (check_func(h.hevc_v_loop_filter_chroma, "hevc_v_loop_filter_chroma%d", bit_depth)) { + randomize_buffers(buf0, buf1, BUF_SIZE); + for (int i = 0; i < 4; i++) { + // see betatable[] in hevc_filter.c + tc[0] = (rnd() & 63) + (rnd() & 1); + tc[1] = (rnd() & 63) + (rnd() & 1); + + 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 \