From patchwork Tue Apr 9 18:32:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12664 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BC6F2448432 for ; Tue, 9 Apr 2019 21:33:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5D1F68AD8B; Tue, 9 Apr 2019 21:33:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 659FB68AD85 for ; Tue, 9 Apr 2019 21:33:13 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id s15so12685052qtn.3 for ; Tue, 09 Apr 2019 11:33:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ix1CjY0Su3Vn8JUKxIzy5i8JcwHJ65GGkNu+VPMjp+c=; b=Ta5QeMtvEFEl8DDYLtKh3V3+lE3Q372b10rDcOAiTDOOb2UYAiFKkS3TCBLcVHKz9U XdMIeG6yIUMIVIENnq8uQSlipDkFMPq0c0E3qg6VsR+xlq/vkumXmkht7o2c0mDa4b+P NHvSx04mx0wx065aVqzTRLjnqmkNGfeL+8U1GAfNH95Ry5SEA+U3O2TbwTUrxonNYXhZ oX7oEt0pyCPbTtvIwEekiYOl/EQnQg//CufuqzbJGfdOrRzB9NNlDJS3ClnbqiR2k9Wv JvpsI8E77ifsB56xnGe3zhuMRw/bNzkXFvU6SoN7iI8rrUS1OHzVdA6SeTDQebN0EjdG j9Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ix1CjY0Su3Vn8JUKxIzy5i8JcwHJ65GGkNu+VPMjp+c=; b=nflpsZdgCgl/9lLwKwz1f6BGLUS3DK7+4VG0/QqKlOy4Cy5crtasXL40haUh76/jzY BL/E4/DtttRglpuUErk4jB+kv1+zMtfRwPRWkpvygGH6/tKYuNoFQmVpcUomJGK4MWtC RxERip16UiBTLZFxbobQF2GWw+OcC6mwWUhZz5Lsxi/ZbtrH3/T+WGwF5PrAxeAKTCI8 SEVi1GjIDz5FLtrd0MxrPUTMzUcZ1z4HnmcYC4peO/+S7eQSBybygqj2eDbTjbYmWqOv Q7N9Tz6UKPGzdBcH3XFqpPz6/bfvldk/ske/zLqQQrNwVjTybdcoI7GtMMLOORLYv3Qg RiSA== X-Gm-Message-State: APjAAAXG6DLVmWtsQLlY9Ep4hmg5XbvEj2QRGRaPt9HYMT0Qj7Ij9BDf O30iIx1Vimz76kzrUsAMhx4S/dzp X-Google-Smtp-Source: APXvYqxkA/v/VdgQOano1q6ua9NOc+amJfKA+kYpng7OVGO9UbPTxquB1nbch6KWW4/gu6v2gbBuBA== X-Received: by 2002:ac8:26f7:: with SMTP id 52mr30859329qtp.325.1554834792100; Tue, 09 Apr 2019 11:33:12 -0700 (PDT) Received: from localhost.localdomain ([181.23.83.131]) by smtp.gmail.com with ESMTPSA id f20sm21487459qtk.14.2019.04.09.11.33.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 11:33:11 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Apr 2019 15:32:27 -0300 Message-Id: <20190409183227.7680-3-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190409183227.7680-1-jamrial@gmail.com> References: <20190409183227.7680-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/h264dec: don't ignore ff_h264_queue_decode_slice() return values 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" Signed-off-by: James Almer --- libavcodec/h264dec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 837c3b7538..85a57fc124 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -637,7 +637,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) for (i = 0; i < h->pkt.nb_nals; i++) { H2645NAL *nal = &h->pkt.nals[i]; - int max_slice_ctx, err; + int max_slice_ctx; if (avctx->skip_frame >= AVDISCARD_NONREF && nal->ref_idc == 0 && nal->type != H264_NAL_SEI) @@ -647,7 +647,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) h->nal_ref_idc = nal->ref_idc; h->nal_unit_type = nal->type; - err = 0; switch (nal->type) { case H264_NAL_IDR_SLICE: if ((nal->data[1] & 0xFC) == 0x98) { @@ -664,9 +663,13 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) case H264_NAL_SLICE: h->has_slice = 1; - if ((err = ff_h264_queue_decode_slice(h, nal))) { + ret = ff_h264_queue_decode_slice(h, nal); + if (ret < 0) { H264SliceContext *sl = h->slice_ctx + h->nb_slice_ctx_queued; sl->ref_count[0] = sl->ref_count[1] = 0; + av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); + if (h->avctx->err_recognition & AV_EF_EXPLODE) + goto end; break; } @@ -751,10 +754,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n", nal->type, nal->size_bits); } - - if (err < 0) { - av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); - } } ret = ff_h264_execute_decode_slices(h);