From patchwork Mon Jun 19 22:37:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4050 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1121846vsw; Mon, 19 Jun 2017 15:38:12 -0700 (PDT) X-Received: by 10.223.170.219 with SMTP id i27mr15266867wrc.49.1497911891993; Mon, 19 Jun 2017 15:38:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497911891; cv=none; d=google.com; s=arc-20160816; b=rj5dYb6cCKUAVZVk4hDrFLaypSwCijJLFNk+T7j+9cWRPszUoU5KoHZpqTDo6THut4 MMbYAPP1dt5WyqJjPb4nMdoc+cW00eFnIuEYTY+RtYvwWpMeDrGdq05IsiSOfg0XDFMy d8WHjj5UC4hlQ/RAQUPJcvp9suMQVdetyMtnUiDOITlayejBG/G01iSVfbBop3nxSic4 MKl5sQZzM+1bLRzJYWNeWK0qOS1DteiveIVSK0aEqspEWFuSAlzMnwzJq63VLjJevM8G 8Lz7MkYSKJHQqKTDniVtxJPVyWCYuleJ95kIY/pq9Y6whzAciQ4AzDj8EMCTMAXsbWrQ E11A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=myKNK+7OI/jNJthPmBo6W+2EOIQrykiZhkNNGGW1eXk=; b=kwuOJupFsK302y3Seb61GNPOcDT+3Y7+1/LSIYfDV6LWkzV4KRVKwIIQ/EICMRuoS3 pa8Y5zuXy17iqM2VKLY33tUv6LvONduAjBuHk5OabuLSFlsWpyQkKGzZeR/qjK8FPvud Oh8+K8DZIxSjz7TSQLu1UNajDxkSa60JXAiAwP/F7AgnBJ0A5jJ2HzQy0beOhP3h9jUD NgNempsLklMN3173j/hIspo7CnYzng1UN/sjXyhmMncYnhnkWMvlwlu6c6Tqu6g4Cu2L Z+stXTlLfOEEu+HNSNtAXedO59nD1NaC2MyK/Je5vbgCVjq9xKmED2KLSk257a7Qo/mR stoA== 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 1si7075149wri.162.2017.06.19.15.38.11; Mon, 19 Jun 2017 15:38:11 -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 6D35F68A635; Tue, 20 Jun 2017 01:37:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BE4C68A62E for ; Tue, 20 Jun 2017 01:37:52 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dN5Iy-0006Tz-Rg for ffmpeg-devel@ffmpeg.org; Tue, 20 Jun 2017 00:37:56 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id amdm1v0040S5wYM01mdn6j; Tue, 20 Jun 2017 00:37:47 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Jun 2017 00:37:41 +0200 Message-Id: <20170619223741.26916-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170619223741.26916-1-michael@niedermayer.cc> References: <20170619223741.26916-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mpegvideo_enc: Use intra/inter scantable matching mb type in quantization X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index fffb113096..97257ce98c 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4056,8 +4056,8 @@ static int dct_quantize_trellis_c(MpegEncContext *s, int qscale, int *overflow){ const int *qmat; const uint16_t *matrix; - const uint8_t *scantable= s->intra_scantable.scantable; - const uint8_t *perm_scantable= s->intra_scantable.permutated; + const uint8_t *scantable; + const uint8_t *perm_scantable; int max=0; unsigned int threshold1, threshold2; int bias=0; @@ -4090,6 +4090,8 @@ static int dct_quantize_trellis_c(MpegEncContext *s, else mpeg2_qscale = qscale << 1; if (s->mb_intra) { + scantable= s->intra_scantable.scantable; + perm_scantable= s->intra_scantable.permutated; int q; if (!s->h263_aic) { if (n < 4) @@ -4120,6 +4122,8 @@ static int dct_quantize_trellis_c(MpegEncContext *s, last_length= s->intra_ac_vlc_last_length; } } else { + scantable= s->inter_scantable.scantable; + perm_scantable= s->inter_scantable.permutated; start_i = 0; last_non_zero = -1; qmat = s->q_inter_matrix[qscale]; @@ -4387,8 +4391,8 @@ static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? int n, int qscale){ int16_t rem[64]; LOCAL_ALIGNED_16(int16_t, d1, [64]); - const uint8_t *scantable= s->intra_scantable.scantable; - const uint8_t *perm_scantable= s->intra_scantable.permutated; + const uint8_t *scantable; + const uint8_t *perm_scantable; // unsigned int threshold1, threshold2; // int bias=0; int run_tab[65]; @@ -4415,6 +4419,8 @@ static int messed_sign=0; qmul= qscale*2; qadd= (qscale-1)|1; if (s->mb_intra) { + scantable= s->intra_scantable.scantable; + perm_scantable= s->intra_scantable.permutated; if (!s->h263_aic) { if (n < 4) q = s->y_dc_scale; @@ -4440,6 +4446,8 @@ static int messed_sign=0; last_length= s->intra_ac_vlc_last_length; } } else { + scantable= s->inter_scantable.scantable; + perm_scantable= s->inter_scantable.permutated; dc= 0; start_i = 0; length = s->inter_ac_vlc_length; @@ -4804,7 +4812,7 @@ int ff_dct_quantize_c(MpegEncContext *s, { int i, j, level, last_non_zero, q, start_i; const int *qmat; - const uint8_t *scantable= s->intra_scantable.scantable; + const uint8_t *scantable; int bias; int max=0; unsigned int threshold1, threshold2; @@ -4815,6 +4823,7 @@ int ff_dct_quantize_c(MpegEncContext *s, s->denoise_dct(s, block); if (s->mb_intra) { + scantable= s->intra_scantable.scantable; if (!s->h263_aic) { if (n < 4) q = s->y_dc_scale; @@ -4832,6 +4841,7 @@ int ff_dct_quantize_c(MpegEncContext *s, qmat = n < 4 ? s->q_intra_matrix[qscale] : s->q_chroma_intra_matrix[qscale]; bias= s->intra_quant_bias*(1<<(QMAT_SHIFT - QUANT_BIAS_SHIFT)); } else { + scantable= s->inter_scantable.scantable; start_i = 0; last_non_zero = -1; qmat = s->q_inter_matrix[qscale];