From patchwork Fri May 24 15:59:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 49205 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1835690vqf; Fri, 24 May 2024 08:59:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWAu4qWkmKPadRayw5qM9EAEUmf4zqk+PPEiTS4Ddl8oMA+tfKqPJcwW85QyeyUpNy5TugfTDkJVbkc+CjKP89+LiD4rAPC8Ut5yQ== X-Google-Smtp-Source: AGHT+IEvXPh3FUVChyvvhcNeEfLfANTyuZeoxO17W3pVV7fBsIbLSyZMrqPwwxjK43j3TCs+Hq2x X-Received: by 2002:a50:ab41:0:b0:575:2a03:8ff6 with SMTP id 4fb4d7f45d1cf-57843f074cdmr4627891a12.16.1716566397644; Fri, 24 May 2024 08:59:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716566397; cv=none; d=google.com; s=arc-20160816; b=wjdv/RpzzecRnQ9dIJBJh1R3wg4cUdjBiWmk6W9Lhh9r5mhhjqD5dz3EBEFvXNaZE7 PyOy5RJy2Be8qWXeBzCN5nGS6C8RlrRKmEkSJ3gBq9gFZhNJown0Xa6dMHIpNkgnihve 6SbPIukii9ujpdjBouurAvmwXsQSH7liBJdNVEWUfdfrKZfPuLSa5xV/xPI6FRHq+IRN 7vjXY5VJQH/rxHoVRcLYPNiaUdqE7/snT365AL0O/dYzn5itUynX/suAOyW5X6hEUe5C MmLif3BK07Nd75+zERFduDcIOYSalDKgkjO+C/xXts1lxGOOh0QelQZ1Q6/g37S2RdXI R6vg== 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:delivered-to; bh=k5iAcO+LMjIDTjr4rhSKpnHCC3ybvZcDPGW+w55QL5w=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ODm3ZAZsYh1lcYLKhKVR+85ul+kuWs5QzopCtpu+TQcnvMB1sKd2+VwhCuzX5NrMei 9QJA1ygMwBfKYHK8ELUOfw1UZSeLJsys5BSpz4oEAzAWWgGmR837qpR5TJHa7TkWzQ0P TW0TeEqJ0ZfYM10oE59rLGw1EE7kEWy5QWrWqNmw1ahcW7CHFXRoYNnCU4IrVngz3BdX AUhVP+7k7LvM+F7HOOiUqLxsson7b7WvmKGKXfDMdp0Ss5tcGqdbCYWQWLCMGXUTFV/f Kb5aKnQYhjnK3EfVyo1b9a2DhsTgW3ANZiKTDBu7D9IAtCJP5QAItHSPKgPAsFSur5v4 bg3Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 4fb4d7f45d1cf-578524b660fsi1021326a12.558.2024.05.24.08.59.56; Fri, 24 May 2024 08:59:57 -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; 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 4545668D545; Fri, 24 May 2024 18:59:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE4A868D222 for ; Fri, 24 May 2024 18:59:36 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 288A9C01F0 for ; Fri, 24 May 2024 18:59:36 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 18:59:35 +0300 Message-ID: <20240524155935.28531-2-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240524155935.28531-1-remi@remlab.net> References: <20240524155935.28531-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] checkasm/vp8dsp: add VP7 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: lWTdFyZy7C87 --- tests/checkasm/vp8dsp.c | 57 ++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/tests/checkasm/vp8dsp.c b/tests/checkasm/vp8dsp.c index 12d2f62f2d..e448fe89fc 100644 --- a/tests/checkasm/vp8dsp.c +++ b/tests/checkasm/vp8dsp.c @@ -18,8 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include +#include "config_components.h" #include "libavcodec/vp8dsp.h" #include "libavutil/common.h" @@ -108,7 +110,7 @@ static void wht4x4(int16_t *coef) } } -static void check_idct(VP8DSPContext *d) +static void check_idct(VP8DSPContext *d, bool is_vp7) { LOCAL_ALIGNED_16(uint8_t, src, [4 * 4]); LOCAL_ALIGNED_16(uint8_t, dst, [4 * 4]); @@ -127,7 +129,7 @@ static void check_idct(VP8DSPContext *d) for (dc = 0; dc <= 1; dc++) { void (*idct)(uint8_t *, int16_t *, ptrdiff_t) = dc ? d->vp8_idct_dc_add : d->vp8_idct_add; - if (check_func(idct, "vp8_idct_%sadd", dc ? "dc_" : "")) { + if (check_func(idct, "vp%d_idct_%sadd", 8 - is_vp7, dc ? "dc_" : "")) { if (dc) { memset(subcoef0, 0, 4 * 4 * sizeof(int16_t)); subcoef0[0] = coef[0]; @@ -151,7 +153,7 @@ static void check_idct(VP8DSPContext *d) } } -static void check_idct_dc4(VP8DSPContext *d) +static void check_idct_dc4(VP8DSPContext *d, bool is_vp7) { LOCAL_ALIGNED_16(uint8_t, src, [4 * 4 * 4]); LOCAL_ALIGNED_16(uint8_t, dst, [4 * 4 * 4]); @@ -165,7 +167,7 @@ static void check_idct_dc4(VP8DSPContext *d) for (chroma = 0; chroma <= 1; chroma++) { void (*idct4dc)(uint8_t *, int16_t[4][16], ptrdiff_t) = chroma ? d->vp8_idct_dc_add4uv : d->vp8_idct_dc_add4y; - if (check_func(idct4dc, "vp8_idct_dc_add4%s", chroma ? "uv" : "y")) { + if (check_func(idct4dc, "vp%d_idct_dc_add4%s", 8 - is_vp7, chroma ? "uv" : "y")) { ptrdiff_t stride = chroma ? 8 : 16; int w = chroma ? 2 : 4; for (i = 0; i < 4; i++) { @@ -191,7 +193,7 @@ static void check_idct_dc4(VP8DSPContext *d) } -static void check_luma_dc_wht(VP8DSPContext *d) +static void check_luma_dc_wht(VP8DSPContext *d, bool is_vp7) { LOCAL_ALIGNED_16(int16_t, dc, [4 * 4]); LOCAL_ALIGNED_16(int16_t, dc0, [4 * 4]); @@ -218,7 +220,7 @@ static void check_luma_dc_wht(VP8DSPContext *d) for (dc_only = 0; dc_only <= 1; dc_only++) { void (*idct)(int16_t [4][4][16], int16_t [16]) = dc_only ? d->vp8_luma_dc_wht_dc : d->vp8_luma_dc_wht; - if (check_func(idct, "vp8_luma_dc_wht%s", dc_only ? "_dc" : "")) { + if (check_func(idct, "vp%d_luma_dc_wht%s", 8 - is_vp7, dc_only ? "_dc" : "")) { if (dc_only) { memset(dc0, 0, 16 * sizeof(int16_t)); dc0[0] = dc[0]; @@ -368,7 +370,7 @@ static void fill_loopfilter_buffers(uint8_t *buf, ptrdiff_t stride, int w, int h #define randomize_buffers(buf, lineoff, str, force_hev) \ randomize_loopfilter_buffers(lineoff, str, dir, flim_E, flim_I, hev_thresh, buf, force_hev) -static void check_loopfilter_16y(VP8DSPContext *d) +static void check_loopfilter_16y(VP8DSPContext *d, bool is_vp7) { LOCAL_ALIGNED_16(uint8_t, base0, [32 + 16 * 16]); LOCAL_ALIGNED_16(uint8_t, base1, [32 + 16 * 16]); @@ -389,7 +391,7 @@ static void check_loopfilter_16y(VP8DSPContext *d) case (0 << 1) | 1: func = d->vp8_h_loop_filter16y_inner; break; case (1 << 1) | 1: func = d->vp8_v_loop_filter16y_inner; break; } - if (check_func(func, "vp8_loop_filter16y%s_%s", edge ? "_inner" : "", dir ? "v" : "h")) { + if (check_func(func, "vp%d_loop_filter16y%s_%s", 8 - is_vp7, edge ? "_inner" : "", dir ? "v" : "h")) { for (force_hev = -1; force_hev <= 1; force_hev++) { fill_loopfilter_buffers(buf0 - midoff, 16, 16, 16); randomize_buffers(buf0, 0, 16, force_hev); @@ -409,7 +411,7 @@ static void check_loopfilter_16y(VP8DSPContext *d) } } -static void check_loopfilter_8uv(VP8DSPContext *d) +static void check_loopfilter_8uv(VP8DSPContext *d, bool is_vp7) { LOCAL_ALIGNED_16(uint8_t, base0u, [32 + 16 * 16]); LOCAL_ALIGNED_16(uint8_t, base0v, [32 + 16 * 16]); @@ -434,7 +436,7 @@ static void check_loopfilter_8uv(VP8DSPContext *d) case (0 << 1) | 1: func = d->vp8_h_loop_filter8uv_inner; break; case (1 << 1) | 1: func = d->vp8_v_loop_filter8uv_inner; break; } - if (check_func(func, "vp8_loop_filter8uv%s_%s", edge ? "_inner" : "", dir ? "v" : "h")) { + if (check_func(func, "vp%d_loop_filter8uv%s_%s", 8 - is_vp7, edge ? "_inner" : "", dir ? "v" : "h")) { for (force_hev = -1; force_hev <= 1; force_hev++) { fill_loopfilter_buffers(buf0u - midoff, 16, 16, 16); fill_loopfilter_buffers(buf0v - midoff, 16, 16, 16); @@ -459,7 +461,7 @@ static void check_loopfilter_8uv(VP8DSPContext *d) } } -static void check_loopfilter_simple(VP8DSPContext *d) +static void check_loopfilter_simple(VP8DSPContext *d, bool is_vp7) { LOCAL_ALIGNED_16(uint8_t, base0, [32 + 16 * 16]); LOCAL_ALIGNED_16(uint8_t, base1, [32 + 16 * 16]); @@ -473,7 +475,7 @@ static void check_loopfilter_simple(VP8DSPContext *d) uint8_t *buf0 = base0 + midoff_aligned; uint8_t *buf1 = base1 + midoff_aligned; void (*func)(uint8_t *, ptrdiff_t, int) = dir ? d->vp8_v_loop_filter_simple : d->vp8_h_loop_filter_simple; - if (check_func(func, "vp8_loop_filter_simple_%s", dir ? "v" : "h")) { + if (check_func(func, "vp%d_loop_filter_simple_%s", 8 - is_vp7, dir ? "v" : "h")) { fill_loopfilter_buffers(buf0 - midoff, 16, 16, 16); randomize_buffers(buf0, 0, 16, -1); randomize_buffers(buf0, 8, 16, -1); @@ -487,20 +489,33 @@ static void check_loopfilter_simple(VP8DSPContext *d) } } +static void checkasm_check_vp78dsp(VP8DSPContext *d, bool is_vp7) +{ +#if CONFIG_VP7_DECODER + if (is_vp7) + ff_vp7dsp_init(d); + else +#endif + ff_vp8dsp_init(d); + check_idct(d, is_vp7); + check_idct_dc4(d, is_vp7); + check_luma_dc_wht(d, is_vp7); + report("idct"); + check_loopfilter_16y(d, is_vp7); + check_loopfilter_8uv(d, is_vp7); + check_loopfilter_simple(d, is_vp7); + report("loopfilter"); +} + void checkasm_check_vp8dsp(void) { VP8DSPContext d; ff_vp78dsp_init(&d); - ff_vp8dsp_init(&d); - check_idct(&d); - check_idct_dc4(&d); - check_luma_dc_wht(&d); - report("idct"); check_mc(&d); report("mc"); - check_loopfilter_16y(&d); - check_loopfilter_8uv(&d); - check_loopfilter_simple(&d); - report("loopfilter"); + checkasm_check_vp78dsp(&d, false); +#if CONFIG_VP7_DECODER + checkasm_check_vp78dsp(&d, true); +#endif }