From patchwork Mon Jun 10 05:45:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Pauker X-Patchwork-Id: 13484 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 11646445816 for ; Mon, 10 Jun 2019 08:45:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E09DA68A596; Mon, 10 Jun 2019 08:45:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from heifer200.fciis.net (heifer200.fciis.net [216.127.34.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E03F689FB4 for ; Mon, 10 Jun 2019 08:45:17 +0300 (EEST) Received: from root by heifer200.fciis.net with local (Exim 4.84_2) (envelope-from ) id 1haD7L-0000Zm-NU; Sun, 09 Jun 2019 22:45:15 -0700 From: Amir Pauker To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2019 22:45:13 -0700 Message-Id: <1560145513-2130-1-git-send-email-amir@livelyvideo.tv> X-Mailer: git-send-email 2.1.4 Subject: [FFmpeg-devel] [PATCH] set AVFrame decode_error_flags in case of decoding error by h264dec 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: Amir Pauker MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" set AVFrame decode_error_flags in case h->slice_ctx->er.error_occurred is set after the call to ff_h264_execute_decode_slices. This allows the user to detect concealed decoding errors in the call to avcodec_receive_frame Signed-off-by: Amir Pauker --- libavcodec/h264dec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 00d922f..67dee11 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -758,6 +758,12 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) } ret = ff_h264_execute_decode_slices(h); + + // set decode_error_flags to allow users to detect concealed decoding errors + if( (ret < 0 || h->slice_ctx->er.error_occurred) && h->cur_pic_ptr){ + h->cur_pic_ptr->f->decode_error_flags |= FF_DECODE_ERROR_INVALID_BITSTREAM|FF_DECODE_ERROR_MISSING_REFERENCE; + } + if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) goto end;