From patchwork Thu Aug 5 10:59:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 29291 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp289055ioh; Thu, 5 Aug 2021 03:59:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQTdIThSOpEU9B0xjiUH3/kca5FsH7gAfrBi0jF/5VNOaNzR2y52vwFxU2YJyrIsdUGPhS X-Received: by 2002:a17:906:a04f:: with SMTP id bg15mr4297877ejb.417.1628161157439; Thu, 05 Aug 2021 03:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628161157; cv=none; d=google.com; s=arc-20160816; b=UR7plJRF6CLwFvMQD+us9able+kYQY8j+o68GL6g561VguOfM2U+TaMJ7hKVnFFJLx xiK9t1Upp7aDF1JlsS9tWD2PR7nqT7gBjrkk6k+tBhCZ2z0Gja6NtpYKYmbWiQmA55o1 6BishDib2j0l7pJRBkVOTYbSMb9dtKPA1ErCgzkTQ+EU2hzigSM6YSyT81GaEWI8hkOQ evnFKXUVWilssnO7S1gDS7FzCF3aXTzqurc+fMzuqxgRBo4+thRXXmZ9yXzGJd+Uy3ye eyNpEu+nWLavxpREHGkI3R5vzkHo01izl+crujz+JgG5QbXZvOPvwu2KDYIUxOs0TwQO W2jQ== 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:dkim-signature:dkim-signature:delivered-to; bh=y8P79081FtsuPVeiFnCvt/PeDH0ubQgAqpENqPsy6fs=; b=x+H5TqtkQL5e+qh4eQzBaQ9A6j0UxNcg45Gr01wfq36ReM1XN+vCUAUP7ET7Imrpap Z/WutM9vNNrljX73RZhZojIysUaJEVViYVjJR+l6uqaq+6f8znZ0+lPKI5e5HiqdkIZI ArvVPhFMPPUxWcSZmcBCqPUdlZlBKjTwQk7InhXxgTN3Ot6GZjyeiSkWwN0HWpSF0nB3 qLZJCTgTCUP8ak1RsTTe9q8m5C4MJ6VCeN+BBSwOz8YrnQtDeJMAVovwdG6wu3f7J6b4 mZNqDFKvECJxPckjtHuc3L1lDyYaiuZLtVO8xOwcIsnczvHTKduSoR9ITHqqX1F/MTw0 DOsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm2 header.b="q/EU/qjx"; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=E40HVNju; 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 z25si5475341ejj.275.2021.08.05.03.59.16; Thu, 05 Aug 2021 03:59:17 -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=fm2 header.b="q/EU/qjx"; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=E40HVNju; 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 0C48468A4C5; Thu, 5 Aug 2021 13:59:13 +0300 (EEST) 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 30608680858 for ; Thu, 5 Aug 2021 13:59:06 +0300 (EEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 71E4B5C0069 for ; Thu, 5 Aug 2021 06:59:04 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 05 Aug 2021 06:59:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=Om2AsR5ZHHkS4 HPFKIs0HahST5ZwNrxwnGegQAGBswI=; b=q/EU/qjxpZfyGXuotirafozhEBjBZ fF0tV+uzE79wf2rlz2nIJ/mhy8OaFxFbxbIjvb0SstUvb5odnAjUbj5yZ9628GdH ftUb22oJBkjH69Et5h249paHyJPoAUoP+SUrYg5W1DI3WYVOKu5uOObyWrkcLPY4 wJTh41H3jVPpQfz8g8T+Q+i4U/Eqxw9ua83JqnYvNHdzPycTcXWamw0Otz45h182 mjz5Xoq5FSkmpj2NXLCB2GZrjcVBnpNrpvLI4Y7GI+fCg0tmDF3qC+ulunLYr1FJ 4nkzleEkQYqYIk99j20NmNEolF6IQEYAeRESptj+P3LiNxdTuguMYTWUw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=Om2AsR5ZHHkS4HPFKIs0HahST5ZwNrxwnGegQAGBswI=; b=E40HVNju gdGdbeBAFBVGX4VsHt9eeoqP3uu4aEhZx0s7SHqzA/8Dy5SVutJKmakXmezRcuvc GeFa3D22BAbQy8bsDPzWMcgm4w926UZbejykil+pPYPuM37WLKnx2Ec7+EgrQX8G 3BGvEYhsYYVTpyoV95ynRSHj6E2cam0Ux0HpxXoa/HQLsAVpvTNog2TFGEp0ZB+I AU0Vc6eE2ZKZon1GUZKPVXvFFQiXA/NXRfvuMnFXE6QJDIN0yEmEg04etl7a44mV ltQxZT7PqLvfazBIIk8bdhXdbV0p4qyGxEcwnYygJY+p+Q79zBLJ++ebEDF6gY18 lztRWGhOZXx6KQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrieelgdeffecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeegvdfhffduudegheevieekieeffefgveffke dtheekieefhfevueetueefhfetteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 5 Aug 2021 06:59:03 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 12:59:00 +0200 Message-Id: <20210805105901.33478-1-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210805082650.32639-1-jdek@itanimul.li> References: <20210805082650.32639-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] checkasm: add h264 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: c/INqhKs6zqj Signed-off-by: J. Dekker --- tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 + tests/checkasm/checkasm.h | 1 + tests/checkasm/h264chroma.c | 109 ++++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 115 insertions(+) create mode 100644 tests/checkasm/h264chroma.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 4ef5fa87da..41222c3827 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -6,6 +6,7 @@ AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o AVCODECOBJS-$(CONFIG_FLACDSP) += flacdsp.o AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o AVCODECOBJS-$(CONFIG_G722DSP) += g722dsp.o +AVCODECOBJS-$(CONFIG_H264CHROMA) += h264chroma.o AVCODECOBJS-$(CONFIG_H264DSP) += h264dsp.o AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o AVCODECOBJS-$(CONFIG_H264QPEL) += h264qpel.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index b1353f7cbe..154c4a5c01 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -104,6 +104,9 @@ static const struct { #if CONFIG_G722DSP { "g722dsp", checkasm_check_g722dsp }, #endif + #if CONFIG_H264CHROMA + { "h264chroma", checkasm_check_h264chroma }, + #endif #if CONFIG_H264DSP { "h264dsp", checkasm_check_h264dsp }, #endif diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 68b0697d3e..ac2f22af05 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -56,6 +56,7 @@ void checkasm_check_flacdsp(void); void checkasm_check_float_dsp(void); void checkasm_check_fmtconvert(void); void checkasm_check_g722dsp(void); +void checkasm_check_h264chroma(void); void checkasm_check_h264dsp(void); void checkasm_check_h264pred(void); void checkasm_check_h264qpel(void); diff --git a/tests/checkasm/h264chroma.c b/tests/checkasm/h264chroma.c new file mode 100644 index 0000000000..1f9773e345 --- /dev/null +++ b/tests/checkasm/h264chroma.c @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2015 Henrik Gramner + * Copyright (c) 2021 J. Dekker + * + * 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 "checkasm.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/h264chroma.h" +#include "libavutil/common.h" +#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mem_internal.h" + +// static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 }; +static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff }; + +#define SIZEOF_PIXEL ((bit_depth + 7) / 8) +#define BUF_SIZE (3 * 16 * 17) + +#define randomize_buffers() \ + do { \ + uint32_t mask = pixel_mask[bit_depth - 8]; \ + int i; \ + for (i = 0; i < BUF_SIZE; i += 4) { \ + uint32_t r = rnd() & mask; \ + AV_WN32A(buf0 + i, r); \ + AV_WN32A(buf1 + i, r); \ + } \ + } while (0) + +#define src0 (buf0 + 4 * 16) /* Offset to allow room for top and left */ +#define src1 (buf1 + 4 * 16) + +static void check_avg(void) +{ + int i, bit_depth, x, y; + LOCAL_ALIGNED_16(uint8_t, buf0, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, buf1, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, dst0, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, dst1, [BUF_SIZE]); + H264ChromaContext h; + + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y); + for (bit_depth = 8; bit_depth <= 10; bit_depth++) { + ff_h264chroma_init(&h, bit_depth); + for (i = 0; i < 4; i++) { + if (check_func(h.avg_h264_chroma_pixels_tab[i], "avg_chroma_mc%d_%d", 1 << (3 - i), bit_depth)) { + randomize_buffers(); + x = rnd() & 0x7; y = rnd() & 0x7; + call_ref(dst0, src0, 8, 4, x, y); + call_new(dst1, src1, 8, 4, x, y); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(dst1, src1, 8, 4, x, y); + } + } + } +} + +static void check_put(void) +{ + int i, bit_depth, x, y; + LOCAL_ALIGNED_16(uint8_t, buf0, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, buf1, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, dst0, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, dst1, [BUF_SIZE]); + H264ChromaContext h; + + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y); + for (bit_depth = 8; bit_depth <= 10; bit_depth++) { + ff_h264chroma_init(&h, bit_depth); + for (i = 0; i < 4; i++) { + if (check_func(h.put_h264_chroma_pixels_tab[i], "put_chroma_mc%d_%d", 1 << (3 - i), bit_depth)) { + randomize_buffers(); + x = rnd() & 0x7; y = rnd() & 0x7; + call_ref(dst0, src0, 8, 4, x, y); + call_new(dst1, src1, 8, 4, x, y); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(dst1, src1, 8, 4, x, y); + } + } + } +} + +void checkasm_check_h264chroma(void) +{ + check_avg(); + report("avg"); + check_put(); + report("put"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index cec6d28286..449f8f89f9 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -11,6 +11,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-float_dsp \ fate-checkasm-fmtconvert \ fate-checkasm-g722dsp \ + fate-checkasm-h264chroma \ fate-checkasm-h264dsp \ fate-checkasm-h264pred \ fate-checkasm-h264qpel \ From patchwork Thu Aug 5 10:59:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 29292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp289175ioh; Thu, 5 Aug 2021 03:59:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9of6a0SXd2PTEdYhxOaaw8rcj1yWQ6wsCzuMh8qrAk+0DX0L5Wgnyby4pzJ9PrIdRoXSb X-Received: by 2002:a17:906:b5b:: with SMTP id v27mr4153634ejg.170.1628161167181; Thu, 05 Aug 2021 03:59:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628161167; cv=none; d=google.com; s=arc-20160816; b=k169XUoD0te9BehqeIaucPVMixlr66B2lxnt7Op1PxsCpsVDCLzp/8qLfRWexOFH95 Ns8W5D+xHkdRXTzfEksqwKn0aFHw9mUiw5XiYUlpnM8PZD1ysi4XqXiBSx1EpEzPSNuL +pEthc9KNW62bWKB0yKvCj09+DZmBS0ULxVTredRJ3+rkYPS1ZXsdRi2GN4RLEu0l0bQ 3zRK+lASvRNsTPm80ef9n67zoWAYEcuRKT5gUAqA/3IKItkuZEMDCp5VNVOwt2KRGYRe f0DxmyFmj9PSYL7oFqprFDgig/bzSPKVqGKGi8fNRcpDhuPQa3cvYt/MYpRvhJtJUIc6 xkgA== 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:dkim-signature:dkim-signature:delivered-to; bh=0jH+44aJoAHxW+k5xSi1FCfBNuj8WAUAjp04/EcIv5g=; b=PqgrdMwz6kknH6c74yeO7goEj4pMS58yogOE7Bj+TJ+7T+uKhEBT1FcJ+mSRrNdgC2 GMK5HuRgaWycEBetsWtfkbP2ASyHr2CLXatSCLfCWe+aWh1tm7gfeYwWE2Dcw1SaremA 60s6TQFwjyVxXKQfg9Wc8JlWHMfpae77vW/2xbY5LsrJAjedii5UlRkDU4OVVzoHpSPU 8rXAK81qLWO/Vq+g6jZYwpDBULQVtKaXgpqKlHTO6gJjnaBBHawjqIgljtEx45sg1r5Z +MATOuoNit4J63qbj8FDkSg9zbtqduSWDKskXiQ/R8e/XBWVdM7Gev+YZkuMnYVZpG94 hIXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm2 header.b=snFvrl3n; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b="gfDUt/gN"; 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 v28si5171973eda.177.2021.08.05.03.59.26; Thu, 05 Aug 2021 03:59:27 -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=fm2 header.b=snFvrl3n; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b="gfDUt/gN"; 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 2F4FD68A4E5; Thu, 5 Aug 2021 13:59:14 +0300 (EEST) 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 43ED168A4A3 for ; Thu, 5 Aug 2021 13:59:06 +0300 (EEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 724F75C010B for ; Thu, 5 Aug 2021 06:59:05 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 05 Aug 2021 06:59:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=ro7oSSKGnLMao v8/JEr6G5kT03IVHjQm7GyIQH+XIw0=; b=snFvrl3nIVKM58L4+z5VKw1jNZ8q4 UYdkqYpbzUwUmQ31l665Y5vDGS9OXIhnimk/YJZEgLRZx+FWvorMs3I4i2hm/cvp xOq9cpyZkmS8cgG7fT7hGmPBv8MaPgb9rFMDcQ00eSaCUig6rxQCbedYxFZqeENc x6RJnUJc/W8PtBxOxEEg5oB4UAJGS7hOdoy6p2Kdl2sXKhGLPQSsnZcLWNQyuqmb 5s0emAYqQSxc2gM+x9GisBoNrxIdIe35pF5Q854hbd/av4u1T70YtrNyfMRsEH4i y7nralRJDqjfQu5sWP9dcJqv7cBmbZK0xl6PO0Pkonf49jA5u26awkQ0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=ro7oSSKGnLMaov8/JEr6G5kT03IVHjQm7GyIQH+XIw0=; b=gfDUt/gN iH6APVrIO7IQ3iccKWaiJO/bfGfLfvQOyH+ktiNJRa1wQSdXrIILna+apJFVo6Hw W/+/9EGXQGndO0/dsVZEOofIKemhJXpKvE88b/FwNEaX+CKGYw3GRcGpyX9nH/lO +911Ig+h8ZlFwZiJDzr6ieiWW79mJrV06pBZd/tD7TuzeAjjt9xQlRzcG8jBTLZs BUwufDfKQD1IYok6vyao7gau0zQ4/1VI2GGe4HSJ+xQwlDIbUevagC/If7KUxf76 mtOqwG5VW4ub8dA5+9oVKsSSEGhHDdKY93WJQNiTRSCLrDIeBcsZlY/yLAPu47rz Yf2eu3uziM+bdw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrieelgdeffecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeegvdfhffduudegheevieekieeffefgveffke dtheekieefhfevueetueefhfetteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 5 Aug 2021 06:59:04 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 12:59:01 +0200 Message-Id: <20210805105901.33478-2-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210805105901.33478-1-jdek@itanimul.li> References: <20210805082650.32639-1-jdek@itanimul.li> <20210805105901.33478-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] checkasm: add hevc_deblock tests 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: lEs+HlCyTglu Signed-off-by: J. Dekker --- tests/checkasm/Makefile | 2 +- tests/checkasm/checkasm.c | 1 + tests/checkasm/checkasm.h | 1 + tests/checkasm/hevc_deblock.c | 126 ++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 tests/checkasm/hevc_deblock.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 41222c3827..862142d8e6 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -25,7 +25,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 154c4a5c01..a1e8c4d92e 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -118,6 +118,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 ac2f22af05..386ecbf69a 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -61,6 +61,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..98f612921b --- /dev/null +++ b/tests/checkasm/hevc_deblock.c @@ -0,0 +1,126 @@ +/* + * 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_luma(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 }; + int beta = rnd() & (0x40 - 1); + 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, int beta, 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_luma, "hevc_h_loop_filter_luma_%d", bit_depth)) { + call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + } + + randomize_buffers(buf0, buf1, BUF_SIZE); + if (check_func(h.hevc_v_loop_filter_luma, "hevc_v_loop_filter_luma_%d", bit_depth)) { + call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + } +} + +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_luma(h, bit_depth); + } + report("deblock_luma"); + + 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("deblock_chroma"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index 449f8f89f9..a300caad08 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -16,6 +16,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 \