From patchwork Fri May 11 05:11:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 8920 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp275990jad; Thu, 10 May 2018 22:32:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoNFyPCGE8TAqfatelipcH7OafqCe1z+lS8oDgYUV3XL8piNESMV2HuWIY86/+bYGw+sE5U X-Received: by 2002:adf:ea90:: with SMTP id s16-v6mr3151037wrm.17.1526016753303; Thu, 10 May 2018 22:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526016753; cv=none; d=google.com; s=arc-20160816; b=VDcxeXEwr+F7sATxqzq3GrDfuSArk8m74igHetW3yST9c1PEnKE1keww1ESFRmoOHk HZIM5AtHBHh5SkHg0a/HY4RrGUkUuLEqC0f+QwBjTTDL7vizcl4+yWKmGCn5yQJxi/Nj OApZ60CI7Vj4dZIRFcORXMZJJvka1rbuXptq5YbWq4U7XoNhMlw9nEin7mw4eORB6IRF wBgdoUaF4SQph07/301q15HgWQc+kedcKv0GNBdaXgTuSy0FPC/wz+FVIPBSMvrz81aj 9zR8wgUlucb8/Trw8JSgCqUbr1xwerIiFDMPjo7rvK6mA1FpRmrsetloAIUnIrCUqw4h zxPA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=a/bnmcL/GkOiMQW3Q30VkmjCQ8DH8vvvXH17Av7b20M=; b=GEmQ2nKTGi9QHt2HAVX1BDA+EPSkDViN/8MaPQ+nikTkSyQC/k8RC5DERDPnRfSYZ4 igcbOWmweYfYNTd8GsmkLiX2c36BmSQm8u618g+V1cYCDSbQWBC9TefncF8/PvMxD8uL ga8LM1txobl+BplO0yhhyrtLJvzDIZbo78i6PKK6r6M2U5/UGdTHwryVqCRGoz7cNSr4 CDN/bupTGFqSLSuHtFXDEcDqsrALgrizcoM2cmtUhpMkBer5RtKMmDxg1scpdcUMq0vD 4eeo/2jPGfeEvdIrDg3CliWutfaZ+MP7iRirZi8ddS/1o0NUcDEK0dus5VzlSoUMLuHg PfDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=p65jRwIv; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i125-v6si424599wme.231.2018.05.10.22.32.32; Thu, 10 May 2018 22:32:33 -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 header.s=20161025 header.b=p65jRwIv; 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=QUARANTINE 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 A80CF68A8BF; Fri, 11 May 2018 08:31:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D46068A8AB for ; Fri, 11 May 2018 08:31:48 +0300 (EEST) Received: by mail-pg0-f68.google.com with SMTP id p9-v6so1953895pgc.9 for ; Thu, 10 May 2018 22:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jjcLipfB/ZCs9hDy7uzcCXqZNSfzTt5G9a0Yz+oHm3U=; b=p65jRwIvMK562NC/0bDDKpU7JKmh0gBniwzOjeJ11BIAY6rCFrtXH8LdZAq2/JtkWy KMDiY/iMF+7TFE/cwoJ5he/fSx4ZrjDPCJiTAV2uwdA7lJ6P9I7ndEdy78gwZUdgHnWU 5z1hJeknVlKUEoOft0Ud+4khLsAIZ5/nm4u8NTwwha9mrW0n6rkUgTdD3SKfUB2OfOao zXqke/vzRC30x1ptPoc0QZkMxclx/49m1x6Whj/flqApUOAMUBkNn5ignDwpJ5GSCdBB +OqdrCloQ/YUzORquRgtp62LhViu6yb6/ZmpG8nNNtdnTM9g5yDhq0S6TCCPsh4x5CXP ciHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jjcLipfB/ZCs9hDy7uzcCXqZNSfzTt5G9a0Yz+oHm3U=; b=NDgJXF7Ba8qaVh7d3QcY2L6ynHoC8wRmREuZnXdIlfe3T9jMbh9JblYEbqh5X8zptP VMtLa5NyjNWtoBbWkogk4G0bcCurlBFQw2OCUrPmmwR+rf6LpQc6lS7w2/fkbp21/1tl bn8em5iWm75dvoYI/p65f60JSxmvpjdVwcfoPnferymF45tn7UF/aJiymWWwymlOU1Uy /0gC5gbxDF+60fAi0azvqF6xHMZnD+nnPlnXKfOkUnVweOm1rVTPOKoEQiVlgkFZAT9z QtIrc50nw+zSFgvYvOe5iBFLpgzuO9bFMOh/zQLCeJX3yDTgEHLL1vO21JocH11V0ef1 5vuQ== X-Gm-Message-State: ALKqPwd8T35Bt9efgvUmaYOwfTw47ZW/+u78whRwZ3RJAgAqCss4xbjx QELAicSVftKDE3OFqe+mbJljAA== X-Received: by 2002:a63:2d83:: with SMTP id t125-v6mr3297364pgt.336.1526015530435; Thu, 10 May 2018 22:12:10 -0700 (PDT) Received: from localhost.localdomain ([47.88.54.25]) by smtp.gmail.com with ESMTPSA id k24-v6sm4950093pfi.37.2018.05.10.22.12.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 May 2018 22:12:10 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 May 2018 13:11:52 +0800 Message-Id: <1526015513-17475-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526015513-17475-1-git-send-email-mypopydev@gmail.com> References: <1526015513-17475-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavc/h2645_parse: add h264_nal_unit_name for h264 NAL type. 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Jun Zhao --- libavcodec/h2645_parse.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 579b2c9..8d67579 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -28,6 +28,7 @@ #include "bytestream.h" #include "hevc.h" +#include "h264.h" #include "h2645_parse.h" int ff_h2645_extract_rbsp(const uint8_t *src, int length, @@ -193,6 +194,27 @@ static const char *hevc_nal_unit_name(int nal_type) } } +static const char *h264_nal_unit_name(int nal_type) +{ + switch(nal_type) { + case H264_NAL_SLICE : return "SLICE"; + case H264_NAL_DPA : return "DPA"; + case H264_NAL_DPB : return "DPB"; + case H264_NAL_DPC : return "DPC"; + case H264_NAL_IDR_SLICE : return "IDR_SLICE"; + case H264_NAL_SEI : return "SEI"; + case H264_NAL_SPS : return "SPS"; + case H264_NAL_PPS : return "PPS"; + case H264_NAL_AUD : return "AUD"; + case H264_NAL_END_SEQUENCE : return "END_SEQUENCE"; + case H264_NAL_END_STREAM : return "END_STREAM"; + case H264_NAL_FILLER_DATA : return "FILLER_DATA"; + case H264_NAL_SPS_EXT : return "SPS_EXT"; + case H264_NAL_AUXILIARY_SLICE : return "AUXILIARY_SLICE"; + default : return "?"; + } +} + static int get_bit_length(H2645NAL *nal, int skip_trailing_zeros) { int size = nal->size; @@ -255,8 +277,8 @@ static int h264_parse_nal_header(H2645NAL *nal, void *logctx) nal->type = get_bits(gb, 5); av_log(logctx, AV_LOG_DEBUG, - "nal_unit_type: %d, nal_ref_idc: %d\n", - nal->type, nal->ref_idc); + "nal_unit_type: %d(%s), nal_ref_idc: %d\n", + nal->type, h264_nal_unit_name(nal->type), nal->ref_idc); return 1; }