From patchwork Wed Aug 21 14:55:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 51108 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:4062:b0:48e:c0f8:d0de with SMTP id kz34csp688912vqb; Wed, 21 Aug 2024 14:31:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWh0iQIYiyoOGfxgooctTQs0nV9UxDkfjq2ujkCzl8SFFH+khZDGWhqDM03zuIAYgtVplm6QtfZohTeMY6GuWft@gmail.com X-Google-Smtp-Source: AGHT+IEQObJDxjn9ryL50h5VeFz2AWzLka/oz9i7oZq2fdftzncSSJ97hzhnlfO94CsIABdwkps0 X-Received: by 2002:a05:651c:212a:b0:2ef:2373:5f90 with SMTP id 38308e7fff4ca-2f3f8720e22mr11934681fa.0.1724275878795; Wed, 21 Aug 2024 14:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724275878; cv=none; d=google.com; s=arc-20160816; b=SZiHBX4PYR/TURCs+qOROLs3ZbcYT/YSv2p1ld8+nsIWDLF/x1kZcNi7EnVIQ67cZe /YRUO48IqOqdoiDsJAK/KSran+Oo3G2q5DjBPPBoazB9F1FO7o6z2lVataZCGUvWmPRW suIPFooBKKs+TcjyYxAp0eS+wz8r6YHryFw0fTv8Qcus0jixrhCMqhnJZgJ2cSUauiSz LhRYhMRO7IJCGqM2dxo54VqU1QndFru7plX4XiTZd2xDR4bQM5b/KmPZVPWR4a8OOIie B3GIDq163kRgnuFeRfvBoO/nsZhYubxn2b2rwS9dTyrw09U2uCtOLqDZKtRc+g09j37n JbEw== 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:delivered-to; bh=FjqhPYmnFQtygoztVVIL7OClGzN2nVwhd96PMa/mL4M=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=dHuvjEohIw2LxJuXoN5WZuNv4/SajtzclWwif26nW/qa/3Fnp14tOaJ2q/J8fIq7I8 Pma2oLvUjJn/Y/w3eSX8HOHLY5HKtRlpDYSNQ7wWKBna79urqUcON7UVdYI1cL0dPPJn g2WRBlfB4lUdLxOHTvM9SVKPB8IBoW7/Y6r9sKfw9lMeyI1e7KRqEsloahLcDLnRiTNv RmE6Uy5qT3YfV3RkCp9M0HwVf2HsSFKkJtrETt3N+IFWcf/TbI3d5t8YlfYxgzCflDpv GxVtMqWJGupbcCad1SQZ95RVkRy/1AZVVIjXXPbhliVEf40MHvcZuQcf/FjKwken8g9w QvZw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="Zjgq/Z4/"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c04a3d28c1si80782a12.171.2024.08.21.14.31.18; Wed, 21 Aug 2024 14:31:18 -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=@gmail.com header.s=20230601 header.b="Zjgq/Z4/"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6FB968DC2A; Wed, 21 Aug 2024 17:56:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22A6968DAF8 for ; Wed, 21 Aug 2024 17:56:01 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3719753d365so3916192f8f.2 for ; Wed, 21 Aug 2024 07:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724252160; x=1724856960; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7P6ur6hdfqL32kqkL2wiEZ+qGRxSD1ITEguf7RH4LYs=; b=Zjgq/Z4/w+uzCn/UDoo+9FkfZRLQdXCAtkpeI2Af8+02ys8hiGwKg7qaMQKaAbW32q lCDa6IkZHKwfpvMa3hkOGoyhudgLdZECOb/CQ5shpD0VGZW5pKP7Agv7EtQ7zargDSuW CSL28FtDJUuF3t6a9z2UgDahr4uNpI1CXExlCBgfWgYNrvI0iLP7zkks6VcyumGaJhpR IBtNOPVRGbme2Kc06AXQS93oO22mdg3KK7u7uTRSW+d3lJrWqkrGAZJJvqC0DJmg+92f U4HCIUknkqqjTFtx6RuyZQ4F2VA1FLa6nVSAQ11tpa5ndC+sIdBp3Hc8BLvISdyS2M6S SIgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724252160; x=1724856960; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7P6ur6hdfqL32kqkL2wiEZ+qGRxSD1ITEguf7RH4LYs=; b=OKCbg5vcHydx7AJMsXCbkxMxFYNPl9gcawPJgPdQdbBidLtHTpO8iom4n8nBh5PhGm Jwqz3FQ9PFIxsDjBIxEtnyTLX8JXKeoupwwk6hi+7ZGPrApWbngjOdPRAOKsU6FaJi2w kzMsa3fSsaHai0MliWQUPt5P33KCqRqmUIlrO6ODFTgbQBDGpAQo7KfTK6izVsaYZCbL H2MUxogpMeEq49tC+3L6wuy1zDaLHykWKJ0qF0nErQQ6WuW5jDKenQdYhGjpg2MifMKd +kAhTLIbfPcEkrao2OLKmR5TTKcq8PP7OTishp2mP4ayW3m8+mrn63udmLacQLacgigB 12Zg== X-Gm-Message-State: AOJu0YxCHGXKmPKQsJ3ImFkgaCBVzdo4vdFeSyJNZfQLZyxJ5UflHErR zVyWvtDI7Ih7Ums+NHuq8eBmuMaIoTOBRS1PWA2X3L61XLONDHLiXx2lPUP2 X-Received: by 2002:a5d:634c:0:b0:36b:a3c7:b9fd with SMTP id ffacd0b85a97d-372fd7297cbmr1715575f8f.56.1724252159515; Wed, 21 Aug 2024 07:55:59 -0700 (PDT) Received: from localhost.localdomain (196.105-180-91.adsl-dyn.isp.belgacom.be. [91.180.105.196]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37189896c50sm15873554f8f.85.2024.08.21.07.55.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 07:55:58 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Aug 2024 16:55:50 +0200 Message-Id: <20240821145555.235323-3-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240821145555.235323-1-ramiro.polla@gmail.com> References: <20240821145555.235323-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/7] checkasm/mpegvideoencdsp: add pix_sum, pix_norm1, and draw_edges 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: jiCI9PMemayN --- tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 + tests/checkasm/checkasm.h | 1 + tests/checkasm/mpegvideoencdsp.c | 147 +++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 153 insertions(+) create mode 100644 tests/checkasm/mpegvideoencdsp.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 3a7670e24b..7da58c14c4 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -18,6 +18,7 @@ AVCODECOBJS-$(CONFIG_LLVIDDSP) += llviddsp.o AVCODECOBJS-$(CONFIG_LLVIDENCDSP) += llviddspenc.o AVCODECOBJS-$(CONFIG_LPC) += lpc.o AVCODECOBJS-$(CONFIG_ME_CMP) += motion.o +AVCODECOBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideoencdsp.o AVCODECOBJS-$(CONFIG_VC1DSP) += vc1dsp.o AVCODECOBJS-$(CONFIG_VP8DSP) += vp8dsp.o AVCODECOBJS-$(CONFIG_VIDEODSP) += videodsp.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 58597d3888..0bba4fb295 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -170,6 +170,9 @@ static const struct { #if CONFIG_ME_CMP { "motion", checkasm_check_motion }, #endif + #if CONFIG_MPEGVIDEOENC + { "mpegvideoencdsp", checkasm_check_mpegvideoencdsp }, + #endif #if CONFIG_OPUS_DECODER { "opusdsp", checkasm_check_opusdsp }, #endif diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 4d5f3e387e..ba7e8c1ea0 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -110,6 +110,7 @@ void checkasm_check_llviddsp(void); void checkasm_check_llviddspenc(void); void checkasm_check_lpc(void); void checkasm_check_motion(void); +void checkasm_check_mpegvideoencdsp(void); void checkasm_check_nlmeans(void); void checkasm_check_opusdsp(void); void checkasm_check_pixblockdsp(void); diff --git a/tests/checkasm/mpegvideoencdsp.c b/tests/checkasm/mpegvideoencdsp.c new file mode 100644 index 0000000000..9d000b93a6 --- /dev/null +++ b/tests/checkasm/mpegvideoencdsp.c @@ -0,0 +1,147 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "libavutil/intreadwrite.h" +#include "libavutil/mem.h" +#include "libavutil/mem_internal.h" + +#include "libavcodec/mpegvideoencdsp.h" + +#include "checkasm.h" + +#define randomize_buffers(buf, size) \ + do { \ + for (int j = 0; j < size; j += 4) \ + AV_WN32(buf + j, rnd()); \ + } while (0) + +static void check_pix_sum(MpegvideoEncDSPContext *c) +{ + LOCAL_ALIGNED_16(uint8_t, src, [16 * 16]); + + declare_func(int, const uint8_t *pix, int line_size); + + randomize_buffers(src, 16 * 16); + + for (int n = 0; n < 2; n++) { + const char *negstride_str = n ? "_negstride" : ""; + if (check_func(c->pix_sum, "pix_sum%s", negstride_str)) { + int sum0, sum1; + const uint8_t *pix = src + (n ? (15 * 16) : 0); + int line_size = 16 * (n ? -1 : 1); + sum0 = call_ref(pix, line_size); + sum1 = call_new(pix, line_size); + if (sum0 != sum1) + fail(); + bench_new(pix, line_size); + } + } +} + +static void check_pix_norm1(MpegvideoEncDSPContext *c) +{ + LOCAL_ALIGNED_16(uint8_t, src, [16 * 16]); + + declare_func(int, const uint8_t *pix, int line_size); + + randomize_buffers(src, 16 * 16); + + for (int n = 0; n < 2; n++) { + const char *negstride_str = n ? "_negstride" : ""; + if (check_func(c->pix_norm1, "pix_norm1%s", negstride_str)) { + int sum0, sum1; + const uint8_t *pix = src + (n ? (15 * 16) : 0); + int line_size = 16 * (n ? -1 : 1); + sum0 = call_ref(pix, line_size); + sum1 = call_new(pix, line_size); + if (sum0 != sum1) + fail(); + bench_new(pix, line_size); + } + } +} + +#define NUM_LINES 4 +#define MAX_LINE_SIZE 1920 +#define EDGE_WIDTH 16 +#define LINESIZE (EDGE_WIDTH + MAX_LINE_SIZE + EDGE_WIDTH) +#define BUFSIZE ((EDGE_WIDTH + NUM_LINES + EDGE_WIDTH) * LINESIZE) + +static void check_draw_edges(MpegvideoEncDSPContext *c) +{ + static const int input_sizes[] = {8, 128, 1080, MAX_LINE_SIZE, -MAX_LINE_SIZE}; + LOCAL_ALIGNED_16(uint8_t, buf0, [BUFSIZE]); + LOCAL_ALIGNED_16(uint8_t, buf1, [BUFSIZE]); + + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *buf, int wrap, int width, int height, + int w, int h, int sides); + + for (int isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++) { + int input_size = input_sizes[isi]; + int negstride = input_size < 0; + const char *negstride_str = negstride ? "_negstride" : ""; + int width = FFABS(input_size); + int linesize = EDGE_WIDTH + width + EDGE_WIDTH; + /* calculate height based on specified width to use the entire buffer. */ + int height = (BUFSIZE / linesize) - (2 * EDGE_WIDTH); + uint8_t *dst0 = buf0 + EDGE_WIDTH * linesize + EDGE_WIDTH; + uint8_t *dst1 = buf1 + EDGE_WIDTH * linesize + EDGE_WIDTH; + + if (negstride) { + dst0 += (height - 1) * linesize; + dst1 += (height - 1) * linesize; + linesize *= -1; + } + + for (int shift = 0; shift < 3; shift++) { + int edge = EDGE_WIDTH >> shift; + if (check_func(c->draw_edges, "draw_edges_%d_%d_%d%s", width, height, edge, negstride_str)) { + randomize_buffers(buf0, BUFSIZE); + memcpy(buf1, buf0, BUFSIZE); + call_ref(dst0, linesize, width, height, edge, edge, EDGE_BOTTOM | EDGE_TOP); + call_new(dst1, linesize, width, height, edge, edge, EDGE_BOTTOM | EDGE_TOP); + if (memcmp(buf0, buf1, BUFSIZE)) + fail(); + bench_new(dst1, linesize, width, height, edge, edge, EDGE_BOTTOM | EDGE_TOP); + } + } + } +} + +#undef NUM_LINES +#undef MAX_LINE_SIZE +#undef EDGE_WIDTH +#undef LINESIZE +#undef BUFSIZE + +void checkasm_check_mpegvideoencdsp(void) +{ + AVCodecContext avctx = { + .bits_per_raw_sample = 8, + }; + MpegvideoEncDSPContext c = { 0 }; + + ff_mpegvideoencdsp_init(&c, &avctx); + + check_pix_sum(&c); + report("pix_sum"); + check_pix_norm1(&c); + report("pix_norm1"); + check_draw_edges(&c); + report("draw_edges"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index 49832b09bf..5f8ed7584f 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -33,6 +33,7 @@ FATE_CHECKASM = fate-checkasm-aacencdsp \ fate-checkasm-llviddspenc \ fate-checkasm-lpc \ fate-checkasm-motion \ + fate-checkasm-mpegvideoencdsp \ fate-checkasm-opusdsp \ fate-checkasm-pixblockdsp \ fate-checkasm-sbrdsp \