From patchwork Wed Jun 20 13:17:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9452 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp750530jad; Wed, 20 Jun 2018 06:17:45 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJEKt6TcT8sDZKXkx0TgMc+gjvTb2m/LJIOXfPewk1oU6xDqMtZyPVTBOBXWS/MPmD2hq+O X-Received: by 2002:adf:c00b:: with SMTP id z11-v6mr16815861wre.268.1529500664907; Wed, 20 Jun 2018 06:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529500664; cv=none; d=google.com; s=arc-20160816; b=W37PTLe1ZNwh95MkwGi3UPuefRw5zt/OTN0nqv6XcK/4rXCCJNrjGa3AF6OmokUIx4 UXN/7CbUyPaYl8Gy1snRWzCmcx5hZP9Mn1EgUwsPNGadiqYZug1sF6I+ONUL8j8H9SCd E4tzBq+zCv3gDZrHogRMm+IaMhZi5LCWguZX973fEjnhlNlPYU13M/8pjppzWM0d0T1p 8JVv5gY8bMzQgvDHhDrf9aCXrjK4DhA9M3BoDAx9gTM1PF5PxNP4P532EomjAFiLIfqM q/seDA6GWqdNfQ6tD5moLYhgFzsL2CjqK+mnnjeQEbE2m9Cw7df15Ab8aQ/r2Rd/Dlcb Wk8g== 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=d6P+1GBGymoW+tbfub+oOYazDPy6RSyIw6IaSMz2aTI=; b=tnNmNDko/xlf29vsNbM2W2kCrGI4iLu8iErLTITv0H9VuZcxgugTaL9UtYxb+xlcvD xZJRRrSPm+J+cUevId/ElKel3Uj4po3Itx1obfa5TiMAz8cljV8ayQdW/mGJ4sl6w1gJ 1NM0FlJnZM0jlqMeDEHo7JVD3F542411YHzhrwFh/YGArtxFPeYOF/sCkou4NJSHG3zc bM9agnH3IIk8LoKve/Uhe37z+awWojBvjSif7dKNJMRCNg62r+OW0z0wmvSKm+vdxuh4 LOo4+lcAWtMaMwPvM3FAqOeycE84zdZxdX04V6dv7eEu7CyHw/+1BgrXFvGtrg1y3gzJ zkcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=WyCnmZfI; 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 y25-v6si2260202wrd.203.2018.06.20.06.17.43; Wed, 20 Jun 2018 06:17:44 -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=WyCnmZfI; 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 241E6689F09; Wed, 20 Jun 2018 16:16:49 +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 C89B8689E8A for ; Wed, 20 Jun 2018 16:16:42 +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 w5KDHYLW028231 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 20 Jun 2018 15:17:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1529500655; bh=FACGsJg/hV3es0km4lzB7pmCx5wI2BGHM4WU/3q0JwQ=; h=To:From:Subject:Date; b=WyCnmZfIsWgk5SQB73+cKeXXvXXQRVAOtww+AbqqgGvCMdJ+LFwAs98m57YsDIux6 jIh9EIC8lj9MyhhV2RJzafLDcxwtiQxB5z5cZ1phIlV6uLmF/6g6lp89QjMs2UQ75D DOKuhVoSRzNAQixVEfiz1AcRCtCz24LtcUUxVDXN+iPSk6hVWvfRutgq/VBlutX0oF Cl8GhRNTi75ZRlR2BuYjgHNFBjRCJB0VFZrxcZhOb5/74ztiM7RvgFM9qLKaqt6iQC smSPQq37At6x60VpFs+UIfePdpQ4xwbAkJJdGP7Wh4lY2XDISUbqecSOUdhhJ02x9S UZIpynGVwUeNg== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: Date: Wed, 20 Jun 2018 15:17:34 +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 check for missing CBPTAB 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" CBPTAB must be present in (non skipped) P and B pictures. Signed-off-by: Jerome Borsboom --- This patch set should fix decoding of the SA10135.vc1 test file to make it bit-equal to the reference decoder. libavcodec/vc1dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index fdbc852ec2..9519864c55 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1088,7 +1088,9 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, av_log(v->s.avctx, AV_LOG_ERROR, "end mb y %d %d invalid\n", s->end_mb_y, s->start_mb_y); continue; } - if (!v->p_frame_skipped && s->pict_type != AV_PICTURE_TYPE_I && !v->cbpcy_vlc) { + if (((s->pict_type == AV_PICTURE_TYPE_P && !v->p_frame_skipped) || + (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type)) && + !v->cbpcy_vlc) { av_log(v->s.avctx, AV_LOG_ERROR, "missing cbpcy_vlc\n"); continue; }