From patchwork Wed Jan 3 09:54:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "sergey@gavrushkin.com" X-Patchwork-Id: 7101 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp15697118jad; Wed, 3 Jan 2018 01:53:38 -0800 (PST) X-Google-Smtp-Source: ACJfBosjzGo/wAUdnQJpruq128vRXqGF6RwHd42968HmhXwikzgVK3Bw+amQ13WhR04XteN1hYf0 X-Received: by 10.28.61.87 with SMTP id k84mr874674wma.48.1514973218409; Wed, 03 Jan 2018 01:53:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514973218; cv=none; d=google.com; s=arc-20160816; b=eyBLje8LjrPx1CVOoJvS8E5AiL6rWGp3HDHFz11rFCznpVbQRXRZKHsCGLXZNFFP9f JuaPBbaZUDUL3P3Q17Ghx5u/G7nTym1cmHwljs2J86GIAYxzmm1tUrRpud28qkCeHd6z kZ4RPAssdyW3Fd6W3NluCwa5j6VCjB+XIAqwyL/ISfM/fSphlq374WklyhhNqzOHELln qweLYUgqITFwfqn5VYAd/6Yy5oS8+YzZVN+8h1eTToaKXke3ktTKOsEFHKbca1Sd/K9M ZOkHrvlD9EZjnS3SkfAMeSdVu+Z4m3qUYTLVOGvTLQqJiN7M1mR0lI5oapqRruQkJTIu 6vag== 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:message-id:in-reply-to:to:references:date :mime-version:from:dkim-signature:delivered-to :arc-authentication-results; bh=Jq+cnfnGcJ3VisMTuqGMeNHqDCcvWNPWwUDMNcHEEUk=; b=kdkDhwx35FZY/GiK2X2tpElIgAnRpC28NPtiJTZFiTmJcyhh9PQX5xZEjqoTiyOC5p yPw8FF9/IVlUyEC3yh9HUX0/sgOPEI5mjPUmdp1nGRfG+5oPxtx0rYMH+nEKY/dKCnal pd0lMWf3BCIPAbb2Lyc543rNuQKMbQv+B/np/D8fCQ+UzNEEok+O1IX72eWsvSyqrmEG dwie5KVNbW0aDP9dVHf2YS8kXsC0+nhHd6QXehPmLp75OFs6hbxuaMQo7hhLM9CtDdOM zzoWsiYM7Em7q9ntw9zjggwCCqhrY8aamBfU2qE7p5PIpimBfKwXOZeO6XC8hDFGMdEl Ftdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gavrushkin.com header.s=default header.b=Nioi6ZC4; 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 q16si532195wrb.194.2018.01.03.01.53.37; Wed, 03 Jan 2018 01:53:38 -0800 (PST) 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=@gavrushkin.com header.s=default header.b=Nioi6ZC4; 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 5E96E688374; Wed, 3 Jan 2018 11:53:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.51.228]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0F30688339 for ; Wed, 3 Jan 2018 11:53:13 +0200 (EET) Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 755B42C314 for ; Wed, 3 Jan 2018 03:53:28 -0600 (CST) Received: from gator4174.hostgator.com ([108.167.133.30]) by cmsmtp with SMTP id WfjkenlktvkfxWfjkeMu6b; Wed, 03 Jan 2018 03:53:28 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gavrushkin.com; s=default; h=Message-Id:In-Reply-To:To:References:Date: Subject:Mime-Version:Content-Transfer-Encoding:Content-Type:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=y+OO8OVJt2ovxmZq4GQ5CsEuvSyuN2ibiULNCO7rwaw=; b=Nioi6ZC4YnLqiVMATdgReS/jxo mVTEv3Tc6DMQyJK4ou0aCR6ofWpE9Om4xDqLoKLcIHbNT5XJ7nXAvPqPcN4RCUzJp2SYvjUWgwZF2 9VUYEt5o1gID40CtNytQfrq3PtsQDfsSMT+YjKFzDbIzIXRJIo0ADhBFAkVKqRwhDRiJLVfu1uSpH CiD6D9o265YCVfVApcT1CnzJu4Mz4hNSVL/J7WCpBE/rIxCxFXB5N18hU1SVykNhYNoNMEDMNhGJP 9wsTN4EuiyfAtGiWNdY28TuUzBNqWsUycvl7a7AbFK42HZaJ7PCY7vw9Tb7XVPaRdBdVkBBESlljW +SJgGqdQ==; Received: from [46.216.152.78] (port=27845 helo=[172.20.10.5]) by gator4174.hostgator.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eWfjj-001DnD-LY for ffmpeg-devel@ffmpeg.org; Wed, 03 Jan 2018 03:53:28 -0600 From: sergey@gavrushkin.com Mime-Version: 1.0 (Mac OS X Mail 11.1 \(3445.4.7\)) Date: Wed, 3 Jan 2018 12:54:03 +0300 References: <75E7EF11-58CF-4088-868F-18C182C71CF7@gavrushkin.com> To: FFmpeg development discussions and patches In-Reply-To: Message-Id: X-Mailer: Apple Mail (2.3445.4.7) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4174.hostgator.com X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - gavrushkin.com X-BWhitelist: no X-Source-IP: 46.216.152.78 X-Source-L: No X-Exim-ID: 1eWfjj-001DnD-LY X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: ([172.20.10.5]) [46.216.152.78]:27845 X-Source-Auth: sergey@gavrushkin.com X-Email-Count: 1 X-Source-Cap: bmN1eGVyO25jdXhlcjtnYXRvcjQxNzQuaG9zdGdhdG9yLmNvbQ== X-Local-Domain: yes Subject: Re: [FFmpeg-devel] h264: fix RTSP stream decoding 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" > The error code returned by decode_extradata_ps() is inconsistent after this > its not "if any failed" it is returning an error if the last failed Sorry, I don't get how it is supposed to work. I just found the previous implementation and checked which commit broke it. The other possible solution on upper level: --------------------------------------- From 9fcd003a095b19b9e2fb5f6af3cc57a9e131f308 Mon Sep 17 00:00:00 2001 From: Sergey Gavrushkin Date: Wed, 3 Jan 2018 12:51:15 +0300 Subject: [PATCH] libavcodec/h264: fix decoding Fixes ticket #6422. It is a regression fix for an issue that was introduced in commit 98c97994c5b90bdae02accb155eeceeb5224b8ef. Variable err_recognition is ignored while extradata is decoded and the whole decoding process is failed due to timeout. Signed-off-by: Sergey Gavrushkin --- libavcodec/h264_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.6.4 Thank you, Sergey diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index fee28d9..403fd39 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -487,7 +487,7 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps, } else { *is_avc = 0; ret = decode_extradata_ps(data, size, ps, 0, logctx); - if (ret < 0) + if (ret < 0 && (err_recognition & AV_EF_EXPLODE)) return ret; } return size;