From patchwork Wed Jun 12 04:47:20 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: 49821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp230999vqq; Tue, 11 Jun 2024 21:47:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWZH4IuLuRUSx+tjP0/8eXQ5tY14jBIdqOpTjWYoU+9j40+rapELzuPe4GWVNhnpVO0xY8VAp/NCjdvW7CgDMwni5jvuURlE3x3PQ== X-Google-Smtp-Source: AGHT+IEzRLLnTz+KD+2e6nm+zcdx055XQILMz0AYGqggrnBrZ87LNqO5uj/ceYEkh5WgdXKOhHUb X-Received: by 2002:ac2:5393:0:b0:52c:84b2:67cc with SMTP id 2adb3069b0e04-52c9a3e1cdemr280205e87.31.1718167676499; Tue, 11 Jun 2024 21:47:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718167676; cv=none; d=google.com; s=arc-20160816; b=ICrLaS7I0IDawxoyx/PKcFLBsS8CrC0C9h9lDRoVBBTRUnWL9O/u93W4vSFQH5O+bq xVFiubDZKm9zQuhpQssO+sk+KBcVzvO6R0zwZGcYcfcOg9E8/lj11uXfjBxZFeT726/p dNIb3LSUa83nrsC/JEXfxMexhPFmxDa0f+d1cudu6whizdXGWWgmwjyKBDKPf6rinAX9 5Ad4GgOtG3Ygee+UPYk8kMhwqYjoSM9jPws6P3lV3zcJGm2MvTuWoqonTM3kqkuO6VLI Nbv1+TmvHoGmVmETGD84gtdkIm6hfoSDAFp0QsrtAcjynmqi8xXV8yEqY2IBFGs+9zPq Zprg== 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=HS17/a+gvwtWqWkN8XmnN6YXTG/Ls1aY6dBCHHHo4qE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=nb/XYWPEqe7LqyxrVFSOryua+lwhdBb96XNxPZFH9tM2oUdVBxjC7ko0G/mOOa5223 E1vOb7Bne3zU/h1XDxl34irx16sFRhHuuDz146DveuyvWXPX0ndTX4I+P+YDguEUM9tV rb7QSBZuE4UgkTEFkKwJ6pdcb3PGaf0OkFSlBrCQnD9fxqyvwkrBPOw0gEC2PV4sZ7mZ YcqxnXaqkNS+oj2C3iEMeifoWC1loOeDPXvFgIK1WJqXnqWax5Fa4j0kOXiJAj4oxvu+ zvo39iuGfS7sso9BwvwDHAHs3n0YKnzNIBJwJleIXzCQkLfgHhF7mDp2pFpgklOS3ynT /rag==; 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 2adb3069b0e04-52c985f4974si409751e87.54.2024.06.11.21.47.56; Tue, 11 Jun 2024 21:47:56 -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 BE5A268D904; Wed, 12 Jun 2024 07:47:35 +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 1731568D893 for ; Wed, 12 Jun 2024 07:47:25 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 37903C006D for ; Wed, 12 Jun 2024 07:47:24 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 07:47:20 +0300 Message-ID: <20240612044723.175502-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv5 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: XrFAXVociR3A 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. --- This adds the plus ones back, saving two branch instructions in C and one in assembler (at the cost of two unconditional adds). --- libavcodec/h263dsp.c | 26 ++++++++++++++++++++++++++ libavcodec/h263dsp.h | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/libavcodec/h263dsp.c b/libavcodec/h263dsp.c index 6a13353499..f4523a68c1 100644 --- a/libavcodec/h263dsp.c +++ b/libavcodec/h263dsp.c @@ -19,10 +19,34 @@ #include #include "libavutil/attributes.h" +#include "libavutil/avassert.h" #include "libavutil/common.h" #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) +{ + av_assert1(len >= 1); + 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 +140,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 Wed Jun 12 04:47:21 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: 49820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp230964vqq; Tue, 11 Jun 2024 21:47:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdf8LU0V8IUZ9eQzAkcfLPzUqEbhYSOQ5ucc30Kad2jDVkq4t3+AlLn1iJat1MvwYnkXn1uIiVDVM/zIngSmHNb42YKxN12uy2OQ== X-Google-Smtp-Source: AGHT+IGbSdl+r2nkM9eT4gAMgni/oMZlp9f87hmJV77nBU8SEjsKEWO1movfGVQQU8As9GQvhCMj X-Received: by 2002:a17:906:f19a:b0:a6e:f6bd:edd9 with SMTP id a640c23a62f3a-a6f4801460amr35737066b.59.1718167667319; Tue, 11 Jun 2024 21:47:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718167667; cv=none; d=google.com; s=arc-20160816; b=B4K/KTXgdtgdJg3UyRVd/rrOIPzGCiNPJJD6qdtyftglH4mHuojSGGup7LxQ1X2nHk Nf6WBMoOSau38xBy1AFge46K+Yl97MUX6MR1EAs+tboPeM/Zq3y+kLgXpDtrUwhgh+n9 tbG7rl+LMJociO01nCaIFArWuwfDJOAKh6mUdGr1+d6kXx2yAs911fuJhfmE2mv0XBuP zhDqUm3RmXfFBEst6s5hEkhqx3wngaJjSOOnr05IMl8SMh9JuYTkSzbLHVwhECiMTgkS Fs/scJnW+XtrCwxtGU/qDWGrrIoH38yXvaUEGFcsZPLdNWqeK/lf0Xz5r3p6aDXg/kD9 EywA== 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=LUZXgOSyghg+JJ0G4gazLggPml6ZQDKp7t48vgCIWNU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=erif0ifeXLhBzORFvObPA034awnQCl94S8TOI72Of/4VX30gbPVVz+fhOV7RaeFXw5 n0xmq1t348haYvG4lhfBHZmH2Hfqukb4CXriSLmL+RuoDZLxPn/Rgkno6vL5R4DBJNkX 3J6BSQOUCDPVpi+A8i3dDz+K2YQcHtGAbJjikMtp72bZRz2Q1Hq+pIzgUUFkwM9ZRIV1 xHJRkScucjrnij9fEs+ELnji6m16TYr40lu6Ho51YCw6Y6C9fa4ATRvFmaxwahSvGlXC GD4YZQ35FLbPGYd6kcmEwnijhHachSXXg89Fy0K5teXbfEgssLjOcvMmrMr3GQc1zkxT 3iRA==; 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-a6f1ceafd94si290653766b.459.2024.06.11.21.47.46; Tue, 11 Jun 2024 21:47:47 -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 A242968D8F5; Wed, 12 Jun 2024 07:47:34 +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 1A1AC68D898 for ; Wed, 12 Jun 2024 07:47:25 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 6B90AC0099 for ; Wed, 12 Jun 2024 07:47:24 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 07:47:21 +0300 Message-ID: <20240612044723.175502-2-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240612044723.175502-1-remi@remlab.net> References: <20240612044723.175502-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: hjpzcBX0hocq --- configure | 4 ++-- libavcodec/mpegvideo.c | 46 +++++++++++------------------------------- 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 6baa9b0646..eb9d1b1f5d 100755 --- a/configure +++ b/configure @@ -2957,8 +2957,8 @@ ftr_decoder_select="adts_header" g2m_decoder_deps="zlib" g2m_decoder_select="blockdsp idctdsp jpegtables" g729_decoder_select="audiodsp" -h261_decoder_select="mpegvideodec" -h261_encoder_select="mpegvideoenc" +h261_decoder_select="h263dsp mpegvideodec" +h261_encoder_select="h263dsp mpegvideoenc" h263_decoder_select="h263_parser h263dsp mpegvideodec qpeldsp" h263_encoder_select="h263dsp mpegvideoenc" h263i_decoder_select="h263_decoder" diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7af823b8bd..b35fd37083 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,9 @@ 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); +#if CONFIG_H263DSP + ff_h263dsp_init(&s->h263dsp); +#endif ff_hpeldsp_init(&s->hdsp, s->avctx->flags); ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample); From patchwork Wed Jun 12 04:47:22 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: 49819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp230923vqq; Tue, 11 Jun 2024 21:47:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvlGa/9I3CQeu5hZg0q7PrD879duZzQIeuRo1s4l7f8K2SLv/5/sZp+19BNk9iKkA8fmfxVNfhSa81OTW/uZJPIt073IBF9Vjz9Q== X-Google-Smtp-Source: AGHT+IHaz642vQyxFnK2M4OWVxgjcgDTQiP9PXGodQVQDuye31Q+2hnoD/if4NpPFZM24Zd2zwbQ X-Received: by 2002:a17:907:7da0:b0:a6f:2203:93d6 with SMTP id a640c23a62f3a-a6f47c8b240mr32140666b.1.1718167657719; Tue, 11 Jun 2024 21:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718167657; cv=none; d=google.com; s=arc-20160816; b=Y71NFmB8XBR9tTdErT/W01rWPkN9YATcev1+3J1+4cNXs+0lhK1KQ4hUySMUE213pr l57dKGniOe6HW0cQJ/7LTkWhI4R2EsbsMapdKBPtwZ+8/Ml5moXnYhTvG0VcqSXL9QTm I8PNrqQO0QcYgHsqwuzre41VHlivJx+VUXlfKm+Z13c0MSqJMwYNN256mAF7ureMKes3 SgDrAX5mMQmHBnK7qPFlpsMGhrGkOWhtQaEBn+3qE5AZFNPEUyQsm5dyFaVLzeNSdQPr IyDdaP2V1V8reNuTlhzslg1dsvLmQEf0w60E8JVVDyWT23EYRpMhjwxtkL2/J5L4ZUpM IfYw== 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=PdFMYTjw8FujxxStINNFiSf6fIrNjRkwfmHLk79FOzQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=cb0VzTunSKBypfqOmiEgC+s3cvLczmjxPKyeTlCnFXQhIkvbYgqvEz5goY8qHBZ6TN /BaVHEZ006UlJlMC0isBCmx3Dp+H9pxlxCKPbjhDUfTRB6x3CvUhLZyZ2PuUGJxfnKZm 8xb05PbubzE2anxaZAyl3OqFdtaZZEquinx/hLPeHIAppm4wkf9/25iZhZ7elbgPJWKA cH5nt+ZO8cxlhGJPfoNJoEFHRcEtosTA2wl5IphDJxrnebKdyFGZGHJGO9CYUFBn+780 Rs1D+cRLLc1mj1BCgGPiKa+G2MOhjcBLkbfw/NdLCY2pg8QjJiGx/Y0yPfTXe8Djk6am eWfA==; 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-a6f0e3ea688si390237366b.107.2024.06.11.21.47.37; Tue, 11 Jun 2024 21:47:37 -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 5D16D68D898; Wed, 12 Jun 2024 07:47:33 +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 36A1D68D89E for ; Wed, 12 Jun 2024 07:47:25 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 97D29C02F8 for ; Wed, 12 Jun 2024 07:47:24 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 07:47:22 +0300 Message-ID: <20240612044723.175502-3-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240612044723.175502-1-remi@remlab.net> References: <20240612044723.175502-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: DOiOK5afDSEj --- 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..8a2cdb34df 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 = 1 + (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 Wed Jun 12 04:47:23 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: 49822 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp231038vqq; Tue, 11 Jun 2024 21:48:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbr0bVknNKvMs5d2580stgtPIToMoy9YCKUkpYSBjT67fLIVMmhUvzHnbpoDoIbVTS8O+QPChDl7wYtyzmh8ENuOk5CzcBb+nkag== X-Google-Smtp-Source: AGHT+IFzhTaCAJGgPFWvbNPNlT5PLD3uwolbQelx+EAFFA6nAxIm4I6ImVoQj8KzsWHVPXINmxwF X-Received: by 2002:a19:7606:0:b0:52c:9d68:7443 with SMTP id 2adb3069b0e04-52c9d6875d3mr98642e87.1.1718167684577; Tue, 11 Jun 2024 21:48:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718167684; cv=none; d=google.com; s=arc-20160816; b=i4YoCJ3uCOpk3QTj6MQGNXkwsO9sslunwVgsRRR+rTSAinKtpE18gCxDbksgLHzLUW JfarKEcoPPMieqyKVIl0T/1w5joFgvKdIveTjnZN0PffUWMPqhM04OZ8PQJ05sSL+XDI UpwfOgcV86Z+jXcgZMUu3fDGZzH26rLkJ5sOUpEKxLmvETiUhiasajnTl/OfhoXfstmk y/BbqttKGVvPZh8rQuvRCM1H9mgN+qjrPCynQhH1vOv4BLcrFcgVSghGVxzi3P32c+Ca 2UuKuzHnr3mr3gE3iQZ9B7+FzIofJZZiEEdQrk2zK13jLnWO0KJttZ9YgieYLvBzZjC6 2KkQ== 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=0Erg7IQCpa/Fd/PGgqBYP/xEHCwm6utw2vfX6SHy+u8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=yY3uER9UAhjRpq8tGg6/EFCQZ6Ay9DZOG0jxly94Ndnj413G7TOVAhaHv7eRHJTE/2 uBzcsjJmfaR4HYwX1L/rO4BR20MgIYdjDUQsaBhprqbFLeLqtDszz8OZWwMPy/VaDRzz jjeUE19dYfyUDhXOVMsiYIlqJzrgQMtHwZFkCbCS4+0NSVvGKxOC9ou8rgKK9nCl70eg khLBQw4s/Y6G9PnnTpBTGlBs+ZFcsb2gApYuAhQxLUMTDHtf4eFcGDF9ncZMVgF8bHub wJK3t9rqHVDGR8/2T5ddM7IIWwgJQ7xgEBbFO3TzJuyCqKIqgpFGYsMARhQNwr0jFwBI ju/Q==; 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 2adb3069b0e04-52c33738112si2500240e87.491.2024.06.11.21.48.04; Tue, 11 Jun 2024 21:48:04 -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 E0F0768D89E; Wed, 12 Jun 2024 07:47:36 +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 3D8D868D8A0 for ; Wed, 12 Jun 2024 07:47:25 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id C2897C02F9 for ; Wed, 12 Jun 2024 07:47:24 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 07:47:23 +0300 Message-ID: <20240612044723.175502-4-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240612044723.175502-1-remi@remlab.net> References: <20240612044723.175502-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: TPgilcoZ07Yr 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: 1.5 h263dsp.dct_unquantize_intra_c: 3.5 h263dsp.dct_unquantize_intra_rvv_i32: 1.5 --- libavcodec/riscv/h263dsp_init.c | 15 ++++++++++++--- libavcodec/riscv/h263dsp_rvv.S | 26 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/libavcodec/riscv/h263dsp_init.c b/libavcodec/riscv/h263dsp_init.c index 21b536366c..5fb12f360b 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 (ff_rv_vlen_least(128) || (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..080091bfb1 100644 --- a/libavcodec/riscv/h263dsp_rvv.S +++ b/libavcodec/riscv/h263dsp_rvv.S @@ -20,6 +20,32 @@ #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, m8, 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) +#if defined(__riscv_v_min_vlen) && __riscv_v_min_vlen < 128 + sh1add a0, t0, a0 + bnez a1, 1b +#endif + + ret +endfunc + .option push .option norelax func ff_h263_h_loop_filter_rvv, zve32x