From patchwork Tue Apr 10 22:53:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 8384 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp46144jad; Tue, 10 Apr 2018 16:01:00 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+46iTVZI8zWbZwoAlEigH+fCMLuMuMRmaHRItUj8fvN2hR1DV+ekSR3p/WTrc0hd+l3lus X-Received: by 10.223.151.69 with SMTP id r63mr1549826wrb.47.1523401260400; Tue, 10 Apr 2018 16:01:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523401260; cv=none; d=google.com; s=arc-20160816; b=yif+tiLgVkRDUMLU1aWJMZYjM/avxJ4QqFyly4ndeIwk5jRbBEkxPvjQqQSG4kfJfo 5flze31wVq5L94ulw0vi2cjd+rJyBNeyL4biP8dLYIJYceR6aLJ4VjOgVMkhsU+Y27tO Dsq5KVHQ3ZURVbmBL+ebQoRL5U2sAMuZj5U2cURt2jkTCnqyC98V1cjyibWIJa+/Tuo1 +BDQO/kHzQePfhqGTUlOp+0dNBfWug8SWB8le1Et1Y1Wp6A+hI9cB0CQBQxNS45QbLGH 0BtYckYDkTS0oQHBy4ggsAx3PGR9gEiCyLD3m6Phmzn0B4TxmzTPTUCopapFbf9JBpa5 6cjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=ucJJZZ99N9RVD3niGhaDHUvtIB+VQNEwgNdDcAyoE/g=; b=n4ruVMgJwIr9FWzqWZvx9SbsBUvVPRMhPJ/sGlu5ALV0wESXB5VNov/9jTWtUizRt8 MD9mUXWhM+/gY5kII7rukyWmyqHPmK4xAuSQUGzqPzEVe+2bUyTsZ4pL+IgeUp5W1Pxb 7oPFR8LxwAZJXKOTDpY94xwxg0PiOg/o2vV/sMTVkkpXa+cLXXifkuI9RUhChDOhqx5X lcecg3nu1EpiNbW7dCgC4plVjwOlru/M+tqvEM1loh+GwJZeGvaKFmZx52rwzNPB8lfa DslsucA919R/8SGgmKhdeLhPgFk4DrU7s7IUuEUV69e4WwMmOe13/rLDqQrszUxUe1TV co7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=VUR765JJ; 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 x131si35305wmb.30.2018.04.10.16.00.59; Tue, 10 Apr 2018 16:01:00 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=VUR765JJ; 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 7FF1C68A144; Wed, 11 Apr 2018 02:00:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA26A68A114 for ; Wed, 11 Apr 2018 02:00:27 +0300 (EEST) Received: by mail-pl0-f65.google.com with SMTP id v5-v6so8459533plo.4 for ; Tue, 10 Apr 2018 16:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=V1Lex5cwXVmPeFdGhN1WOmi/VBcPbZd774OyRWzglOQ=; b=VUR765JJF9DAthfaBLPIaidQl2X34DZs3/RX0CFj9zF/CnPJvEqs7UEcitm8N+aRFU p8snYZ+oM8z9NBRFFg5v6QOrPzh70TeDpLWclAPGd75KA6vjS4qi2+81OEjZbTF0f4gh R0sUbHgK5IvqfB9luUU9uBUbJWVZbD46K8h/EKY/7CNKVH2VYRcgM2hqWUkiOExcnZT9 PTU1nH8fXhTZtAw/msIJA9KR7/D4fXtwNZyxVg0UE2km6VZxgjXL4kujNoBd08xE1Tkn 5jkxabpq45VprXna/+4Z8sfZioaTjpmp4I1R/rxzSnnrCqlI9TnGMngkZOkW96ssQo7j 4bGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=V1Lex5cwXVmPeFdGhN1WOmi/VBcPbZd774OyRWzglOQ=; b=W/poyLqcpAgChJH7vODlyI0UE4KWmWJhR2XOXAMAHnY1n+zN5CTmAuZV+Ai6C83B79 jvInjh9aLlSKtRqo+dGQShe8cNocmdTsGSx+GSddKuFv0EaUL4wSpySTTjCPIn+VRO3S Y5u4cRcVRCq4xcinX0kYNckl93kMEkbNgaRKI4+hbT3XqwA3HeFHC1fMfB0+7clDUsLg XEUZ/kMh3SBL1MN2AuWw/3AP+9jz2Bt8XfkB/Wr3No+bFgTR6kpVuiy3m38TuX6ZkSqJ 39uIvT367TPpfu3lkjBwhzOp+xESbT/ZwwowAn2vw7wd51MecMhy91fWwbrXonK+vXLg H+7g== X-Gm-Message-State: ALQs6tDL9gHZ4R4P93hrvRzjIJAS4Ip0AMRigg7maWVyrzRjrpdJyKPM 7mcVmZfME5Kvc91bJXWm7FTYvUxz X-Received: by 2002:a17:902:581e:: with SMTP id m30-v6mr2380826pli.406.1523400821692; Tue, 10 Apr 2018 15:53:41 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id j11sm5422782pgc.91.2018.04.10.15.53.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Apr 2018 15:53:41 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Apr 2018 15:53:36 -0700 Message-Id: <20180410225336.12763-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180410224437.GZ20131@michaelspb> References: <20180410224437.GZ20131@michaelspb> Subject: [FFmpeg-devel] [PATCH v2] avcodec/mpegpicture: fix "stride changed" failures in gray mode 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 Cc: michael@niedermayer.cc, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Before adding uvlinesize check, I was seeing failures decoding some video with ffmpeg compiled with --enable-gray and using AV_CODEC_FLAG_GRAY. [mpeg2video @ 0x7fa193818c00] get_buffer() failed (stride changed: linesize=1280/1280 uvlinesize=0/640) [mpeg2video @ 0x7fa193818c00] get_buffer() failed (stride changed: linesize=1280/1280 uvlinesize=0/640) --- libavcodec/mpegpicture.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 2be670cdbc..c0e06900fe 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -148,10 +148,12 @@ static int alloc_frame_buffer(AVCodecContext *avctx, Picture *pic, } } - if (linesize && (linesize != pic->f->linesize[0] || - uvlinesize != pic->f->linesize[1])) { + if ((linesize && linesize != pic->f->linesize[0]) || + (uvlinesize && uvlinesize != pic->f->linesize[1])) { av_log(avctx, AV_LOG_ERROR, - "get_buffer() failed (stride changed)\n"); + "get_buffer() failed (stride changed: linesize=%d/%d uvlinesize=%d/%d)\n", + linesize, pic->f->linesize[0], + uvlinesize, pic->f->linesize[1]); ff_mpeg_unref_picture(avctx, pic); return -1; }