From patchwork Fri May 18 15:06:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9009 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp5415815jad; Fri, 18 May 2018 08:07:15 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqATYURsmXoHt1coGp4R7fMth6gaQFHlp57AXlpJYsKjhux8GgVPDIlcNemFzs5f8Ae0/JF X-Received: by 2002:adf:988c:: with SMTP id w12-v6mr7746844wrb.215.1526656034945; Fri, 18 May 2018 08:07:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526656034; cv=none; d=google.com; s=arc-20160816; b=wssf6gyqMQg1dBBsOmSjWEki+hdsJdwdmZfsMzExaQUYtMdPWJZGxF4wehmGK7HXO0 SDGDJi4JkJ7X1a3ls4Vh7YH4XujAagW6A6KfpEpo4gL1e5RqL47uwDSAqxkqP8SFryqi /zQVhuGmr1s/OZYJeGvffvhUkkeKrfB0TAAN2tGVK/l67FOVfRU0LA/7/uy/8+nwLm0p oxLjcGAtLzaqIJD7/U+ca40kcdN/B6xDLV1M4FxTbZmrrd8FrAqR+R70mz1pN4CBRJL1 mD/1do61MC9DWm0inF7ycKySB1tHyOIfwEVgyhuOz6SBx+U9QyEjg3NEEb6kAwFPQQAD xWSg== 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=vlYi3i82M08T7ADNPnnbso4OTXsQQmmgbDKTNNxZNV8=; b=orCKc6sCZJJfMU6siCguyIob4K6suM4PrG5r3lCgchmPYsKLytP/EX49a95G/f7e3P d+ApzJThSR+qxKOdWkfvhlPvRBYTuEWm/+IYvzQyBYYQMFu1+oVT2HEe4vNlr8QhchRk OWCtysWmUWyyJ/q3/pNN18yv/WoQB67jmE17YeZ1WpGEX+Sa/LmA8SxGkMsH0uKdWWOT mM9Hanp1DHZFaN+tsO6W7hdajr6glMcFWzTUvV6+2lvmHzelQMn+P9QQqTMsV1mFQ9D1 3SVcSRyp6Ua6dttLOdUfeatvxKPB2/bQYZeh94VteO+IWznbYc7/J8fjmUOJfH8vOU/1 oKsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=WgMW6SB8; 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 22-v6si5709763wma.107.2018.05.18.08.07.14; Fri, 18 May 2018 08:07:14 -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=WgMW6SB8; 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 3ECAD68A3C8; Fri, 18 May 2018 18:06:04 +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 2B31968A3BE for ; Fri, 18 May 2018 18:05:58 +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 w4IF6aTC009646 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 18 May 2018 17:06:37 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1526655997; bh=aT0lMvxcld8vfaIn52pVLIhjsE6+35Kft6tp3NP/gnQ=; h=To:From:Subject:Date; b=WgMW6SB8wHwuShY9BStw/nreHppSH8HAmtC68cad3UAfoayC3y8y6WQ+l3UNQuaNO teOao48iNuN2X+YN5q7sfx+sV4LV2HnEgXM8OiDw+NhTyrqBGEeQ1P7Cst0/SD7kjv Pb+UWrvuoKcWTtXDkt4Ze44Sn0/f3ZEtgwHf0r7cGcGs9epNwduDAkspTuZjF/1J8W M9wNU2/JlYZkedYxp8jKqsgXiIgupJFhfcIUkBSOM0IVSKgRtPxMiMp8A/gKh1hwj2 +Jbsn6kXg2YU+1sUJ5b5fSOVQ9qVJhZbbLOYtYQa/Sd//6JVPbAKHSSAZK0EpDLEuj nCimlJuGSYeLA== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <3784d0c2-03b8-2533-83ea-72c60b857b3a@carpalis.nl> Date: Fri, 18 May 2018 17:06:36 +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 5/5] avcodec/vc1: store zero MVs for all blocks in a MB 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" Direct prediction for interlace frame B pictures references the mv in the second block in an MB in the backward reference frame for the twomv case. When the backward reference frame is an I frame, this value may be unset. Signed-off-by: Jerome Borsboom --- libavcodec/vc1_block.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 74935ec9e9..9c170a1e3c 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2678,8 +2678,10 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) s->bdsp.clear_blocks(block[0]); mb_pos = s->mb_x + s->mb_y * s->mb_stride; s->current_picture.mb_type[mb_pos + v->mb_off] = MB_TYPE_INTRA; - s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][0] = 0; - s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0; + for (int i = 0; i < 4; i++) { + s->current_picture.motion_val[1][s->block_index[i] + v->blocks_off][0] = 0; + s->current_picture.motion_val[1][s->block_index[i] + v->blocks_off][1] = 0; + } // do actual MB decoding and displaying if (v->fcm == ILACE_FRAME && v->fieldtx_is_raw)