From patchwork Mon Apr 3 01:45:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3256 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp2984586vss; Sun, 2 Apr 2017 18:46:20 -0700 (PDT) X-Received: by 10.28.107.13 with SMTP id g13mr7321943wmc.117.1491183980689; Sun, 02 Apr 2017 18:46:20 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z63si13151775wmb.23.2017.04.02.18.46.20; Sun, 02 Apr 2017 18:46:20 -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=@gmail.com; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 436FD6882BA; Mon, 3 Apr 2017 04:46:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BE82687EE6 for ; Mon, 3 Apr 2017 04:46:08 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id 10so17598589qkh.1 for ; Sun, 02 Apr 2017 18:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=RO0AVjO8o6a+84sHPQCsgZs9XGu+GJoyyxTDmmcJq34=; b=p8zXtbfu+43x4i/szyPIUIAnwPN2D9Wdb/XRPimFOR7usqzPb7vWjPoCU7tDGGoRJM yd5FNJn7v+kpKMmjYDVUm10AasfEf+yDpruJ/pQTCk1ob/6TyYT7xyYFWvRb/+ghg8yL CY0FDtwFL69OIr8IErrKQ6N7sv1PFNbnCT/uBb5MFf+zEwDGkvrbDqcYmShM+RqymdYC iehpAx9NX0QoXH3yT4FXylwhKFZltxRd/b7X57onyF1tG7K9q6Xj4oaWMUWn5Dn661X8 4JaqU5meHFAdmIMkP87a/rY9VfReYCuwxjVyLf+Tv6toPG7AKcFgnD3FLmn2n47j8iZk YBfQ== 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; bh=RO0AVjO8o6a+84sHPQCsgZs9XGu+GJoyyxTDmmcJq34=; b=PUUfD5LTnGioHN8KC6CRAhG2qHtGmpJRq+biFT2W7ZPDv7qB/BzoY+/zIRbYLzAHaV I0gEwZ9ECe3RSh8fzvIMiNT94rz8NbXGIVddRufIo3jlfLjPKSNpUs+A2XFSjIhBWKnd 8Gm5B2+AgbEbFbp0/+PAHljf5HLDTr/vaRUm7lTEPY1YKkXizdSTa4jZaCRvNbn3DBgk 1dqFOqE1NCVexZN9dCV3UK2Bvem9C0y6MlnlKGUW0s9CYNUJwt8oO291CaplWGfkNef2 kpTMDtSNMiRqvDtpQAS6oXR9r1Pdgv/VYMoTM598BZ8Pk6K6BrLzbWHBjolbRN0pFXXe hnKw== X-Gm-Message-State: AFeK/H3fvlC8iY/z9lLv3kH5o6wo1yIadYZihGEICkul6MvlV1ro3+j667T3rqn1TAEfZA== X-Received: by 10.55.66.65 with SMTP id p62mr12644699qka.191.1491183968316; Sun, 02 Apr 2017 18:46:08 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id n19sm8645200qtn.35.2017.04.02.18.46.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Apr 2017 18:46:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Apr 2017 22:45:41 -0300 Message-Id: <20170403014545.3704-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/hevc_parse: check for parameter set decoding failure 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/hevc_parse.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index 6c1138e015..028ca5afe5 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -22,7 +22,8 @@ #include "hevc_parse.h" static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps, - int is_nalff, int nal_length_size, void *logctx) + int is_nalff, int nal_length_size, int err_recognition, + void *logctx) { int i; int ret = 0; @@ -38,9 +39,21 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets /* ignore everything except parameter sets and VCL NALUs */ switch (nal->type) { - case HEVC_NAL_VPS: ff_hevc_decode_nal_vps(&nal->gb, logctx, ps); break; - case HEVC_NAL_SPS: ff_hevc_decode_nal_sps(&nal->gb, logctx, ps, 1); break; - case HEVC_NAL_PPS: ff_hevc_decode_nal_pps(&nal->gb, logctx, ps); break; + case HEVC_NAL_VPS: + ret = ff_hevc_decode_nal_vps(&nal->gb, logctx, ps); + if (ret < 0) + goto done; + break; + case HEVC_NAL_SPS: + ret = ff_hevc_decode_nal_sps(&nal->gb, logctx, ps, 1); + if (ret < 0) + goto done; + break; + case HEVC_NAL_PPS: + ret = ff_hevc_decode_nal_pps(&nal->gb, logctx, ps); + if (ret < 0) + goto done; + break; case HEVC_NAL_TRAIL_R: case HEVC_NAL_TRAIL_N: case HEVC_NAL_TSA_N: @@ -66,7 +79,10 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets done: ff_h2645_packet_uninit(&pkt); - return ret; + if (err_recognition & AV_EF_EXPLODE) + return ret; + + return 0; } int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, @@ -109,7 +125,8 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, return AVERROR_INVALIDDATA; } - ret = hevc_decode_nal_units(gb.buffer, nalsize, ps, *is_nalff, *nal_length_size, logctx); + ret = hevc_decode_nal_units(gb.buffer, nalsize, ps, *is_nalff, *nal_length_size, + err_recognition, logctx); if (ret < 0) { av_log(logctx, AV_LOG_ERROR, "Decoding nal unit %d %d from hvcC failed\n", @@ -125,7 +142,8 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, *nal_length_size = nal_len_size; } else { *is_nalff = 0; - ret = hevc_decode_nal_units(data, size, ps, *is_nalff, *nal_length_size, logctx); + ret = hevc_decode_nal_units(data, size, ps, *is_nalff, *nal_length_size, + err_recognition, logctx); if (ret < 0) return ret; }