From patchwork Mon Apr 23 18:59:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 8613 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1019765jad; Mon, 23 Apr 2018 11:59:20 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpZ4Yn/PFEC66frjfjFPDl/Y49kT2cZ6lVnXFrzUcUX6gO14VRXzEfE8NxbHfxb8nn/Zzyy X-Received: by 10.28.105.82 with SMTP id e79mr3837523wmc.76.1524509959933; Mon, 23 Apr 2018 11:59:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524509959; cv=none; d=google.com; s=arc-20160816; b=rM5A1cthMBRpGGaRv9X8LYDnrstWDJM5jzvUivY/uxn34/eWTE6EgvQF7UEQDuCiLU OehLYM0kxRQSKaMWDkCI7VLZqO0ZhbDxOsK8oBU6fT88KoTGszjZTihFUwj5IgUNKXvu lyCvbrngxZUvsrt3JyZs9BDZ993R4c+MLDfwz67WcAwrYg/FP/zSPRjMhKJNIuu+IPp5 gDfGykJWIiJk40Z0T3cFbRnoXAu8rrSG03ICOSIVcwEoBKgw9G7UBEl4rVG/EgehHhnB vafCkLlJU0mwvKUoNRQHBbifdRclALRl46TzrYFMQsxACzgIUU16UaHjjyY2tOdVNzcI dBXA== 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=SNI9pIMXP4hSFnHuIR6cXd8WsxzhbW6xFv5X0pARgf0=; b=uqM7XJl1nEtlUtU0toteZ/uDEs0anltp7/YHnW9EfsyGaKL8U9kNZ7Xqkdijs3P8QA MBuZ/d+ALDmtMuTXgCCKWvB6Hrd8igYA3sYnFrOfFjElPlXzxzKGJVHT066tNtRZ+Zga 7zQkd5ZkwWST49lhAywKkRHrfBWW9iXCiRf9V9b32xm7yxitnEYy3IxteT5k8LI+3GKQ ZuerqawFKT+aaSBmyVZw0NGqROSL6vUoF4mIbiv4GM9dVY7CFd8k3iaStSK19zrbFapc wdQvkJJEBWaGt1UTpfY5rij2R1+H9IyqN6fDb4ZO+32XRiq7liRiGfSAJzGZhtZdkMyS SU6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=TXMWDWoB; 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 2-v6si9773708wra.324.2018.04.23.11.59.19; Mon, 23 Apr 2018 11:59:19 -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=TXMWDWoB; 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 DF3AA68A0C8; Mon, 23 Apr 2018 21:58:45 +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 03D7A689957 for ; Mon, 23 Apr 2018 21:58:44 +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 w3NIxDbw003289 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 Apr 2018 20:59:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1524509953; bh=98o2Kjm4UKG6SY5KryT2EUUE+a/8WbhUAaj6LOw1/Gc=; h=To:From:Subject:Date; b=TXMWDWoBf2jFdYd/86xmbbztr9pIqRYq4oIJb2fGJd58Jrst7xDOy/mXH6VLb4FDo YnTfq+BQMqYUXvLsyEeYDQ/M9SFX20x7eFXaRrGtf0eHqjp+n6lfkHkBTj7MtmN3ji mit9k3J+WXlULaksb+kD+dEsgMNWx3YHpBwWTnAfVaIqJJlpxIZsXUPf6lqDlYw+y2 MAX8V2RXlgGUq9K7isrP9Z/ZHErXfEO1jm2lvWs5UWLXMwaTHwKXuDH6MmJcpEsEHe iQePH1M7zBI8peZBkVWUWZ+vfBD6qSMLyRNIeiHF20pg+GbPBlhZ/35uC3yp0rtUxL uFyfvgg4O0PVA== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <7976b1f3-829f-2d03-2623-01f7af4bd7a7@carpalis.nl> Date: Mon, 23 Apr 2018 20:59:13 +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 05/14] avcodec/vc1: store color-difference reference field type 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" The loop filter for P interlace field pictures needs the reference field type. For luma, the reference field type was already available. Store the reference field type for color-difference as well. Signed-off-by: Jerome Borsboom --- libavcodec/vc1_mc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c index 75c74cad8d..5eacaaa8ee 100644 --- a/libavcodec/vc1_mc.c +++ b/libavcodec/vc1_mc.c @@ -344,6 +344,10 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir) v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); } + if (v->field_mode) { + v->mv_f[dir][s->block_index[4] + v->mb_off] = v->cur_field_type != v->ref_field_type[dir]; + v->mv_f[dir][s->block_index[5] + v->mb_off] = v->cur_field_type != v->ref_field_type[dir]; + } } /** Do motion compensation for 4-MV macroblock - luminance block @@ -636,6 +640,10 @@ void ff_vc1_mc_4mv_chroma(VC1Context *v, int dir) v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); } + if (v->field_mode) { + v->mv_f[dir][s->block_index[4] + v->mb_off] = v->cur_field_type != chroma_ref_type; + v->mv_f[dir][s->block_index[5] + v->mb_off] = v->cur_field_type != chroma_ref_type; + } } /** Do motion compensation for 4-MV interlaced frame chroma macroblock (both U and V)