From patchwork Tue Mar 27 07:57:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8189 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4459349jad; Tue, 27 Mar 2018 00:58:12 -0700 (PDT) X-Google-Smtp-Source: AG47ELsVdNvOMiCvX5ikgj87dccNCF4Fj05Lx+8BikmPCQo5LMBsRgo6g5wOoeGPRzt9q57u5Ykh X-Received: by 10.223.195.58 with SMTP id n55mr31138186wrf.132.1522137491943; Tue, 27 Mar 2018 00:58:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522137491; cv=none; d=google.com; s=arc-20160816; b=VzGmmz8uZJRnBVeUchJWnhS8jwRtY4NksCJjC5oBqbBKPQh0+5vrPV72DqywOLnAoi FnnSFEEBSTESvoYnTZtz+2zgd3vnzOx5JrbU5cAMEXsg+Zln5lObGA/sio4w+twSVV5F K3krV1Pl4rKdTinfkjKgbH/Np+2ZL7wr0m5JLJG31vGEBCx4fkTte6RlWstNZvWHADQB i9NsWJas+wmixKk3aYsmOVT1ltLw3gbENE6ju+oWUKhqAjee+9R5ufjng4yQlYg1URp9 /XY3rcfY7aEQM+bSbcfQ+c7G7koy88NJT9/B2mmBxt7FLjXdVafcG9qReEU11+mkK8+Z 1URg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Z4/brtLgeWUBmrIBh5a5hDjZngpbU20MP8cnWNlvqnI=; b=zchUrdFEt44BrYsvbWnNNcduK2SE0Mc2JCrhr/GM/sFQRKNnuQxpHKd5JIJ+WfGSiC mj8oyDtnxwSVwkwcclwJ9HrjgTape9fuVaQKayUz494yKbrBm/Q51JtKGyRYExWTODA6 TRyPbEHS0bU18sBOYUGgsIe/VMRK/1BmEubs4pDJfoYE4qL8cDy5kfF75gx+/piMjdM2 BxWukZKEyoKlHEt4ntnmPAcVY7X4vdc9Y19mgPcxIH3PGyqNmUuZnpqV/qM14yxvafZ4 3OfT2Kr1uqywepMhu0NAmPQxZwkcjX/vfW/+pe+Sn6CdkecwVlaD1Bxi7dXgXz/+6ymz etdA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g8si551377wra.310.2018.03.27.00.58.11; Tue, 27 Mar 2018 00:58:11 -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; 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 EF332689896; Tue, 27 Mar 2018 10:57:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3ACE0689734 for ; Tue, 27 Mar 2018 10:57:44 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Mar 2018 00:58:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,366,1517904000"; d="scan'208";a="31651438" Received: from xhh-cfl64.sh.intel.com ([10.239.13.24]) by fmsmga002.fm.intel.com with ESMTP; 27 Mar 2018 00:57:59 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Mar 2018 15:57:40 +0800 Message-Id: <20180327075740.20517-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] lavc/hevc: Don't parse NAL unit for a dummy buffer 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: Haihao Xiang , Mark Thompson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" hevc parser mistakenly reports the following message if a dummy buffer is padded for EOF [hevc @ 0x559b63848610] missing picture in access unit Signed-off-by: Haihao Xiang --- libavcodec/hevc_parser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index a468682ed33..228784e946f 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -294,6 +294,8 @@ static int hevc_parse(AVCodecParserContext *s, AVCodecContext *avctx, int next; HEVCParserContext *ctx = s->priv_data; ParseContext *pc = &ctx->pc; + int is_dummy_buf = (buf_size == 0); + const uint8_t *dummy_buf = buf; if (avctx->extradata && !ctx->parsed_extradata) { ff_hevc_decode_extradata(avctx->extradata, avctx->extradata_size, &ctx->ps, &ctx->sei, @@ -313,7 +315,10 @@ static int hevc_parse(AVCodecParserContext *s, AVCodecContext *avctx, } } - parse_nal_units(s, buf, buf_size, avctx); + is_dummy_buf = (is_dummy_buf && (dummy_buf == buf)); + + if (!is_dummy_buf) + parse_nal_units(s, buf, buf_size, avctx); *poutbuf = buf; *poutbuf_size = buf_size;