From patchwork Tue May 2 21:55:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3559 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp2089555vsd; Tue, 2 May 2017 14:57:29 -0700 (PDT) X-Received: by 10.28.66.82 with SMTP id p79mr3958596wma.131.1493762249323; Tue, 02 May 2017 14:57:29 -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 30si18624784wrd.272.2017.05.02.14.57.28; Tue, 02 May 2017 14:57:29 -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 BC0E06898A8; Wed, 3 May 2017 00:56:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F00B1689822 for ; Wed, 3 May 2017 00:56:32 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id c45so22295084qtb.0 for ; Tue, 02 May 2017 14:56:37 -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; bh=GC+B7hPBCL5NORztXRRIf6BgsKQg2E7tJfJ5Mi/Cqnk=; b=PSqbb/HxqPreE+zLB/QUlqkrGrpr0DkfR5AqEraCht8oNHcn7peLpCNFyig1Z903CN mMOUjaBnGkXfO9vOQ/JlOOgDRe0x6irg14OmHJDEoEoSC7Q0MjRbAU0X4oBysb2DkCSp pImOKeELjtRUrTFLlgfJf/JFOcOFfSKydRopv6o/8bHiTQb7SzuSQ0j2ljrSFVvGMhvC 9wkrXwN9aYdJnox11ybeSJClH0sUg4onqLJ8wo35XtilYdJyNLFbYljz1/KWOFnF7qfn Azy78DumjZgqAnmamJ2VFdwLgpSY7Uya2kmgeNASkX0hf8eZqeiEI4Pl4qGQZjEfel6h 1gfA== 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; bh=GC+B7hPBCL5NORztXRRIf6BgsKQg2E7tJfJ5Mi/Cqnk=; b=tSoOBGmZexc4hSXAVd1vGehgs+jCpmKpeJvi9JMpIIGTim5QajpUAebDM5uXAMrpXl FpCmmIy11L2bI0XwaDDE79X1yJNW1C5Cx0/bMuljbYBL5kcAdCMhn6srqnTlXfi56hO6 o1sb7FxiFQdccg6YV7pJiibfXk9QX29s3biYgBbcZqoC528cGuy5nx8h9UlgCn7Ol7+A 9LyoX0urmvV8hksypx4UIXCeXBhG4iA+Xq6L1hRuhAtUyHSeTZqy+ODqXyT343msi50t B8PMW5N3XGX24dB6Lj4hodbZgd8kSMTHDDf3uA2xRtVeenZVm+X1RTwnp/VMuleHuU5N SgeQ== X-Gm-Message-State: AN3rC/5Ytx5n520ZRWDqyjrAhtjOLhIzevb8M8Jpk6onCaYRsMqTnrYM Lafqr8wMn6NM0GmL X-Received: by 10.237.60.135 with SMTP id d7mr31487002qtf.7.1493762195977; Tue, 02 May 2017 14:56:35 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id t45sm14992046qtt.9.2017.05.02.14.56.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 May 2017 14:56:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 May 2017 18:55:26 -0300 Message-Id: <20170502215530.8672-6-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170502215530.8672-1-jamrial@gmail.com> References: <20170502215530.8672-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 5/9] hevc_parser: use ff_h2645_packet_split() to parse NAL units 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" This simplifies the code considerably. Signed-off-by: James Almer --- libavcodec/hevc_parser.c | 50 ++++++++++-------------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 9e7fa621ce..501cbc3498 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -193,11 +193,8 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, SliceHeader *sh = &h->sh; HEVCParamSets *ps = &h->ps; HEVCSEIContext *sei = &h->sei; - H2645Packet *pkt = &ctx->pkt; - const uint8_t *buf_end = buf + buf_size; - int state = -1, i; - H2645NAL *nal; int is_global = buf == avctx->extradata; + int i, ret; if (!h->HEVClc) h->HEVClc = av_mallocz(sizeof(HEVCLocalContext)); @@ -215,44 +212,18 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, ff_hevc_reset_sei(sei); - if (!buf_size) - return 0; - - if (pkt->nals_allocated < 1) { - H2645NAL *tmp = av_realloc_array(pkt->nals, 1, sizeof(*tmp)); - if (!tmp) - return AVERROR(ENOMEM); - pkt->nals = tmp; - memset(pkt->nals, 0, sizeof(*tmp)); - pkt->nals_allocated = 1; - } - - nal = &pkt->nals[0]; + ret = ff_h2645_packet_split(&ctx->pkt, buf, buf_size, avctx, 0, 0, + AV_CODEC_ID_HEVC, 1); + if (ret < 0) + return ret; - for (;;) { - int src_length, consumed; - int ret; + for (i = 0; i < ctx->pkt.nb_nals; i++) { + H2645NAL *nal = &ctx->pkt.nals[i]; int num = 0, den = 0; - buf = avpriv_find_start_code(buf, buf_end, &state); - if (--buf + 2 >= buf_end) - break; - src_length = buf_end - buf; - - h->nal_unit_type = (*buf >> 1) & 0x3f; - h->temporal_id = (*(buf + 1) & 0x07) - 1; - if (h->nal_unit_type <= HEVC_NAL_CRA_NUT) { - // Do not walk the whole buffer just to decode slice segment header - if (src_length > 20) - src_length = 20; - } - - consumed = ff_h2645_extract_rbsp(buf, src_length, nal, 1); - if (consumed < 0) - return consumed; - ret = init_get_bits8(gb, nal->data + 2, nal->size); - if (ret < 0) - return ret; + h->nal_unit_type = nal->type; + h->temporal_id = nal->temporal_id; + *gb = nal->gb; switch (h->nal_unit_type) { case HEVC_NAL_VPS: @@ -395,7 +366,6 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, return 0; /* no need to evaluate the rest */ } - buf += consumed; } /* didn't find a picture! */ if (!is_global)