From patchwork Mon Apr 23 19:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 8620 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1020938jad; Mon, 23 Apr 2018 12:00:32 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/fbtdm2ps4/2k1dNnu0jbSk+NWus12wPLkiWVsRPgfURmG8KOejp1yoxYSt/rL4ry7qBn1 X-Received: by 2002:adf:e791:: with SMTP id n17-v6mr15101702wrm.225.1524510032006; Mon, 23 Apr 2018 12:00:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524510031; cv=none; d=google.com; s=arc-20160816; b=TNpLlwUz/IFWGoHh3mI1x8yEMnfKCTFG5xe18WovkFqsJxu6oITHIGQfq02UGW1jVw y3OF6fWAxbAhy5nXOA+XIxHQ12CkEQRQw9FBarzo1kfCyqWJtpnfy4Ks3mu2axd2I9do LKmCRVO59H8BARi7BTEAGJC4nCRX1jmC8gYsr0G6DCL8O3FDlbtv4Wc4jAI5hSfnnwgj tzy6ayWmK821DpzsqVbrGyrXRit8vxvbLsjlE8EbtJyxLjjTsi39NY/+JzCCjxFt7k6Z Aod2L8i8aPfPrAdkwNRX8Q8oVJ6mXKb9pVYnb1E8/EI9t/YLp9fO+3HvgsMdPoVSGCIf 9Iww== 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=dKexuC1azR2LF+btUyTvMpCsaPOY4d+WlOlZTJzcZRE=; b=wPepSuN9ibR1Oem64xDR3Ct6Cy4CTq3hBJKLDphT5kpoymnVoeNTuV+biHRyrCBBcW XrnxMS9VUeylba4p9gMt8TpXXapkpclXHgjGKeahToopWlpvPmuvgR5bKVPDA74dw+3e c8KJ+xz6n0RObFv/lmFQaM2L3/9LA46zxHUwdJopwCP5+km6jgRnfc4XVoRjC0jzQ0hS qpBUCCXqdYPwKPM1CFg0flvms96WjkeqE8SdTijYRvYru+AaWxg2+0/QAlIYlWFbjPwN RYLZBDx5aphAzHwQl6EwFan3f12th3MnDg7MMdfA3QxtVyP/267rQzL/Eb+OGxSycVNT OuMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=ZBi9nJzs; 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-v6si10402489wrz.233.2018.04.23.12.00.31; Mon, 23 Apr 2018 12:00:31 -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=ZBi9nJzs; 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 5FE4168A1BC; Mon, 23 Apr 2018 21:59:42 +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 CD2F968A03F for ; Mon, 23 Apr 2018 21:59:40 +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 w3NJ080A003335 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 Apr 2018 21:00:09 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1524510009; bh=Bp6QlqsQSfGB1HWj1207piyL3t3PlwUEWWQ4u1eAudM=; h=To:From:Subject:Date; b=ZBi9nJzsB86I/sKr5bipjq1NEwzn9PrB4Q65n7WSlfUDvBNXSw80Y2QFYeGf3ZC3w vhEcF9pt5nRArXg/0GQ1DjkO60JSsIggo1CrPQwb+IhtlPG61WnBIDJvZYZ9v9LvPV hoyfJAabzp2tGVVkTFZN2Kix5famo1D7r52NpDzTXv73ys8ySCseJrkyU0ruKHnWgf dygQVWmGpEgyGirFMAwtTzstiXXlge95PDb3rOnvk5epN2LIRKDJD57z6G8j3jxGeD 9/v7C5Eg4jbffAztZUP0hacPJp2FpWP9TAn3d+UzI2QF8SZhgV0kgvW59Cbt/GNAym pCx47Jr/moR2Q== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <23397af1-0073-3b89-097f-20194d6ad0c8@carpalis.nl> Date: Mon, 23 Apr 2018 21:00:08 +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 12/14] avcodec/vc1: correct mspel for field-interlace B 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" mspel indicates the use of bicubic interpolation. The check wrongly included MVMODE MV_PMODE_1MV_HPEL as using bilinear interpolation. Signed-off-by: Jerome Borsboom --- libavcodec/vc1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 2b9f8db3ee..20cc84eb8e 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1224,7 +1224,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) v->mv_mode = ff_vc1_mv_pmode_table2[lowquant][mvmode]; v->qs_last = v->s.quarter_sample; v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV || v->mv_mode == MV_PMODE_MIXED_MV); - v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || v->mv_mode == MV_PMODE_1MV_HPEL); + v->s.mspel = (v->mv_mode != MV_PMODE_1MV_HPEL_BILIN); status = bitplane_decoding(v->forward_mb_plane, &v->fmb_is_raw, v); if (status < 0) return -1;