From patchwork Fri Mar 30 02:42:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8230 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2388558jad; Thu, 29 Mar 2018 19:43:10 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+N8D7E+MPo9o4VB8aTY7AlpBpV0q7TmLLm4n70Swr3V9VnkRNmn6kdP1GktWMa2F5XS+Ci X-Received: by 10.28.105.92 with SMTP id e89mr952256wmc.146.1522377790909; Thu, 29 Mar 2018 19:43:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522377790; cv=none; d=google.com; s=arc-20160816; b=TPfqOz5hAl8L5RPH1eycNTcbwjTmO8GV1kRC8VftDTg8AIbWXwGkgAWgI3ZSHRAxmp /1u0NdPzpdHR5ecW1c8npxMX2Wsf6jTMa/J5NmCsH5u4wl9Xn3HePkaOMsobtiyuCkS2 lV9/4o9IsZ5miQwYSCTCkrGl6DvpG/KUYpcU5eSm2W8Zuz0DqRz+BlUWS2oP8imwNSwz /r4LZOkhCYAUiFS8qux3WVIUJ3/LIAOKC9q2kYjWOs5kJ5LrHa8MwXlYRaya0uAFxAm0 PqDbaVRSe4idUwidafnndki4dw8C6U28y7z0+2X9guV4kkgXx7UjaRhgOSgu54zrng00 5emg== 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=ZC24NEQBhov2cFHuKxButSr0kS5DFxcdhFrdSKzpDxE=; b=ZPvdqpgltJOySbsBwbSjZ66NmsyV4cax54j6SUKL+xYDD3/mNiitE0pMmsgVfUZv/E bM+z2VQg+UMR0xhZ7lQttKka+9Ug+Jw2s/rcv0uYDW5ZYQVWAu34SUc6W/kqixJCyo/6 6v90ZIU9f4XeWxvS3cxKWskDWIkkgaDgvE9ZesPn/Q9rntCRRCh0LMafbMLa8bCF70jn 8+DuxY5fV33dtzh5hObzJ3GCg/y7WtqTfjXfi4reXypI5jY67qxaCm8k9mEdcV5ZEbJM tLezVYOdVbmqj+KvN1MIval1hWVZJ0Kfqh5RMicySKyDLRp+/BSqfBSA9edq1TCYjNWA 6NyA== 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 n82si465240wma.26.2018.03.29.19.43.08; Thu, 29 Mar 2018 19:43:10 -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 3782E689EE0; Fri, 30 Mar 2018 05:42:48 +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 AE2DA689E5C for ; Fri, 30 Mar 2018 05:42:40 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Mar 2018 19:42:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,378,1517904000"; d="scan'208";a="212519933" Received: from xhh-skl64.sh.intel.com ([10.239.159.70]) by orsmga005.jf.intel.com with ESMTP; 29 Mar 2018 19:42:56 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Mar 2018 10:42:32 +0800 Message-Id: <20180330024232.2006-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH v2] 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 , Steven Liu , 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 v2: use the preferred code style and rebase the patch 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 a468682ed3..01418b276d 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; + 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;