From patchwork Sun Apr 30 20:34:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3527 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1150513vsd; Sun, 30 Apr 2017 13:35:22 -0700 (PDT) X-Received: by 10.223.161.194 with SMTP id v2mr11733440wrv.132.1493584522504; Sun, 30 Apr 2017 13:35:22 -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 r4si14186119wra.223.2017.04.30.13.35.21; Sun, 30 Apr 2017 13:35:22 -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 BF98D6898C9; Sun, 30 Apr 2017 23:34:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5AB8689892 for ; Sun, 30 Apr 2017 23:34:42 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id u68so26468qkd.2 for ; Sun, 30 Apr 2017 13:34:46 -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=/bCPSSwnfMShgLfuw6STgSPPEj9m92tgaoJcQrTx/SA=; b=tiqUAvHSmBRRIj/+2I0sP42aIuuC3QDAtp4UesXspQ3lzwkWWFAVgm2W9uhdNGofWD 0gJnuAZTExRjXI0xutzFUz/W9cFfGK5du+jOKthVW9zP1Jv+gvGKiew38B9w5kbFPHFl lMe9jsVef7jEhqvN9kE1JnYz52sGwgKYiYF75X8CnY1Z+4HDuRiiHCbw8+FA6fIZgwrP 1k5boZXR+WUne3y+bwOnFNtAt2R1M72Bvm1D1jjvofbl4jbMXYxaDMTig6firSdvbwLq Jq5xGECJ1NlQA35PlgO2t/A1WR9NHYh00C5QRhIzlmVYFbUnhnyEie1PKUNP+8JXv98P tKhw== 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=/bCPSSwnfMShgLfuw6STgSPPEj9m92tgaoJcQrTx/SA=; b=ttvUEXRHw3E32hGgE500amDKTqGgFCKRUq+ZoZqBt/bJadVnSekT6KMPrWrgSO70xV kAHfRt7OmbH02Bi/qYrx7wwipJnxWKHrHIyRzNLN9U8X2T4muDKJiTOsk36Qj5MuVNRh FFN3Li78yx4xHAd0fH0Ud1r60HAXJkaGJbbLezvLJOxK9+lFxFy8nbW7QuuaOmgw3eU5 KdGL6s/51cMSq8YS5okyvLYluK/Teeh9tS96oDkbvqQbJzffn/t0IRb2O8VImz8KRhAc 58CKNf5UE+Ui3zhwXsZanAg+yJ7r1YxHuJ9fUV486iUVLNYKHZk00SzN8I61L3RuT9uG WB5A== X-Gm-Message-State: AN3rC/6nuntWlBisiC9yNwZuuQLler+QYF4nwY1EXrKOOOWjo28oQzfO eWXfjN25bqhGB/5G X-Received: by 10.55.140.134 with SMTP id o128mr15637312qkd.79.1493584485061; Sun, 30 Apr 2017 13:34:45 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id 24sm9147592qtx.8.2017.04.30.13.34.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 30 Apr 2017 13:34:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2017 17:34:06 -0300 Message-Id: <20170430203410.7128-4-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170430203410.7128-1-jamrial@gmail.com> References: <20170430203410.7128-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/7] 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 f82f9fdf5e..ac7a1ed78b 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)