From patchwork Wed Jun 20 11:10:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9449 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp618644jad; Wed, 20 Jun 2018 04:11:10 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJT8aHLQ1xH/KHO82k35zJafFvtYmbF6bsTvW+cgqJP3RmMT47oTgtI/RmJdUKwx/JrDsr9 X-Received: by 2002:adf:b60d:: with SMTP id f13-v6mr16741522wre.186.1529493070677; Wed, 20 Jun 2018 04:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529493070; cv=none; d=google.com; s=arc-20160816; b=mBE4ujQ6gB29rcWO9MgZ5FxaG+mRaXX1LlYl++Iv8RJKZEtSHBBHSVXNxM2FOWgUWj jy4gA8iwW+40PAk+okuJoPb7LTFKpi4yj4q3GYrowIHfhM4/rkAE/xbnhaC5WcjNOnta /UTmP0WYBm6tD/z0Pp9KYK4a7hK5W0BCnLmNwmHcRBCugIGXLLamL5m4BfM4vP9GabOJ dKeAoPh76fsIFwTgBeknzzwtHUA6/b1LANPmG8JknRrLQoFDlp1jEmBcgOfrtIl2oNKN tgRfuNWYUpL6RE2w9Q3F1w+AePLKDxPhTlNxj3S8b3RLUFay5PQREFaeZEdZf5/M8dPk +Ktg== 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=HdwmgROF+le0h9NEoUtbgxtEwnW/S7DOQ9ep9bu34hs=; b=V1PTuuC2tlAloUHZAsdSfeg5CYrxnHh420QpodxnTNYKQw7wJI8oWB20g/elzs2oEK dVw6YUNZjw1YVgqUJ8HyBI0kdfROUnt4mffFK/KG6uDwbrA3tC221vY4QH+4hrvHkowC UsU/d/UEKlH7aNgi9gUBpaJFbZCgwRTIwVz3H1Pk4lyPAO/401KbRBRZ6mqxSigc4gje OzYX0ZNmTj6o0Jc8ZGvzGETvVks20ZquX4/xwxrhvW/S0yyV6K7/QrLi8A6XjNBardEa Bt96ev+8/wv/RWLj0vPMrsEoLV3U59yWKK53j75S/loEAfYgL10rPiVE+LcdMrEEeOCD pbyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=FsZmokrv; 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 90-v6si156980wrl.443.2018.06.20.04.11.09; Wed, 20 Jun 2018 04:11:10 -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=FsZmokrv; 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 0D95A68A3E2; Wed, 20 Jun 2018 14:10:14 +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 AE3BA6898D8 for ; Wed, 20 Jun 2018 14:10:07 +0300 (EEST) Received: from [10.1.50.50] ([87.215.30.74]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w5KBAwqp027024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 20 Jun 2018 13:10:59 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1529493059; bh=6YdgaGMvy3U+UEmzst47BA998t5e5SvOQQ4kmM30xP4=; h=To:From:Subject:Date; b=FsZmokrvqR/w+WN/VZJq8Z++Y6/IJX3PDOkwroo8/XXzfm6ei+I+1fQFpggtbIinm fp3Ir6X//AsD+/Mwr2KZkp3R9RP5/4WItIOxM+s6eOh51lGydh6bWOvTuQi7fM0+lY orhNuPH+32zB+Q4AOQ8gaD0QmldZWlgch22IqgKv0fR6o8kTzafY9QX8MC3WipdXkd FYopUzxlzlpJwRO1BEJQZRmCkbdTzIC+vRWUTwSB3VlQLjL2/CndvtLrKg8DEApCT5 O9Uguc7JOMsxK/iLc/cshy8ClSmpmRIeOEEHJdBlCMNVlOoBFd/mT91I5P3gxyjv42 4+rjHn5Gwuw1g== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: Date: Wed, 20 Jun 2018 13:10:58 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: nl Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/vc1: fix condition guarding overlap filter on I picture 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 overlap filter needs to run when PQUANT is 9 or higher, irrespective of CONDOVER. Signed-off-by: Jerome Borsboom --- This patch set should fix decoding of the SA10125.vc1 test file to make it bit-equal to the reference decoder. 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 c620566f78..b58b71b3e0 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2726,7 +2726,7 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) v->vc1dsp.vc1_inv_trans_8x8(block[k]); } - if (v->overlap && v->condover != CONDOVER_NONE) + if (v->overlap && (v->pq >= 9 || v->condover != CONDOVER_NONE)) ff_vc1_i_overlap_filter(v); vc1_put_blocks_clamped(v, 1); if (v->s.loop_filter)