From patchwork Mon Jul 1 19:13:26 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: 50264 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2009012vqv; Mon, 1 Jul 2024 12:13:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXymvsR/GWLEfVOe/f+63r5zhvATOVrn3Mp3jNo6MAKgN0kGjJqduj8b8qYoN1W4gyemhfAWRz9xXOQZJCPM+WfCe731Ro0RXrWtA== X-Google-Smtp-Source: AGHT+IEeCWekNKZkZTGGUaNNuqdjb5IxWhQvTBVX1QazoVV+Fke6CMjpp7yf8Im2DfKcmMqfUebO X-Received: by 2002:a17:907:86a0:b0:a5c:eafb:5288 with SMTP id a640c23a62f3a-a751448a596mr602879766b.31.1719861228308; Mon, 01 Jul 2024 12:13:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719861228; cv=none; d=google.com; s=arc-20160816; b=A07txkKSKFMKmv9G+MLSPehqRt5dJ02++CRURIb4SAsqTDOGcz06Wh4B+nbhZLjSQe Potfpc7fS6S1VS/ODyfQLVRkP6hp6ZMHWGVa/0D3W1cYsAJ52CQbsW0LC9G2uBtyoQoI TfsyRTryUjtR1Y0CI77vEVZfrlR5gLcaA1tGwRJsjL5VGCXkcqRFfdoAVvS3WQN5r45i 8lGOagppqswWWpGIS7ic2vw9H8i6pxPBQODsqomZ29671dGrUxqbpuDppLlBbmPZVk9E 3FC+36XMAnI+H/38RKV8k0hAObekQnIFiDvRnecNhaZPMrFne90xXEX+26tDoXuRnc+o 49Lg== 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=g1LNF2swuEK8sHNZUvS2rGhMIpxjGjQfxwLvbyvBc5E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=KEF3OlA0O7NvWkpYXcm+CsjEuBqic6J+8pfjGnaMQi/aprrDEfy4mo50kBKI90tbX3 9lwYzJA+3HGRoQqTH1KfAe5SXmjWytIiq4d3j1XuHKnVl+MVWUVzi/CkA9ET5yx7iwQB 95auUGvC+gS/s7UM/nFAZ3fTXtRYOFtl+DzrnYj3gTI4i6EfoIs38RMhawOcTPid1GKx 5HrGcUo+PILTdxiTHWincAtl8EMhkxhl6CaWgf+DgvS8icLAsEvcTTwqzzNveAPkbJnN zcZB0JS79YtYWalTHZTLuFFj/klNCagHMVtGV2g7ewJXiiZCW7AbJqwjJfwzha0XHHtr ntkQ==; 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-a72aaef61d6si395304766b.43.2024.07.01.12.13.47; Mon, 01 Jul 2024 12:13:48 -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 8736168D845; Mon, 1 Jul 2024 22:13:37 +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 6D9A668D5BD for ; Mon, 1 Jul 2024 22:13:29 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 0D989C0170 for ; Mon, 1 Jul 2024 22:13:29 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 22:13:26 +0300 Message-ID: <20240701191328.466433-2-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240701191328.466433-1-remi@remlab.net> References: <20240701191328.466433-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: Y5rOCPW3jEPL --- configure | 4 ++-- libavcodec/mpegvideo.c | 40 +++++++++------------------------------- 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/configure b/configure index fed4c44cd1..42b9a72d5a 100755 --- a/configure +++ b/configure @@ -2954,8 +2954,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 b9a0469335..c9094d1cce 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -202,13 +202,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; @@ -220,43 +218,20 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s, else nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; - 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; - } - } + s->h263dsp.h263_dct_unquantize_inter(block, nCoeffs, qmul, qadd); } @@ -276,6 +251,9 @@ static void gray8(uint8_t *dst, const uint8_t *src, ptrdiff_t linesize, int h) static av_cold void dsp_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);