From patchwork Sun Jun 16 22:28:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 49956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1596788vqg; Sun, 16 Jun 2024 15:29:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVKFP2XBiWHtHUYY9kxVE623ZfynoWigqWqjkJfAqFuCRdbwFDnnWZVFlBT7u2YagnQYTrbp48/vPWNDdEwwqvv6kq5d6GMsTOjw== X-Google-Smtp-Source: AGHT+IG5Cc2laVJLq8EnQ25iofBcGmz3OkmiNYFNYfJ1j8/O05vg7GmE9u55tUk1MFw5/9zBcPdC X-Received: by 2002:a05:6512:220b:b0:52c:9adc:3527 with SMTP id 2adb3069b0e04-52ca6e8fd4cmr6665449e87.47.1718576985042; Sun, 16 Jun 2024 15:29:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718576985; cv=none; d=google.com; s=arc-20160816; b=kWZUWXupq8qR+ETg8zE7DoUIHgQNSW5QMafvbjHLXZVpI8t/WRyVwodSPCeCjtB8kj 2b0gwB0lF/7xCFl6SWclDCQEm55ewZcAZnOxk8Pjw0O5MlkdvuBxlBzomG/S+3LJ1jfY twooP9MNtuhyMIzrtwukHHvGXV8O+uzRny6z5Y5W/qs+iDnz9bLbYOPd2kbqmq5h7Xlk znr98W76bdaysuPL9UX9AsLoyC+Im8R9/8fJeVVZPCH6t+jutCCdsu9XvdCjsfMXNm58 fltTv4TaBMTZJ6k7RAtHesGO47rHmyV+s2fWGVES4KoIgx4qRilL9n/8a5s2kJBflRaa QMTw== 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=w0Qmhw+lUREA90c+iBdNiYfEcxPWrJG7+2apKS7AW8E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=SuXDqv3udf9LimYAEFPjan190nOB0h8z90zQqkmKibyBuUwEdNVsglAGw19l0xQPnR vTzTaX/X+FiN6BZzh2/JwnYV6HGST3pClt7hbFQOIT/9T6YaT5bn0FDe6LTMdTui+Eye VCWYKyz7y29MC32ds4LLBYbWMDBk3U4u53FKBZ4PXnk4xD8BnLFEwCdz0wJX0Ukewpox O5L0WSQnYO1UcXY7gpEIdQ6lOOiyfQz/2CHWPKV4AUTZWNhXk69xDyQzx0SVwht+K2iO DNJE5GGU9ax0zsA26CGrYkb7WufYPqAGswUgrVB7+sYzkSOiy1emFCg7v0fLdl+4bQoh iD1A==; 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=NZ+xLWJU; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52ca2872d11si2363977e87.264.2024.06.16.15.29.44; Sun, 16 Jun 2024 15:29:45 -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=NZ+xLWJU; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BB4368D754; Mon, 17 Jun 2024 01:29:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6579D68D602 for ; Mon, 17 Jun 2024 01:28:56 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-421a1b834acso32014665e9.3 for ; Sun, 16 Jun 2024 15:28:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718576935; x=1719181735; 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=102lhfYsYeL4PXusCzWQzuZbXm5lXGq8wj5ER3l8bZc=; b=NZ+xLWJUXrrEStud0UUZWAFeXTX/p/tfKkk+SCyHj3m5/I5qLH3QHD0Tn3qAd2idNy h44cKc3VkghukRHeHtCLmwtj2oAZYBFi6wSM5qFLrzUEtoQ1boLVWPAnaGpscNnA5kD6 u5a/L3l+BkN/lxAL4a5GLxgESPi4+HisyJxKMfTJjV4tHihe3L+e/IPI13LWzM+p7rpf 6BKDEvN4Hgfk+qSxgvm0tagoKGctNluATVWvGvatFlRHeKK7nQI6F+mjyfAj8XQiooK5 LLrCh/JfW/WQOzQdD22hh2ND3nwszG1xuSFBiZe5Iu/FIgLH/9w8tpy8YLsqx9l/PDpP RveA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718576935; x=1719181735; 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=102lhfYsYeL4PXusCzWQzuZbXm5lXGq8wj5ER3l8bZc=; b=vw5tSKJl3qlXaeVIUoHcAc87lquz9t08AhWcM0R/3gjzA27nNtxozRAPgeicOHdFh4 eKXtoivQO8hWa4WDxUUkNITJb/kwjy39KWHIXlbthBeDPaVsZMj9df5Kjkv/ddQCkAr6 yISbvKHDZxb4yFPGm+Ki1Pab2KFIgXzKbFxDEgpmY8BVTm//n3P+QXHBCgeB53CxKktI VEl0IjE4oF+IjW0nNWHaC7//fGvSyfujBNltPL0+WMfuPg62pldc9O11YGlTOeI7iSsK 2nHfjUJssZ+2XhlrzYxdY1XIBi+5rRP/CzcKlTRwa1ApY6kx05jGzb+oxLJklIPyJ8hi aW0g== X-Gm-Message-State: AOJu0YykaDRWpkDxCA2lSMlrOpkiXVDpQoV5OimQSSHBMeeOzBr9ghGF jxeUG2X3rOxvWR+R64Dig1DqPVUxCSlaM8pXG9Qrordun2GFa0p8XI8HuA== X-Received: by 2002:a05:600c:3551:b0:41a:b30e:42a3 with SMTP id 5b1f17b1804b1-4230485b9e3mr59518415e9.37.1718576935286; Sun, 16 Jun 2024 15:28:55 -0700 (PDT) Received: from localhost.localdomain (247.111-201-80.adsl-dyn.isp.belgacom.be. [80.201.111.247]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-360750ad082sm10349146f8f.59.2024.06.16.15.28.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Jun 2024 15:28:54 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2024 00:28:48 +0200 Message-Id: <20240616222849.420361-5-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240616222849.420361-1-ramiro.polla@gmail.com> References: <20240616222849.420361-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] checkasm: add tests for yuv2rgb 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: iIj78VLFGzHD --- tests/checkasm/Makefile | 2 +- tests/checkasm/checkasm.c | 1 + tests/checkasm/checkasm.h | 1 + tests/checkasm/sw_yuv2rgb.c | 205 ++++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 tests/checkasm/sw_yuv2rgb.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index f20732b37a..3a7670e24b 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -63,7 +63,7 @@ AVFILTEROBJS-$(CONFIG_SOBEL_FILTER) += vf_convolution.o CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes) # swscale tests -SWSCALEOBJS += sw_gbrp.o sw_range_convert.o sw_rgb.o sw_scale.o +SWSCALEOBJS += sw_gbrp.o sw_range_convert.o sw_rgb.o sw_scale.o sw_yuv2rgb.o CHECKASMOBJS-$(CONFIG_SWSCALE) += $(SWSCALEOBJS) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 56232ab1e0..d9ac772a08 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -254,6 +254,7 @@ static const struct { { "sw_range_convert", checkasm_check_sw_range_convert }, { "sw_rgb", checkasm_check_sw_rgb }, { "sw_scale", checkasm_check_sw_scale }, + { "sw_yuv2rgb", checkasm_check_sw_yuv2rgb }, #endif #if CONFIG_AVUTIL { "fixed_dsp", checkasm_check_fixed_dsp }, diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index e544007b67..4d5f3e387e 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -122,6 +122,7 @@ void checkasm_check_sw_gbrp(void); void checkasm_check_sw_range_convert(void); void checkasm_check_sw_rgb(void); void checkasm_check_sw_scale(void); +void checkasm_check_sw_yuv2rgb(void); void checkasm_check_takdsp(void); void checkasm_check_utvideodsp(void); void checkasm_check_v210dec(void); diff --git a/tests/checkasm/sw_yuv2rgb.c b/tests/checkasm/sw_yuv2rgb.c new file mode 100644 index 0000000000..fbe01a7788 --- /dev/null +++ b/tests/checkasm/sw_yuv2rgb.c @@ -0,0 +1,205 @@ +/* + * 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/common.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mem_internal.h" +#include "libavutil/pixdesc.h" + +#include "libswscale/swscale.h" +#include "libswscale/swscale_internal.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 const int dst_fmts[] = { +// AV_PIX_FMT_BGR48BE, +// AV_PIX_FMT_BGR48LE, +// AV_PIX_FMT_RGB48BE, +// AV_PIX_FMT_RGB48LE, + AV_PIX_FMT_ARGB, + AV_PIX_FMT_ABGR, + AV_PIX_FMT_RGBA, + AV_PIX_FMT_BGRA, + AV_PIX_FMT_RGB24, + AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGB565, + AV_PIX_FMT_BGR565, + AV_PIX_FMT_RGB555, + AV_PIX_FMT_BGR555, +// AV_PIX_FMT_RGB444, +// AV_PIX_FMT_BGR444, +// AV_PIX_FMT_RGB8, +// AV_PIX_FMT_BGR8, +// AV_PIX_FMT_RGB4, +// AV_PIX_FMT_BGR4, +// AV_PIX_FMT_RGB4_BYTE, +// AV_PIX_FMT_BGR4_BYTE, +// AV_PIX_FMT_MONOBLACK, +}; + +static int cmp_off_by_n(const uint8_t *ref, const uint8_t *test, size_t n, int accuracy) +{ + for (size_t i = 0; i < n; i++) { + if (abs(ref[i] - test[i]) > accuracy) + return 1; + } + return 0; +} + +static int cmp_555_by_n(const uint8_t *ref, const uint8_t *test, size_t n, int accuracy) +{ + const uint16_t *ref16 = (const uint16_t *) ref; + const uint16_t *test16 = (const uint16_t *) test; + for (size_t i = 0; i < n; i++) { + if (abs(( ref16[i] & 0x1f) - ( test16[i] & 0x1f)) > accuracy) + return 1; + if (abs(((ref16[i] >> 5) & 0x1f) - ((test16[i] >> 5) & 0x1f)) > accuracy) + return 1; + if (abs(((ref16[i] >> 10) & 0x1f) - ((test16[i] >> 10) & 0x1f)) > accuracy) + return 1; + } + return 0; +} + +static int cmp_565_by_n(const uint8_t *ref, const uint8_t *test, size_t n, int accuracy) +{ + const uint16_t *ref16 = (const uint16_t *) ref; + const uint16_t *test16 = (const uint16_t *) test; + for (size_t i = 0; i < n; i++) { + if (abs(( ref16[i] & 0x1f) - ( test16[i] & 0x1f)) > accuracy) + return 1; + if (abs(((ref16[i] >> 5) & 0x3f) - ((test16[i] >> 5) & 0x3f)) > accuracy) + return 1; + if (abs(((ref16[i] >> 11) & 0x1f) - ((test16[i] >> 11) & 0x1f)) > accuracy) + return 1; + } + return 0; +} + +static void check_yuv2rgb(int src_pix_fmt) +{ + const AVPixFmtDescriptor *src_desc = av_pix_fmt_desc_get(src_pix_fmt); +#define MAX_LINE_SIZE 1920 + static const int input_sizes[] = {8, 128, 1080, MAX_LINE_SIZE}; + + declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, + int, SwsContext *c, const uint8_t *src[], + int srcStride[], int srcSliceY, int srcSliceH, + uint8_t *dst[], int dstStride[]); + + LOCAL_ALIGNED_8(uint8_t, src_y, [MAX_LINE_SIZE * 2]); + LOCAL_ALIGNED_8(uint8_t, src_u, [MAX_LINE_SIZE]); + LOCAL_ALIGNED_8(uint8_t, src_v, [MAX_LINE_SIZE]); + LOCAL_ALIGNED_8(uint8_t, src_a, [MAX_LINE_SIZE * 2]); + const uint8_t *src[4] = { src_y, src_u, src_v, src_a }; + + LOCAL_ALIGNED_8(uint8_t, dst0_, [2 * MAX_LINE_SIZE * 6]); + uint8_t *dst0[4] = { dst0_ }; + uint8_t *lines0[2] = { dst0_, dst0_ + MAX_LINE_SIZE * 6 }; + + LOCAL_ALIGNED_8(uint8_t, dst1_, [2 * MAX_LINE_SIZE * 6]); + uint8_t *dst1[4] = { dst1_ }; + uint8_t *lines1[2] = { dst1_, dst1_ + MAX_LINE_SIZE * 6 }; + + randomize_buffers(src_y, MAX_LINE_SIZE * 2); + randomize_buffers(src_u, MAX_LINE_SIZE); + randomize_buffers(src_v, MAX_LINE_SIZE); + randomize_buffers(src_a, MAX_LINE_SIZE * 2); + + for (int dfi = 0; dfi < FF_ARRAY_ELEMS(dst_fmts); dfi++) { + int dst_pix_fmt = dst_fmts[dfi]; + const AVPixFmtDescriptor *dst_desc = av_pix_fmt_desc_get(dst_pix_fmt); + int sample_size = av_get_padded_bits_per_pixel(dst_desc) >> 3; + for (int isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++) { + struct SwsContext *ctx; + int width = input_sizes[isi]; + int srcSliceY = 0; + int srcSliceH = 2; + int srcStride[4] = { + width, + width >> src_desc->log2_chroma_w, + width >> src_desc->log2_chroma_w, + width, + }; + int dstStride[4] = { MAX_LINE_SIZE * 6 }; + + ctx = sws_getContext(width, srcSliceH, src_pix_fmt, + width, srcSliceH, dst_pix_fmt, + 0, NULL, NULL, NULL); + if (!ctx) + fail(); + + if (check_func(ctx->convert_unscaled, "%s_%s_%d", src_desc->name, dst_desc->name, width)) { + memset(dst0_, 0xFF, 2 * MAX_LINE_SIZE * 6); + memset(dst1_, 0xFF, 2 * MAX_LINE_SIZE * 6); + + call_ref(ctx, src, srcStride, srcSliceY, + srcSliceH, dst0, dstStride); + call_new(ctx, src, srcStride, srcSliceY, + srcSliceH, dst1, dstStride); + + if (dst_pix_fmt == AV_PIX_FMT_ARGB || + dst_pix_fmt == AV_PIX_FMT_ABGR || + dst_pix_fmt == AV_PIX_FMT_RGBA || + dst_pix_fmt == AV_PIX_FMT_BGRA || + dst_pix_fmt == AV_PIX_FMT_RGB24 || + dst_pix_fmt == AV_PIX_FMT_BGR24) { + if (cmp_off_by_n(lines0[0], lines1[0], width * sample_size, 3) || + cmp_off_by_n(lines0[1], lines1[1], width * sample_size, 3)) + fail(); + } else if (dst_pix_fmt == AV_PIX_FMT_RGB565 || + dst_pix_fmt == AV_PIX_FMT_BGR565) { + if (cmp_565_by_n(lines0[0], lines1[0], width, 2) || + cmp_565_by_n(lines0[1], lines1[1], width, 2)) + fail(); + } else if (dst_pix_fmt == AV_PIX_FMT_RGB555 || + dst_pix_fmt == AV_PIX_FMT_BGR555) { + if (cmp_555_by_n(lines0[0], lines1[0], width, 2) || + cmp_555_by_n(lines0[1], lines1[1], width, 2)) + fail(); + } else { + fail(); + } + + bench_new(ctx, src, srcStride, srcSliceY, + srcSliceH, dst0, dstStride); + } + sws_freeContext(ctx); + } + } +} + +#undef MAX_LINE_SIZE + +void checkasm_check_sw_yuv2rgb(void) +{ + check_yuv2rgb(AV_PIX_FMT_YUV420P); + report("yuv420p"); + check_yuv2rgb(AV_PIX_FMT_YUV422P); + report("yuv422p"); + check_yuv2rgb(AV_PIX_FMT_YUVA420P); + report("yuva420p"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index 0ed2ea5be6..49832b09bf 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -44,6 +44,7 @@ FATE_CHECKASM = fate-checkasm-aacencdsp \ fate-checkasm-sw_range_convert \ fate-checkasm-sw_rgb \ fate-checkasm-sw_scale \ + fate-checkasm-sw_yuv2rgb \ fate-checkasm-takdsp \ fate-checkasm-utvideodsp \ fate-checkasm-v210dec \