From patchwork Tue Jun 20 12:47:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 4057 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1383880vsw; Tue, 20 Jun 2017 05:55:48 -0700 (PDT) X-Received: by 10.223.144.69 with SMTP id h63mr18946497wrh.187.1497963348141; Tue, 20 Jun 2017 05:55:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497963348; cv=none; d=google.com; s=arc-20160816; b=qJ+3hJ/toIA7qNdOivHtGcA5OwvmimJB+rPolQ5q464HfvtA3hK6gdlxUCZvZW7K9j E4Bg2bYiRPok1JYYdCKT5O58aSxXoiDBxVwdelCUHyZ5lYnkIHV1ghoKeknV/5/Crkyx 8JuA/YOkZYe+uBsmp6NL0+q6Sbzg7mdi/RAHlj6x7HSphQJjVAnbykQx+WkKLzC0H5fV 8LNG/b5NWi2qu7WscAKUPf7CEr8twCtTT45HXr6aT+wU1JaOEmvbCRp/FYeCrKo9b5nM UFye5ZqzbwM0Q52nIdASfgkSgaOzfTB5Kb7KCTRgYr/OE0aLfDAMUq8eI5s9I1YUTGaw Tl0A== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=5v4VkfbXxGRRJVZC1K2tFD8af6uMO4OPuf96sSizBqQ=; b=mp7QTZoNIQ2X5rS6lChON3WCFFukJ4ZNFUwC9AmvUqdkPZDMi4CcMZLeNXccuTMPTR EY+CQuLXeqvLGOt1pJDEsuXWu3hRPx9aZQCzixEDOSPrmSXRQ9AQdkQ0qajeBlRKv+29 jzT8wqwLdSd3CqhJ11RusrGMcFfx2N4z1ZLzgvyc5DJQ8gG7W2l84TbBzktb9Y0s3Yfb UUtGGw+hFUEqnPhE7lh5blNjeBoSwpgVeyDlCz+Q99TAShT1ULvZ/qjk5OtSjVc35N1z NY/85B3Ptm1UXGvHz5WQrxlRR8IskZg8HBECpFh1uMztjfqzSputx6G41L0YrpxuJXrG j70A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=b6CM7sBG; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t28si13210341wra.269.2017.06.20.05.55.47; Tue, 20 Jun 2017 05:55: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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=b6CM7sBG; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BE1568A5CB; Tue, 20 Jun 2017 15:55:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA5D9689A31 for ; Tue, 20 Jun 2017 15:55:31 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id s33so23012438qtg.3 for ; Tue, 20 Jun 2017 05:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=uqx6v0+//gHiCoyTqiuDOdJF2LBQCQcWJteLCOv3WMk=; b=b6CM7sBGbtasuy9oFUDN4iY4WTZQq6XcI39RKNwpmIR14k5HTkJq+4YQ3vn7DVe5VL vgP1K6w9z+EdI1IZsuLiWLEP3M5yiwhuy/eSiFE1XvxIHamrePn8KwdVQ1zfC4nIRieu O7kfLwrWfisbmtZVf2LtBvAOD83c6NWAErMxCozHwG2il5muK7PBSvjdj0zMaMxhOApn ZI/OB1SC+FMLCyPZQpUyiYHlGswrSEtdBc3hxUk+dThxfimJjX5N3ANsxsPQe7wHcgJ+ gce60qLYVmOfPRS8o9tBs/0PmO/Er+opEZOBJBoPXkZzlFGNIIxJIy5NgpJV+ivJXmuP b8tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uqx6v0+//gHiCoyTqiuDOdJF2LBQCQcWJteLCOv3WMk=; b=qiQyQ5NcH+fPSO9bm33sNsCh1KYTA+LoIxa5BQO+RbPbioj2MLM6GJx4YaiqmyPYRM mE0hd8t+kZcD/geSiqtl2f7NDUrnALExhIyasfznQM0drEOf/YvbhX02V/9YmBtGeEvI yKxJnaTOPmpKQwu/AZrtbSRWTwHC0REMYFX9G/PgAVeLsq3TqzhOjEvi14HBnjl63wZq gQLqcXOAF7nCoN6aMR3kNSa9PTfYKSX823QvUu3/ILjuQy4Dvqlfqm9XSsMQeTJXehta ODFbmDtO5JLoIIFq4/B7xaB1nbPiXmzLP2Uka87/kABo3QHSu7pqQ5tFWu555DjXVPXV j48A== X-Gm-Message-State: AKS2vOxblzzU3AXJLLALOEeJ5NINLYI19zrHtcbskxjm4usBm1kqtJz9 haZYbtWfO4CxcCMoBBU= X-Received: by 10.237.32.202 with SMTP id 68mr35539222qtb.128.1497962857186; Tue, 20 Jun 2017 05:47:37 -0700 (PDT) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id t42sm8737532qtg.43.2017.06.20.05.47.35 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Jun 2017 05:47:35 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2017 08:47:33 -0400 Message-Id: <1497962853-21428-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 Subject: [FFmpeg-devel] [PATCH] mdec: use correctly permutated quant matrix for dequantization. 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 Cc: "Ronald S. Bultje" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This allows using non-simple (e.g. simplemmx) IDCT implementations. The result is not bitexact (which is why the fate test continues to use -idct simple), but the PSNR between C/MMX goes from ~35 to ~90. --- libavcodec/mdec.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 97bfebb..59658b3 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -49,6 +49,7 @@ typedef struct MDECContext { int mb_height; int mb_x, mb_y; DECLARE_ALIGNED(16, int16_t, block)[6][64]; + DECLARE_ALIGNED(16, uint16_t, quant_matrix)[64]; uint8_t *bitstream_buffer; unsigned int bitstream_buffer_size; int block_last_index[6]; @@ -61,7 +62,7 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) int component; RLTable *rl = &ff_rl_mpeg1; uint8_t * const scantable = a->scantable.permutated; - const uint16_t *quant_matrix = ff_mpeg1_default_intra_matrix; + const uint16_t *quant_matrix = a->quant_matrix; const int qscale = a->qscale; /* DC coefficient */ @@ -212,9 +213,7 @@ static int decode_frame(AVCodecContext *avctx, static av_cold int decode_init(AVCodecContext *avctx) { MDECContext * const a = avctx->priv_data; - - if (avctx->idct_algo == FF_IDCT_AUTO) - avctx->idct_algo = FF_IDCT_SIMPLE; + int i; a->mb_width = (avctx->coded_width + 15) / 16; a->mb_height = (avctx->coded_height + 15) / 16; @@ -231,6 +230,13 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUVJ420P; avctx->color_range = AVCOL_RANGE_JPEG; + /* init q matrix */ + for (i = 0; i < 64; i++) { + int j = a->idsp.idct_permutation[i]; + + a->quant_matrix[j] = ff_mpeg1_default_intra_matrix[i]; + } + return 0; }