From patchwork Mon Apr 23 18:59:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 8612 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1019859jad; Mon, 23 Apr 2018 11:59:29 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr7MJUAY/SLuMnFg0Ue39Jn2ssOnNJDU+7pvXYE4mgI/g1O2bjVbp3MbaXJc8cztsoSvUnf X-Received: by 10.28.23.21 with SMTP id 21mr10540498wmx.49.1524509968937; Mon, 23 Apr 2018 11:59:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524509968; cv=none; d=google.com; s=arc-20160816; b=ohFjR+BgBf0Vck1wNHymx9Oj0EAWjn6P6wq5hqV4mpqJWoYokAMwJKojRGEzlm/w0j 10hwfvbnOQGn20DazaYfbAPfmjEj93Tz5hIZONAYINLq8VWTfbDxNxxD2VFFVuqqvDXi IOINUjjKmpSiyv1ziNHK7+WHnKqVAA1PpO3qHDIaX0ERCNTHGBNqqHB4rGNqNjJnZ6lV 9TtG7aLjGxMEZL7sfXLvC5cPpb06WAgOr+nOwwVE3P47wnmQ72HwItEKn50X7rQBJVlv xSgybS/Dktw1IIkPOq5so4lHp7boDMju+Yn4AAU3IrMjgKNFg9liI/v43bnD7NHq/t8f wKMg== 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=UYUR2VO/C1K2d6lRrzc/oJe2I4eNFXfil11JfIMlf24=; b=LqGdC7mWoowS0EjR48hhWABGqEGdqd8ytj5RjaWTh6vw2R0rsE9aweh5fm5kztElRW Z62BqEmTXT2UNgpIb5jKyIMR3/cUOmPaxtInf6hBEEKP1FnDNvB/UX9q5nsBCWbY0U4/ 0eGZfIa2OueyPP/yDpFC5ZqXVlgJfS/Zh/Fx6PKpxEj5BZiK18a3DpUL5K+Kj9mWroib kBPWYmbmVqRjaSlRT2OnpMGrvRbsnUUCHvWUmKy1RXIEjKbFei1lIozeog095t9eVpWn Ua9m16safryn9zZ187VgpGC7xX55M+6dQeumEPgfpIGzfQlChzwA3tfWYzIoD7rV4NP3 f9hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=JUjfXP3J; 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 g132si5749683wmd.50.2018.04.23.11.59.28; Mon, 23 Apr 2018 11:59:28 -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=JUjfXP3J; 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 9363968A0B4; Mon, 23 Apr 2018 21:58:53 +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 2C1FB689CDA for ; Mon, 23 Apr 2018 21:58:52 +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 w3NIxKAb003294 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 Apr 2018 20:59:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1524509960; bh=7dmDUyfC7KIHY+r2KVOf07l4t044ApiATok8lIHu5sA=; h=To:From:Subject:Date; b=JUjfXP3JR9pOkMyEGb+t5rBEmhSrcaMY0OgSWjpdCYV9xqIezpO2dYdLk3ph4QdWV rljLEiwe6Po0fM1mQb+J1GF5PTyLxNtVJya/SgLF88R8iPCIzy8dJIuPAdzZBoUnKD oEc1JFQOu8ZjG9XeHpQg5auJH90zZgrjeo3uUa1CykvPCUwpn5rGwI0nV1BIQ+Fpyv A4tgyMbMOldEAYnYGuiQQShDrxoUavfQZKxz97UaahG4s4SxrhkIE5/k0FJKVhnM5K piPSI9efbU0meHlN0aX0ji4olAQZ9bR8ZoCoqGo6z+bG5uT/hOHu32ayrYv4k1nVmj yuwfItreWlkEw== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <6dcf4bba-a059-09fd-0bb6-54df6fb8a1f8@carpalis.nl> Date: Mon, 23 Apr 2018 20:59:20 +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 06/14] avcodec/vc1: correct ff_vc1_mbmode_intfrp 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" According to VC-1 spec 10.7.3.4, FIELDTX shall be set to the same type as the motion vector for zero-coded blocks. Signed-off-by: Jerome Borsboom --- libavcodec/vc1data.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c index fc9ba6da13..0df7d4d666 100644 --- a/libavcodec/vc1data.c +++ b/libavcodec/vc1data.c @@ -61,7 +61,7 @@ const uint8_t ff_vc1_mbmode_intfrp[2][15][4] = { { MV_PMODE_INTFR_1MV , 1, 0, 1 }, { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 1 }, { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 1 }, - { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 0 }, + { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 0 }, { MV_PMODE_INTFR_INTRA , 0, 0, 0 } }, { @@ -73,13 +73,13 @@ const uint8_t ff_vc1_mbmode_intfrp[2][15][4] = { { MV_PMODE_INTFR_1MV , 1, 0, 1 }, { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 1 }, { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 1 }, - { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 0 }, + { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 0 }, { MV_PMODE_INTFR_4MV , 0, 0, 1 }, { MV_PMODE_INTFR_4MV , 1, 0, 1 }, { MV_PMODE_INTFR_4MV , 0, 0, 0 }, { MV_PMODE_INTFR_4MV_FIELD, 0, 0, 1 }, { MV_PMODE_INTFR_4MV_FIELD, 1, 0, 1 }, - { MV_PMODE_INTFR_4MV_FIELD, 0, 0, 0 }, + { MV_PMODE_INTFR_4MV_FIELD, 1, 0, 0 }, { MV_PMODE_INTFR_INTRA , 0, 0, 0 } } };