From patchwork Fri May 18 15:06:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9010 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp5414862jad; Fri, 18 May 2018 08:06:30 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqsiMRgqSGKl+vDX8rooMx0cAmj7VPxpcIxM8l8DKPSNHwmxD8DJLdbXUQ447E7rgYDR/Cp X-Received: by 2002:a1c:cb03:: with SMTP id b3-v6mr4494908wmg.45.1526655990714; Fri, 18 May 2018 08:06:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526655990; cv=none; d=google.com; s=arc-20160816; b=Nf0Sy8lCnyRvMp9ZCE7AjsIJYPBMXTezCutLgzxpNftNh5tp2z+tFgzoV1rKe/0ira 6Wq1Hy1OY3ylq1GoWZlNKb994gGA3XwzSueRIMMI14XnqH2C/95jGZksS5LSPou+812Z SSyRb3ChYZQ0JYyXFp2nFeag/Mk/M99lef67zyVxXT3SEKCn54sEtXMawIXo+EppaknF s1MzktV3XsH7D4Cd7xCvuEPh2I4MOyzDtn7SsUhlBEl47uDSLsPD6uQLPGRtX87YTl3c UWp/S/Zrn3Q/sfsEm6IiAJiVarDY9cSVPZbYSPnuPBg6W4HqfrP165YuL5Mwc7OQ2xZU S5Cw== 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=Zq07Nr8wNcuchkZ5d1fGu4icuWxPDIxZuxqiBhFRAQo=; b=WG+yQPu6ygktct1L+Yv4wi0Szq/SzetuMuiFsjNCkFUtZLCiADQlaYqDvhrGq5+iV/ t+3VLmHv8LP+pPxGA3F8fjp8ppu1DtS5jaXhBYEFbeP4r+JVaixuWOG4LNeERMra4VfX Jvocs3Cqi8KcTREzWL/K9uy4eVYtp61p4f7h2BfbqzoWqBOwG332JMedCRhbrDiNUQ9B xg4HTUKeWsBRefXNtwgnsM3woPvJfqoIc57ZZyd9eM3RtwgWUbKxVwK9Sp8lfJSXw4ad +57mPj+ZGRWwtkGCdBK5LLmk4AjalTkz/TcKgBZ/uGX7TwtQLj159lXOydAl4Hvh8DLh km5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=cKVUzHMc; 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 p66-v6si6426683wrb.409.2018.05.18.08.06.29; Fri, 18 May 2018 08:06:30 -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=cKVUzHMc; 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 C5FA668A267; Fri, 18 May 2018 18:05:47 +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 0BF4A689E88 for ; Fri, 18 May 2018 18:05:40 +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 w4IF6Ih7009628 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 18 May 2018 17:06:19 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1526655979; bh=EyYvmkk8qkcWSCtHwytbH7vv2tds2uef5+ckiMJRzSQ=; h=To:From:Subject:Date; b=cKVUzHMcNLLcVkPzshKkH4LvzkGdeNzMjaWTh7FvnXvbunc9S/K/15/MFxmgXd4eF ek4u765I7UhXpQp+jlm2ryP+zA8PA9rfXA6nMukELRDT8g0neYpJdQKObfwAlg44jW mavZp8v0BNbyNXmyy3eMN/7LAovO9c3Eu8MIDRe1C76n2RN7Vz1XmdZk2zkTp2O6Zb OuMg3ZL8uiyWzbI/lKE/v8aam/GLn1daZ2lyAMrMhxNPLcWOdn+7qi7VXKtbROcTzw oZJgmcbBexLwlTCxtpfkbM9sBSo20C4hWNo3EsCselIjT6q4I4Oc20h9BAjfvz5H8J +5wBkKros3f/g== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <4eb04b91-3007-bab8-c377-9ee3ab70ae59@carpalis.nl> Date: Fri, 18 May 2018 17:06:18 +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 1/5] avcodec/vc1: FIELDTX is only coded raw in interlaced frame I 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" FIELDTX bitplane is only present in interlace frame I pictures. v->fieldtx_is_raw may spill over from a previous interlaced frame I picture while decoding a non-interlace frame I picture. Signed-off-by: Jerome Borsboom --- This patch set solves various issues that affected the SA10180.vc1 test file. With these patches applied, this file decodes bitequal to the Intel VAAPI decoder on Haswell. Please also review my patch set of May 9th that enables hwaccel decode of the SA10180.vc1 file. 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 f59c440943..daf30fdbfe 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2680,7 +2680,7 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0; // do actual MB decoding and displaying - if (v->fieldtx_is_raw) + if (v->fcm == ILACE_FRAME && v->fieldtx_is_raw) v->fieldtx_plane[mb_pos] = get_bits1(&v->s.gb); cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); if (v->acpred_is_raw)