From patchwork Sun Apr 30 12:34:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 3516 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1022103vsd; Sun, 30 Apr 2017 05:34:16 -0700 (PDT) X-Received: by 10.28.10.67 with SMTP id 64mr4027593wmk.126.1493555656133; Sun, 30 Apr 2017 05:34:16 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 42si12874131wrw.199.2017.04.30.05.34.15; Sun, 30 Apr 2017 05:34:16 -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=@jkqxz-net.20150623.gappssmtp.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 6063868921D; Sun, 30 Apr 2017 15:34:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2570768060C for ; Sun, 30 Apr 2017 15:34:03 +0300 (EEST) Received: by mail-wr0-f169.google.com with SMTP id w50so53635884wrc.0 for ; Sun, 30 Apr 2017 05:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=kElNba0HaE47X/mUHy2W51YmXzOUJ9IFuF/YA9PYmmQ=; b=YHffZHBSh1HHnH84zR3gBUdJ48U/M6ACexCBNPTdBX1sChqhDutO/zYMqvL7Lnz2Bn F3K37xk7yt2PtT4J/O5uSzWY9y+XvVI1umfUmYjk7RcGpux6N7MyVX4A4NbSdow8brjt cvbTz6ytnbA5yH1bT35Dzqr7E0vfLoh8HwgcqfDLNWSWGMm+S8+g1SwG0C+xFfk57dCq ruKH/s8rumvjYUL3FypBv/lN9NCOFHIwQlf7dkTmZy0XbVu1yTphkoywg20mF1983Wg+ pMRQkk0/FIL5nGVK33Kxlz7m9AHzi5laVZJG1QlcxMn2yoKvl39QR5JdSQuAkVH/Y8Cu rnFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=kElNba0HaE47X/mUHy2W51YmXzOUJ9IFuF/YA9PYmmQ=; b=sLr2V4TNtCGZ2lt0pYcnbDvFwEguV+hslLJ69T1xhDopj0+/oZ+sT8jOC4IdoFh5IB aDhxPI5h7FNASTg8Lg6E1koUIi4JP2jHFuDieHi0dkuyjFiJDoQZt5enkHWKmjA+vCSy vwTBlFXZYHEbI0PaTaXsUB5wkKy1HP1qYP1XT36c0uR9QCfn2lHedJa3U/RFfRhGkTUZ 59qTfUvIhSRjAH5p8kJLq7ATqu5DXtFEvqMAluxXaht4ufZOHY/qpPYFQz+KJgj+lGCJ WHA/zGBCEJUOXqqkPjeLFooj9eMLts0cmWk6GfNA0dKux3+GvOAkhcmNbqokz4XC2eIY nvPQ== X-Gm-Message-State: AN3rC/5nZmOAWb6mJx4IJLpiGRNDtd06INuOfDZ8HGp+o+noY9TJ8LEn zoQWqLtRMgmXnemy X-Received: by 10.223.170.197 with SMTP id i5mr12162397wrc.143.1493555645508; Sun, 30 Apr 2017 05:34:05 -0700 (PDT) Received: from [192.168.0.8] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id g132sm5991741wmd.33.2017.04.30.05.34.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Apr 2017 05:34:04 -0700 (PDT) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: <595f926a-c283-5b52-d98f-ba38da16ec15@jkqxz.net> Date: Sun, 30 Apr 2017 13:34:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hevc: Fix scaling list prediction delta for the 32x32 inter matrix 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes ticket #6356. --- This was broken in 627c044f50da3046809314f7cc742b8a10cf26a1, which changed the array index of the 32x32 inter matrix but missed this case. Sample at - with this change the output for that sample matches the reference decoder. libavcodec/hevc_ps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 6d67dd9c69..3e00e4b3f3 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -719,6 +719,7 @@ static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, ScalingLi * which should already be in the arrays. */ if (delta) { // Copy from previous array. + delta *= (size_id == 3) ? 3 : 1; if (matrix_id < delta) { av_log(avctx, AV_LOG_ERROR, "Invalid delta in scaling list data: %d.\n", delta);