From patchwork Tue Feb 13 20:24:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?WGlhb2hhbiBXYW5nICjnjovmtojlr5Ip?= X-Patchwork-Id: 7586 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp1477163jai; Tue, 13 Feb 2018 12:31:36 -0800 (PST) X-Google-Smtp-Source: AH8x226Qwj7IZfIiu7i7ovv1f8167gLrPaKUFcCTn0Yf+1BCetEu6d69utPPqoMIJ/wei/zUNDE/ X-Received: by 10.223.167.69 with SMTP id e5mr2200732wrd.131.1518553896242; Tue, 13 Feb 2018 12:31:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518553896; cv=none; d=google.com; s=arc-20160816; b=Ak6VKfuxr++TE3xpUqHsQp81RyofHa/8BGN5tRt2YNP2q33o28l8N+eSOU+24vn5F2 Vb/0K0LYlTr5mOHT6fKg+J6USwT2LL/mzXLtbjzfpdZ5vhismy8OnMKD3JWavZ3q1rQR OwMW4ZuGvkksUVxYNaBagZt+sM3AI5REIRPrrxnbbc5G8AM2J0EHVxMgONWuy8LIWAF9 lKoebuf5CDlH047bLp/ONi3VDaAD7mf2HkHYzVpPaYZLvutozoBnBEmQOaPXIVOS4zyO 1swGulA4wD/g2RfW9AMF0PF43sB2iw/do2iEGCp2EYWyO0DkjQNUMfKUNnOUAlIreRcd f8og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=yzztsO6mV/vGYUO/ydFzGEKYzbtWMRGANFEyDbpdTiA=; b=T/AogbNHLVZ/CBvpAkrskrKZ2eMfu3rkEIakD/rZqCxOaxvzzT8P+MRn4W0RCMTKas HtHfxjLjNVKgYoQA4g/TYky17sESWNt7C9nz28PfYY04+XlyRxGv+ODdxAYXwqrYMTqC fMkxl5D1lFY5bAHIkngugxXNkAcb9WddtpXROnoy94a3b3F2ne35jOzZHMZFZngQJw32 6WyHad/qAqo4IJsqMkclj0oyK2cs8UHVO74XaS45DxT52sZl8HPBZhF1ic5L2LKBz4d8 a6iSVNUq+hC5g+Q6IleVSP2jy6l7aA/pJyfgNvnANOMKONay74W6iaaubLRq3TB14NRJ GTIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=GHjKS0Eq; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=UT+nOe13; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 10si8465074wrx.209.2018.02.13.12.31.35; Tue, 13 Feb 2018 12:31:36 -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=@google.com header.s=20161025 header.b=GHjKS0Eq; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=UT+nOe13; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE883689C9F; Tue, 13 Feb 2018 22:31:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f181.google.com (mail-yw0-f181.google.com [209.85.161.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B9C6689953 for ; Tue, 13 Feb 2018 22:31:16 +0200 (EET) Received: by mail-yw0-f181.google.com with SMTP id y186so5303283ywf.7 for ; Tue, 13 Feb 2018 12:31:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=8O3JnvTolkMRi05dEk4XOQFxP3FVyh+BPl+0moH9TC4=; b=GHjKS0Eq8nL21Y6QYuLpg0GeiNFSBduiegd++2XBBIyVJRq8u6k1XW18Hz2bxzTFys BKqJMn/NHVg58/1jo1r7kEMsekte3MUqOlg3tpXUHed8kTTRbiLAM61yrIdjzMDetULD my6LY7j7BQ6Lq7NNLnb4kKZCJb6+8slZlvBEqyY2PeOA6y4W+VlRZxiL6Wly2RTjZ8y4 gzqPwkPUklMg+sfRwytBibeMrGFxR22Czpj5vFvneOq296OWAAXPaljcpIskCnyihJvD cnCAaxoQXB772KQ1gm9P1XLm3oSbMpPc1AdlV+jVrcXNql19PyCcrUrpPfOm44lVP5pC kF1A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=8O3JnvTolkMRi05dEk4XOQFxP3FVyh+BPl+0moH9TC4=; b=UT+nOe13TT604NvlD1bcm7tdIcH7Dn5mocXbLJL5bKivR/bmmalvgPc9G9HvfVNDkU U4GnOkeGx/w6CXd59MnT+JM2OR7z8RtzTFvYUJyJCkU3Yqg+vAYQJp+mlQATfLxfbJtr I36ve3RRknt1TfzvlIP7KMkgatPLbxmx8EwnY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to; bh=8O3JnvTolkMRi05dEk4XOQFxP3FVyh+BPl+0moH9TC4=; b=qwbZdO6aQQEEfRp33Y89un7FDl8rOek6HNwyiMMBH51UkMYyGG+AeSd4bNwQ8rr1/2 fJBtYKRw5nbDJJy39wOWPeIWz/GRzPl6e07hpiP5gv3dg2V+GLivqTeiGMVzmEGup+pb 6Z5LxEgMpAVQaeNwEzBanXTshzlIwPXajLi3EcqpOOHgXSFbnxrAsjN2K1wNKRK2Z0Fz PJyiNx6RgqVUmL8NtjUfNy3+HVIMjguncii8pGkVw0i/AqD79zpWY3qov9RB1vnQmc/w E+MvGGvUug7DFnbwu4LDJSWlE+3THmCaZnzvSlfXSRVN0Ds2eBajZKfJZF/AIIsOXOem 6XOw== X-Gm-Message-State: APf1xPAFx+64jprfRPKb6OcIRStMMfny7zA2vLfZ6B0y0IkFCLuy4QR+ RTS/jesKz63ZiBaV+e2Dus4NMtv9OuSQYD3Li249xvZP X-Received: by 10.129.196.8 with SMTP id j8mr1641125ywi.260.1518553502461; Tue, 13 Feb 2018 12:25:02 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a25:3414:0:0:0:0:0 with HTTP; Tue, 13 Feb 2018 12:24:41 -0800 (PST) In-Reply-To: References: From: =?UTF-8?B?WGlhb2hhbiBXYW5nICjnjovmtojlr5Ip?= Date: Tue, 13 Feb 2018 12:24:41 -0800 X-Google-Sender-Auth: irH7KZ1gVy4OLT043mfBLiSZRfA Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] Abort early on decode_slice error 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" New patch as discussed offline: On Sat, Feb 3, 2018 at 2:29 AM, Xiaohan Wang (王消寒) wrote: > > From e8ad6159640c913773583a8b551ecebcff6b9c63 Mon Sep 17 00:00:00 2001 From: Xiaohan Wang Date: Sat, 3 Feb 2018 01:43:35 -0800 Subject: [PATCH] ffmpeg: Set valid qscale value in ff_h264_decode_mb_cavlc() When ff_h264_decode_mb_cavlc() failed due to wrong sl->qscale values, e.g. dquant out of range, set the qscale to be a valid value before returning -1 and exiting the function. The qscale value can be used later e.g. in loop filter. BUG=806122 --- libavcodec/h264_cavlc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 2421beed9d..a7e60676a0 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -1110,6 +1110,7 @@ decode_intra_mb: else sl->qscale -= max_qp+1; if (((unsigned)sl->qscale) > max_qp){ av_log(h->avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, sl->mb_x, sl->mb_y); + sl->qscale = max_qp; return -1; } } -- 2.16.0.rc1.238.g530d649a79-goog