From patchwork Mon Apr 23 19:00:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 8619 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1021188jad; Mon, 23 Apr 2018 12:00:42 -0700 (PDT) X-Google-Smtp-Source: AIpwx4972THlUU4jc2NGdwMDQUefEctm6JqQShzomNVZuWjBw6bAcf3R2pe7NHSkspq1KQStyfwx X-Received: by 2002:adf:8df7:: with SMTP id o110-v6mr18751995wrb.251.1524510042518; Mon, 23 Apr 2018 12:00:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524510042; cv=none; d=google.com; s=arc-20160816; b=yChZlGC7XJenlanndvLejriDr8nxIAllstKtCcBjJ5sB/CI+xQHY6cla3WHdtTE2d7 Oo/Yc65WQOzgJaCFRDj4SabAapa3JMdPb0Gh+9jKWht7/1AZ1Niv5bFWTU3OAGFovaL5 7xHkhCBW8iJ3P2nYwRiMuotIaHhhXVzx/mpoU/EYbnx71yR3342u12Z6PV82+YnDn9WW AOlMsqQJ+WjcYNIvfe9CWFxTYXaZnloUoMnqe3rdTcfcNLl5Ug4GHgxGS4Hq00Pe6vrz lJ7/DK7R5yLErmJxtgtu7ICUrIPt/lN8tR4XAKXgavBUkVGETIrZYBTxXzNyMfAVO+ox tvtw== 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:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=T8DU2KxU8gc8YfXbLo+OhyDyIxa8SYaIYlGwqp5XTks=; b=ABj0HciaIA/X/Ekzpq3XMw+42mHiMeaDQ16n+wBont0+q798E4m/6N4zOnp+HTV/11 nVt/pQf1Wdseoc1UsLkkCX4ytr5219uzdzEeGcPm2QFeSOdWmcDkQpMkKybtEtshkFfR GyqE7kT/7pWkLWTc+eSn1tNzDYfgGbKiVysbYUX2BfYA3i9dbhyXgEZg/kR/T1WIkmjS wDyOKweZIgnhHCoLLUMAlPCkjSYNAGolmI5lT7DCEvcl2F49kknjq/EbGKDBtJYKPJVX 911hQXF7nj8EvdcNHmivn8Qa8grCy7MZz7dfV0VeZ1GffEF5vlA05NXQB6fWNUJ1P6OE oB4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=QvwZfQCN; 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 g18-v6si9754483wrh.54.2018.04.23.12.00.42; Mon, 23 Apr 2018 12:00:42 -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=@carpalis.nl header.s=default header.b=QvwZfQCN; 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 F2D9F68A1D8; Mon, 23 Apr 2018 21:59:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from kyoto.xs4all.nl (kyoto.xs4all.nl [83.161.153.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95E1C68A1D8 for ; Mon, 23 Apr 2018 21:59:47 +0300 (EEST) Received: from [IPv6:2001:980:9507:0:8e70:5aff:fec6:83fc] ([IPv6:2001:980:9507:0:8e70:5aff:fec6:83fc]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w3NJ0FKp003340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 Apr 2018 21:00:16 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1524510016; bh=YNMOopuxltJZYw3RmT5HRVh7Iz2qQz7ac4fQcOw0S8o=; h=To:From:Subject:Date; b=QvwZfQCNbn9c7itQBkoKOxUlM/4xYkiY4+DqI8koUMx80TKi8RMYz854hUm7Rtb2J ++QZlfoLNkdWUXlPKp+onb9/IpP0rgkIxEUSAffu400OzVnqVxGU1BROqI1ZA3SZSr ZNWnkUvdkJ4/UJinmgC3MQOKctyNipaOarIj/6xXddQ59IE+JH+L4OAdHItRA64ler 060H08pjeUlQ7eTuw+X4G5Ne9VnfI8SxKbU8nsPut9zCcNckajYtdKobou1z+6aEQq m8J0DwLmXZTLIf9Prdv8VvggVf3RlmXckF8a//VUmoZ5QI2VNNaS/SAFafXgf7XX3a 1zaVgsFvCQp4Q== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <6bd8c5ed-f96f-1a87-7f5f-e08c399475c0@carpalis.nl> Date: Mon, 23 Apr 2018 21:00:15 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: nl Subject: [FFmpeg-devel] [PATCH 13/14] avcodec/vc1: correct AC inverse quantization scaling 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" HALFQP should only be added to the inverse quantizer when the block is coded with PQUANT. See 8.1.3.8 in VC-1 spec. Signed-off-by: Jerome Borsboom --- libavcodec/vc1_block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 7d6d5c781c..af40fbd21d 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -944,7 +944,7 @@ static int vc1_decode_intra_block(VC1Context *v, int16_t block[64], int n, ac_val = s->ac_val[0][0] + s->block_index[n] * 16; ac_val2 = ac_val; - scale = mquant * 2 + v->halfpq; + scale = mquant * 2 + ((mquant == v->pq) ? v->halfpq : 0); if (dc_pred_dir) //left ac_val -= 16;