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);