From patchwork Sun Jun 9 16:23:44 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: 49758 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2083800vqo; Sun, 9 Jun 2024 09:24:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW3lGwH2kLWumTE/0NmniA60E/fRaQJOiS7YAgEnhKf21eNCMEh9kfE+ueEOaenlIc/QwCIVbNfoADNtfASj7X0YLAsLKoO1xMcng== X-Google-Smtp-Source: AGHT+IHbkm0c2/x/iFrmOXJqJnLE/fC0qewaEumpmF7UEBsC/ZmCy6kdn/QA2t+Kbtnrsb3rnTuU X-Received: by 2002:a2e:6d02:0:b0:2eb:d696:4b98 with SMTP id 38308e7fff4ca-2ebd6965cf2mr20786481fa.1.1717950239734; Sun, 09 Jun 2024 09:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717950239; cv=none; d=google.com; s=arc-20160816; b=drsyCiVZSZtCCtVJJ4HXzoKMhvBfrqGMmNK+DDlJ/XfC3MMRHqNSjT38f3yZWPaSkP b0AsEvbRNXqRkJwO3UbnINoSOUD6b185q83m6tXgFJ+8vfI4iokMgHhoQNJfheqiJ11S xh/Yn+vjpvMphxGYBzw6anLrIvTNWP6zAVIbbvxafj0CqrEnp2i57Hvy/CA1PxxBuok1 IWwBJ2pqnm1lt3wvnAsJr1efIS7cTI0p2xGCwCLMpPpmDT3M6D/qMUr7kOxpnYJomcEp Uiu82ZePHWWSb3QKgZhk0OStD6yatnvf5zJJtPtW39txeer3Q+qu8nPnymw6ZdwuzQcR Lo4A== 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 :delivered-to; bh=S+UBhcsRY5NXjSADSmg1yFVZfOf8ZO/PQQW6uubZN6k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=YvF8W/RxfxmQ4f6F4hPw7c3r4UA93d5SvFOr5GF0Ggre8oje5kRwZGP1BvkyrEXq+e hdovVsjbAHsximsY1KRVJXSgL8yB3Jq/A+7k4cyXYqTJG5BYwqqpVbJyB60h4PLdq7Q4 BvaXELsse8E9Gbc2ChCmz4dkIsCqM9fv7cJMDE3EFRPT1V8OXXYTVUoaDDKWSqfnBewD JFADLa9jI5ZDky+CIJTPWqEi11e3eIYAKqUCgDmJGMNyAzR8FTcKfZf0iTUAy2VSQrcZ 95yUzmKWbNUJfmdWCe9e6n1dEgLqiYmlg63/mSy3D1QZTcmRXBgC4OF2ltXCPY+MQ320 aDag==; 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 38308e7fff4ca-2ebd9e3b42dsi7594091fa.393.2024.06.09.09.23.59; Sun, 09 Jun 2024 09:23:59 -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 CE772687F3E; Sun, 9 Jun 2024 19:23:54 +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 4711068D334 for ; Sun, 9 Jun 2024 19:23:48 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id C1193C006F for ; Sun, 9 Jun 2024 19:23:47 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 19:23:44 +0300 Message-ID: <20240609162347.2541907-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv3 1/4] lavc/h263dsp: add DCT dequantisation functions 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: cqLiK8xKVyhw Note that optimised implementations of these functions will be taken into actual use only if MpegEncContext.dct_unquantize_h263_{inter,intra} are *not* overloaded by existing optimisations. --- Compared to version 2, this separates inter and intra functions to ease writing aligned-dependent optimisations. --- libavcodec/h263dsp.c | 24 ++++++++++++++++++++++++ libavcodec/h263dsp.h | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/libavcodec/h263dsp.c b/libavcodec/h263dsp.c index 6a13353499..1c6cf85a70 100644 --- a/libavcodec/h263dsp.c +++ b/libavcodec/h263dsp.c @@ -23,6 +23,28 @@ #include "config.h" #include "h263dsp.h" +static void h263_dct_unquantize_inter_c(int16_t *block, size_t len, + int qmul, int qadd) +{ + for (size_t i = 0; i < len; i++) { + int level = block[i]; + + if (level) { + if (level < 0) + level = level * qmul - qadd; + else + level = level * qmul + qadd; + block[i] = level; + } + } +} + +static void h263_dct_unquantize_intra_c(int16_t *block, size_t len, + int qmul, int qadd) +{ + h263_dct_unquantize_inter_c(block + 1, len - 1, qmul, qadd); +} + const uint8_t ff_h263_loop_filter_strength[32] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 11, 12, 12, 12 @@ -116,6 +138,8 @@ static void h263_v_loop_filter_c(uint8_t *src, int stride, int qscale) av_cold void ff_h263dsp_init(H263DSPContext *ctx) { + ctx->h263_dct_unquantize_intra = h263_dct_unquantize_intra_c; + ctx->h263_dct_unquantize_inter = h263_dct_unquantize_inter_c; ctx->h263_h_loop_filter = h263_h_loop_filter_c; ctx->h263_v_loop_filter = h263_v_loop_filter_c; diff --git a/libavcodec/h263dsp.h b/libavcodec/h263dsp.h index 2dccd23392..0ecbe83314 100644 --- a/libavcodec/h263dsp.h +++ b/libavcodec/h263dsp.h @@ -24,6 +24,10 @@ extern const uint8_t ff_h263_loop_filter_strength[32]; typedef struct H263DSPContext { + void (*h263_dct_unquantize_intra)(int16_t *block /* align 16 */, + size_t len, int mul, int add); + void (*h263_dct_unquantize_inter)(int16_t *block /* align 16 */, + size_t len, int mul, int add); void (*h263_h_loop_filter)(uint8_t *src, int stride, int qscale); void (*h263_v_loop_filter)(uint8_t *src, int stride, int qscale); } H263DSPContext; From patchwork Sun Jun 9 16:23:45 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: 49761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2087956vqo; Sun, 9 Jun 2024 09:34:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvk7AT6sMvgBnN69v1GiKWC/xqjJcmWKQCKIxPit7Zuq9DWHSfvqNWFrwO+0MPfX9cdspmyyu3QXrlaEUQy3MrSRhvOILUSmqW8A== X-Google-Smtp-Source: AGHT+IFV0vG5QF739ioxmSPwSL7Cw8IUiKzUMc/SAgm4mq6bIEc6XMHI+1qY083oVzlPbshn0UfW X-Received: by 2002:a50:999d:0:b0:57c:7826:1dc with SMTP id 4fb4d7f45d1cf-57c78260292mr1229690a12.8.1717950850601; Sun, 09 Jun 2024 09:34:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717950850; cv=none; d=google.com; s=arc-20160816; b=B2eZPOeJ+4VRavvK5GRCh5S8wquM1dt96Qf3goEgoh7VTshgyDqUEDTR6iYGFnTCab aNPP9jsiADKz3mwzaNLCbV+eULICU8EgWIheTjquUKmOWZGm1EMQ2ZKkuunnK6JdTPug ArIyDxs/1nNbgjFDrSWmjgFklBrUqOrW5/Kp11ev1zelTl+ivIqDPHBDEbTW/H9zahbV H8lyr3oPW096LJPtzDABtHQHroqwv931A73hcLvGtA9Co93tnIB2diw3ConAoTB7jUTI ZIkhrojXzR1O6EAip09CWgSeqfiiP6CjMCBtaXS6fvaYPV+YYcf/HsusirMQiDpMgBQi fMVQ== 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=x6TRBXHk+EZ3v2NqL15loc9TEdfLjb5IAZPAQHXPVKg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gxTfNTbQi6kSuV6tX3ip1mq/+91rktoimKRHIKc4GHbkTHD9VCNfAbaIsQGyyWrczb eW3XnBsUYpUbPUPCc7BFeI3uz7nmCliIMpor0uOvgT0WoFfm67kxfcWN2WcnxyGlt+to 483/YdPo2VY9mNwdUKbY5ym2iSZiU9ChHTWFRd3W5TB5k2elXOc0MkjixRgrgB3ykuK3 47TKT0fskfsQwvcLxa/3np/MINM9lGbyCwMvriKZ+DU0DgzKoMj8S6JlXN8lgqpoR9Ux oKvHqjU/4MKqGZN+RkaAE4jgfsVWEAg0GaWBy+W2Eb1QLTdG1CIRAPTw40oOeh+HuGon /19w==; 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-57c70ac42a2si1451817a12.488.2024.06.09.09.34.10; Sun, 09 Jun 2024 09:34:10 -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 DFFCA68D663; Sun, 9 Jun 2024 19:23:55 +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 6163268D5F1 for ; Sun, 9 Jun 2024 19:23:48 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 07884C009A for ; Sun, 9 Jun 2024 19:23:47 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 19:23:45 +0300 Message-ID: <20240609162347.2541907-2-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240609162347.2541907-1-remi@remlab.net> References: <20240609162347.2541907-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavc/mpegvideo: use H263DSP dequant function 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: SpizF5oWJ4qg --- libavcodec/mpegvideo.c | 44 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7af823b8bd..9be0fecc8d 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -201,13 +201,11 @@ static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, static void dct_unquantize_h263_intra_c(MpegEncContext *s, int16_t *block, int n, int qscale) { - int i, level, qmul, qadd; - int nCoeffs; + int qmul = qscale << 1; + int qadd, nCoeffs; av_assert2(s->block_last_index[n]>=0 || s->h263_aic); - qmul = qscale << 1; - if (!s->h263_aic) { block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale; qadd = (qscale - 1) | 1; @@ -215,47 +213,24 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s, qadd = 0; } if(s->ac_pred) - nCoeffs=63; + nCoeffs = 64; else - nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; + nCoeffs = s->intra_scantable.raster_end[s->block_last_index[n]] + 1; - for(i=1; i<=nCoeffs; i++) { - level = block[i]; - if (level) { - if (level < 0) { - level = level * qmul - qadd; - } else { - level = level * qmul + qadd; - } - block[i] = level; - } - } + s->h263dsp.h263_dct_unquantize_intra(block, nCoeffs, qmul, qadd); } static void dct_unquantize_h263_inter_c(MpegEncContext *s, int16_t *block, int n, int qscale) { - int i, level, qmul, qadd; + int qmul = qscale << 1; + int qadd = (qscale - 1) | 1; int nCoeffs; av_assert2(s->block_last_index[n]>=0); - qadd = (qscale - 1) | 1; - qmul = qscale << 1; - - nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; - - for(i=0; i<=nCoeffs; i++) { - level = block[i]; - if (level) { - if (level < 0) { - level = level * qmul - qadd; - } else { - level = level * qmul + qadd; - } - block[i] = level; - } - } + nCoeffs = s->inter_scantable.raster_end[s->block_last_index[n]] + 1; + s->h263dsp.h263_dct_unquantize_inter(block, nCoeffs, qmul, qadd); } @@ -275,6 +250,7 @@ static void gray8(uint8_t *dst, const uint8_t *src, ptrdiff_t linesize, int h) static av_cold int dct_init(MpegEncContext *s) { ff_blockdsp_init(&s->bdsp); + ff_h263dsp_init(&s->h263dsp); ff_hpeldsp_init(&s->hdsp, s->avctx->flags); ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample); From patchwork Sun Jun 9 16:23:46 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: 49759 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2083891vqo; Sun, 9 Jun 2024 09:24:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVzfY522RTWfxGhqfEeP3bYIbKDnAC5o5//zoAIcvvR/6P7GK7wG8MARZBaS3GmGBkym7YDNFDdjY/knT4tM04HILOvVNHXsUCf3w== X-Google-Smtp-Source: AGHT+IGLpCPmgJefoGCAtieXdwkrBjsD/tJ/Yww1pw4avl2DUAfJOsoidPjNgl+iK+9DampToH1q X-Received: by 2002:a05:6512:e94:b0:52c:82c9:6d6a with SMTP id 2adb3069b0e04-52c82c974bemr3029930e87.21.1717950257336; Sun, 09 Jun 2024 09:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717950257; cv=none; d=google.com; s=arc-20160816; b=JfIb1TiTkEIkua9I/xi8KxklKfcoqtH5jTm+CM+4/MSPDLH0HRcWhTQLBjnFF9bHli S1Gyr8EWFjkvnUx1vdH4E2jjfEUBw1PljQCZFjSWhAfUIwY+v9DfsVAe1Le1rdzYyiB4 dtlpemSsZ5KiVZjXutIUIIfhI4AZTJXosNYHmJI3K9qkygb4I3quI/pNDxEdLi8Q2XTc JM7Iadnf80J/J/oa9T0TAvr1d6qwdSm2shAQwBO+1AAYZvLYRHAYmWvw+QVoWihs9hdl N37KIV73x3Hrkkm90LHEGafRsl+cPf198sQRIGxdGivO2CCVcxvEAFliqa+sLedBdciq /HfQ== 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=uwGIIc6iQw4p05mX/yNnL4quWrcUsWGmgVIICpxWW34=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=RPo0HjSO07kDprx8td3R/X3zjDu6N5D2+sFs4kz+Y63tqDVrL31A9gQafVj5ymaTkF xNojxZV4WmqSRUUrdcqf7p0XbpXV+dpSUeAihVrgbC0e65MOXktBQL8KIALIxurOfl7Q ApFVNWUHuQnD7+vf3UK7lAvNZQlyzgB4hkwMebhQH08rnQLNgR3X4xsIphe5SO/X+SF8 ClPxrZtuLHJsjnLa9fX8cxgVRO60QyUdp9WhpztbNVNwuykRWamCE7ccAaqcJL03g42u UAGIph66Hv87mUI9/g/smvTzWMc4LZl0uzDc+JXiAJd7SjW7Pac8hY95OU39k8DfsrQD QfnA==; 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 a640c23a62f3a-a6eff9b9eedsi166977866b.2.2024.06.09.09.24.16; Sun, 09 Jun 2024 09:24: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; 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 01BA368D66A; Sun, 9 Jun 2024 19:23:58 +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 9A69168D5F1 for ; Sun, 9 Jun 2024 19:23:48 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 38F41C02F8 for ; Sun, 9 Jun 2024 19:23:48 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 19:23:46 +0300 Message-ID: <20240609162347.2541907-3-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240609162347.2541907-1-remi@remlab.net> References: <20240609162347.2541907-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] checkasm/h263dsp: test dct_unquantize_{intra, inter} 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: r4d1+ukgKF0r --- tests/checkasm/h263dsp.c | 47 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/tests/checkasm/h263dsp.c b/tests/checkasm/h263dsp.c index 2d0957a90b..b21854d061 100644 --- a/tests/checkasm/h263dsp.c +++ b/tests/checkasm/h263dsp.c @@ -18,13 +18,55 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include #include "checkasm.h" -#include "libavcodec/h263dsp.h" +#include "libavutil/avassert.h" #include "libavutil/mem.h" #include "libavutil/mem_internal.h" +#include "libavcodec/h263dsp.h" +#include "libavcodec/mpegvideodata.h" + +static uint_fast8_t mpeg_qscale_rnd(void) +{ + int n = rnd(), q = (n >> 1) & 31; + + if (n & 1) + return ff_mpeg2_non_linear_qscale[q]; + else + return q << 1; +} + +typedef void (*unquantizer)(int16_t *, size_t, int, int); + +static void check_dct_unquantize(unquantizer func, const char *name) +{ +#define LEN 64 + LOCAL_ALIGNED_16(int16_t, block0, [LEN]); + LOCAL_ALIGNED_16(int16_t, block1, [LEN]); + size_t len = rnd() % (LEN + 1); + const int qscale = mpeg_qscale_rnd(); + const int qmul = qscale << 1; + const int qadd = (rnd() & 1) ? (qscale - 1) | 1 : 0; + + declare_func(void, int16_t *, size_t, int, int); + + for (size_t i = 0; i < LEN; i++) + block1[i] = block0[i] = (rnd() & 1) ? rnd() : 0; + + if (check_func(func, "h263dsp.dct_unquantize_%s", name)) { + av_assert0(len <= LEN); + call_ref(block0, len, qmul, qadd); + call_new(block1, len, qmul, qadd); + + if (memcmp(block0, block1, len * sizeof (int16_t))) + fail(); + + bench_new(block1, LEN, qmul, qadd); + } +} typedef void (*filter)(uint8_t *src, int stride, int qscale); @@ -56,6 +98,9 @@ void checkasm_check_h263dsp(void) H263DSPContext ctx; ff_h263dsp_init(&ctx); + check_dct_unquantize(ctx.h263_dct_unquantize_intra, "intra"); + check_dct_unquantize(ctx.h263_dct_unquantize_inter, "inter"); + report("dct_unquantize"); check_loop_filter('h', ctx.h263_h_loop_filter); check_loop_filter('v', ctx.h263_v_loop_filter); report("loop_filter"); From patchwork Sun Jun 9 16:23:47 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: 49760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2083961vqo; Sun, 9 Jun 2024 09:24:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUh6YDO5Z8M5fk3PIOVUFdYZWHSkcGcycSBr+Q8Fnm1fErqxGvfO3KBHnm6JuD2hF1jZ6A10QPZUzf+X+JBAJt96mKyXNMJtUcGZg== X-Google-Smtp-Source: AGHT+IGuSIQiW4zennq3sRhARsIR7Ol6KIEWDm1p43IEB3OjH9EyG7jIuX9Fw+WhDlb2nrCPpXIa X-Received: by 2002:a17:907:9448:b0:a6f:1e23:c4af with SMTP id a640c23a62f3a-a6f1e23c744mr73500766b.62.1717950266098; Sun, 09 Jun 2024 09:24:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717950266; cv=none; d=google.com; s=arc-20160816; b=Oe2b5Q7STRn8TFFULHHCR0Ow3+e0bmOnNm/kZR7KHJVPb/RAObcqvFjwgQmXMrcnHD VZS0xObDb2YJwdvDABUriaIqJoAK99VQcDfQQvjK++cTSzDspuFtBEEhrrC+qxVW1fS9 IXYiX5arqyR+M8X3+IpIWNlqh9ntrdB/AFNaHiVGJajhKaMluIOhr94Ou0hwFMGAqXgm ycVJkQ0JAT0eebUSaHQEpIirGW97mcoKxrpaz+EP/wputq2Rl/4DkWI5uvWOABvTqzei tb3qjeABgJsqh4UNWkfDG+VhC3+cD3P9Akb6wGy4PZyj1oh2CRqw3mJfXnA0fXeoFNMG nx2g== 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=NRi4Dny0zEM+Bu4siS/hJvuZbq8KW0C26AQsd58OpwU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=aGTcHsCyEnpGYOkADXcul271HKZWEqo6NHy4e2ph929WeTaP2YZfcfCoA9AqtMqvut h845lLSUn/8TWipvAK+zxn5keHKsOmU68tNU7EWyYRBjDA/T8+egjfOUb9KALOfjeClO buYiByBrgOx4Knc0Hl/wMEX9aLr1g9wB+aIbnrOGKv+u9SkJf45uEXXv9Z6NZGV04/6K 0fXXPRaZE2TQUB6sLzywpNF7sOOOsRDHFlBVfhzG/m/CQXWkVJEipKtdOfPDo9FfO/D2 +qBfZxGkV6cp5ifFhlbffEqimPUewlCkvtzMUUmyLOAl5dDgtblTLFcR7bVyTpV2LAYO aIig==; 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 a640c23a62f3a-a6eff1d2e31si171964866b.75.2024.06.09.09.24.25; Sun, 09 Jun 2024 09:24:26 -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 10FD968D686; Sun, 9 Jun 2024 19:23:59 +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 C6A2D68D5F1 for ; Sun, 9 Jun 2024 19:23:48 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 6A274C02F9 for ; Sun, 9 Jun 2024 19:23:48 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 19:23:47 +0300 Message-ID: <20240609162347.2541907-4-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240609162347.2541907-1-remi@remlab.net> References: <20240609162347.2541907-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavc/h263dsp: R-V V dct_unquantize_{intra, inter} 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: SHK9u9qdwbUr T-Head C908: h263dsp.dct_unquantize_inter_c: 3.7 h263dsp.dct_unquantize_inter_rvv_i32: 1.7 h263dsp.dct_unquantize_intra_c: 4.0 h263dsp.dct_unquantize_intra_rvv_i32: 2.0 SpacemiT X60: h263dsp.dct_unquantize_inter_c: 3.5 h263dsp.dct_unquantize_inter_rvv_i32: 0.7 h263dsp.dct_unquantize_intra_c: 3.5 h263dsp.dct_unquantize_intra_rvv_i32: 0.7 --- libavcodec/riscv/h263dsp_init.c | 15 ++++++++++++--- libavcodec/riscv/h263dsp_rvv.S | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/libavcodec/riscv/h263dsp_init.c b/libavcodec/riscv/h263dsp_init.c index 21b536366c..8c5d92ef76 100644 --- a/libavcodec/riscv/h263dsp_init.c +++ b/libavcodec/riscv/h263dsp_init.c @@ -25,6 +25,8 @@ #include "libavutil/riscv/cpu.h" #include "libavcodec/h263dsp.h" +void ff_h263_dct_unquantize_intra_rvv(int16_t *, size_t len, int, int); +void ff_h263_dct_unquantize_inter_rvv(int16_t *, size_t len, int, int); void ff_h263_h_loop_filter_rvv(uint8_t *src, int stride, int q); void ff_h263_v_loop_filter_rvv(uint8_t *src, int stride, int q); @@ -33,9 +35,16 @@ av_cold void ff_h263dsp_init_riscv(H263DSPContext *c) #if HAVE_RVV int flags = av_get_cpu_flags(); - if ((flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) { - c->h263_h_loop_filter = ff_h263_h_loop_filter_rvv; - c->h263_v_loop_filter = ff_h263_v_loop_filter_rvv; + if (flags & AV_CPU_FLAG_RVV_I32) { + if (flags & AV_CPU_FLAG_RVB_ADDR) { + c->h263_dct_unquantize_intra = ff_h263_dct_unquantize_intra_rvv; + c->h263_dct_unquantize_inter = ff_h263_dct_unquantize_inter_rvv; + } + + if (ff_rv_vlen_least(128)) { + c->h263_h_loop_filter = ff_h263_h_loop_filter_rvv; + c->h263_v_loop_filter = ff_h263_v_loop_filter_rvv; + } } #endif } diff --git a/libavcodec/riscv/h263dsp_rvv.S b/libavcodec/riscv/h263dsp_rvv.S index 97503d527c..d61cf2c747 100644 --- a/libavcodec/riscv/h263dsp_rvv.S +++ b/libavcodec/riscv/h263dsp_rvv.S @@ -20,6 +20,30 @@ #include "libavutil/riscv/asm.S" +func ff_h263_dct_unquantize_intra_rvv, zve32x + addi a1, a1, -1 + addi a0, a0, 2 + # fall through +endfunc + +func ff_h263_dct_unquantize_inter_rvv, zve32x +1: + vsetvli t0, a1, e16, m4, ta, mu + vle16.v v8, (a0) + sub a1, a1, t0 + vmv.v.x v24, a3 + vmslt.vi v0, v8, 0 + vmul.vx v16, v8, a2 + vneg.v v24, v24, v0.t + vmsne.vi v0, v8, 0 + vadd.vv v8, v16, v24, v0.t + vse16.v v8, (a0) + sh1add a0, t0, a0 + bnez a1, 1b + + ret +endfunc + .option push .option norelax func ff_h263_h_loop_filter_rvv, zve32x