From patchwork Fri May 18 15:06:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9011 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp5415074jad; Fri, 18 May 2018 08:06:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpiDjjBD30VNOqRt4XfP9R+W+PLCqbW5H3FWxIVvgu35SA1nL1leqoZwb0uttTa4dtkupJ4 X-Received: by 2002:a1c:d755:: with SMTP id o82-v6mr4428968wmg.71.1526656000834; Fri, 18 May 2018 08:06:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526656000; cv=none; d=google.com; s=arc-20160816; b=t/u3UjaKHRtNEK3Na2iGBHTnIafiAbGiRVrne+XnsJk0XYTQ1PbPEIAil0tD+HPNpc INF3cD66JPpqZpsKae40lDeF2gB1qJFENRvaxt4WqtKxXum+O9CWtSHdIiBwvtjmfGQX 9xbbaAzfsDxxCE06MApIXlChfGarzPKWVH4QkAA195kJ1foFN58es+R170B984QamNdc IrRaR79WiDA/P0n+3KKdryrfnyQfaMN7Ohn+n/RGk41X1EvZjdMFG3dHxIUp0peGoqcZ FqBt/O6fwpjIBrR3iUILTKNKJ86xkl5YZCLetFzfmjk+AIktLSrKSK1T3R3+X7Z3a1D4 B7xg== 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=v95LrhEJEnbjfbC85xdXXwVmUN2hqp6nOiDHVX4ij44=; b=sDc4GfvdP06iMZDhHLR7CwFcQowq32aVnHhsgjFCUIsvgBynm56DkGVOe2y8DdsDSg yW+TYUX03I+dUSVo7lqsjfD9xb292nEzgaIXCy2zQaocprm8OTTiczlrJK7ApnUqDrES FXwGCXjW99gZi+JH726AGm0jbZRU9ukHLNqVm0i+uZWa4oQGUCfBfq2yuj9U4fjhDjBq W73yIzcTPbjS/8PXUtEs+suKSJrLfZPDk+TB/rLAVgN2RUlHkB0Jh1b0b+W0QTuYF10Y gM9CtGyoupZZ3apdKbewUaEStxrwTtSIfVEPiFu9khYzvK+o4vNaO/tYEKQvSMLQMJTM RY3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=p6agfY1e; 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 s21-v6si6730521wra.410.2018.05.18.08.06.40; Fri, 18 May 2018 08:06:40 -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=p6agfY1e; 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 6F64168A31B; Fri, 18 May 2018 18:05:51 +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 7FA0A689E88 for ; Fri, 18 May 2018 18:05:45 +0300 (EEST) Received: from [192.168.2.133] ([192.168.2.133]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w4IF6Nlw009633 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 18 May 2018 17:06:24 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1526655984; bh=X1p3BaloTRI8tORJvYwvakQli2FeNy/SewGYOhtBNjM=; h=To:From:Subject:Date; b=p6agfY1eq6Mn3+nRy3Awrw73WbQsjZ6ozXg+OyU1PzRDJTOzYBSXU6LQe5TEjO16F WLZ+37EgS4GOECvYo9mdMgpBq6n4RfqLyito0RAMWEauaIrXg6Y3zUEu9pVw+lAgMN lb0Am77Kv2thYf/mVk9UBJT1Oa76ahHPBXuurXrMZcgbWzpPBio8Fb5n7RsS1z/jYa +/+dN5moc2lIu0KRbWwU/cAFyc6dUENacInk7ILxdjnrY2pD2cOcxYhmgUaLLloI53 e9w1nFjsKn3pJwWG1zlqI26lPt3W1qeC21CY4VoHpgsD3FAkaxSmzUUBqr9DHJ11Ev 3T4S513IA1Tkg== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <44213cf8-c2dd-02b6-fe9d-08c8c8261ee9@carpalis.nl> Date: Fri, 18 May 2018 17:06:23 +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 2/5] avcodec/vc1: fix mquant calculation for interlace field pictures 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" For interlace field pictures s->mb_height indicates the height of the full picture in MBs, i.e. the two fields combined. A single field is half this size. When calculating mquant for interlace field pictures, the bottom edge is the last MB row of the field. Signed-off-by: Jerome Borsboom --- libavcodec/vc1_block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index daf30fdbfe..aa2ea5024e 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -181,7 +181,8 @@ static void vc1_put_signed_blocks_clamped(VC1Context *v) mquant = -v->altpq; \ if ((edges&4) && s->mb_x == (s->mb_width - 1)) \ mquant = -v->altpq; \ - if ((edges&8) && s->mb_y == (s->mb_height - 1)) \ + if ((edges&8) && \ + s->mb_y == ((s->mb_height >> v->field_mode) - 1)) \ mquant = -v->altpq; \ if (!mquant || mquant > 31) { \ av_log(v->s.avctx, AV_LOG_ERROR, \