From patchwork Tue May 29 20:02:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9155 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp3493456jad; Tue, 29 May 2018 13:02:16 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpYl3Fy4IHNxoNzNv7PvDG8v+k3u3ed6eFkJUdxUoAHj5CgOKAGHoyJptgZM4wsa3QItJv5 X-Received: by 2002:adf:eb12:: with SMTP id s18-v6mr16164400wrn.174.1527624136704; Tue, 29 May 2018 13:02:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527624136; cv=none; d=google.com; s=arc-20160816; b=D660H16wfeyE8gDtrCXPy2uG7na8Uf45B9/tCxnGzb6u6CZwb+egYRgOLQtl7oRjya U2Jhhw44hHsf2v08b01ElpeDLhF2FttfOxbyB7ts8qVAmwKdjPN8lPqvAHXZ5gHNYT4Q 1NKFcR1cTYOpsGu74XYARYhIaWVlqrSOkbkZ/lRyr5lu7yhV0TcLoVRPgyBsSCKE2ZaJ 6QTSNJ2oQ96J44oBETmAgT+Pd+LDRq9yyIxVlwLWsIoM/uD5Td4rZ1CdFauxn12mTIrz Acqucx6k6OK/wp28g/yWHr4sDXJLt0uZurpXLJmpArabgG1YtRHVmGlsD8zAd4jYmJQR UZrA== 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=vOZ0NIc+PTNC3zwC3i8HK62zW5L7M0VU8jJmsR7ZLHk=; b=W72+lr9EaEPc2vy6+A/psBdw10M+s++fEKXWi9Uys6hD+Tg2cEzxOj2dQjtzHkGFLS 9oUTkALEL8tyjSfGh2J6bVkaRwkdm3JeL+4g623ZZUKcwjziFf7CVmfrv9CSg7sAO/g4 rnvbEq/cJ/j832EvrQDwOONdETxuQCcGG7xglZLLu71l8wzUZ1iLSPM9QHF4UIHyUWI/ /0Loez1RHdq6n49TMgj+6HX+kz1WHPXM7MUyDi5fYbbrGwiNBdtnQlT/q9R2WROZpyGw +lSwAl47qiZm9d2CBE/uNBZhW12ts+8EBhd20GhaQhxenQrE0fz0UOU83Dv/ZSvIVjGe vXaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=bu1thtlR; 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 x127-v6si12278681wme.197.2018.05.29.13.02.15; Tue, 29 May 2018 13:02:16 -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=bu1thtlR; 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 1CE7A68A29D; Tue, 29 May 2018 23:01:30 +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 82C83689D80 for ; Tue, 29 May 2018 23:01:23 +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 w4TK26ro029568 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 29 May 2018 22:02:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1527624127; bh=eOizfUVBd8mor8j5FVpLUzEbNBXhdAqRul1KkyhHOsI=; h=To:From:Subject:Date; b=bu1thtlRUXJ7H+Orz09KjqhZoCj7IuGcn/RJvSYl3tVCjbq3uuxJ8bTQMJRXASfi/ t9fFMomjQQ7TCB8BdTbCGr+gx1rhDt1WEwFP/5Fm4AyfNDo1wpQrymwqtGrKdptZsb e3zlwTMKPUZgHB4VUkznq3zoASLWWA6pozsApL0WjSPBY+d2VZr5xvItD31n9+t3tS 3bpsK9Aj1jpyiNDfJQCF5xAUWZowSSGIVZHJf7yHCSzUz7JkmdmZq1Rt/KtXtJcZO9 k/yEuoBudlX3/tI1oNFpQLOwCS4A1XVDntXXOoEjK+sInzER91+8ukDnJTNqy0ZRNk pgXE+YhXxWe/A== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <212f8acc-1340-db58-2ac7-716a9e1ca25f@carpalis.nl> Date: Tue, 29 May 2018 22:02:06 +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] avcodec/vc1: fix overlap smoothing filter for P frames 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 v_overlap_filter needs to run on the colocated block of the previous macroblock. For the luma plane, the colocated block is located two blocks on the left instead of one. Signed-off-by: Jerome Borsboom --- This should fix the issue with the SA10100.vc1 test file. libavcodec/vc1_loopfilter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c index 4c0de7c025..676922aa18 100644 --- a/libavcodec/vc1_loopfilter.c +++ b/libavcodec/vc1_loopfilter.c @@ -145,8 +145,8 @@ void ff_vc1_p_overlap_filter(VC1Context *v) if (v->fcm != ILACE_FRAME) for (i = 0; i < block_count; i++) { - if (s->mb_x && v->mb_type[0][s->block_index[i] - 1] && - (s->first_slice_line || v->mb_type[0][s->block_index[i] - s->block_wrap[i] - 1])) + if (s->mb_x && v->mb_type[0][s->block_index[i] - 2 + (i > 3)] && + (s->first_slice_line || v->mb_type[0][s->block_index[i] - s->block_wrap[i] - 2 + (i > 3)])) vc1_v_overlap_filter(v, s->first_slice_line ? left_blk : topleft_blk, left_blk, i); if (s->mb_x == s->mb_width - 1) if (v->mb_type[0][s->block_index[i]] &&