[FFmpeg-devel] [PATCH 3/4] lavc/h2645_parse: add h264_nal_unit_name for h264 NAL type.

[Mark Thompson]

On 11/05/18 06:11, Jun Zhao wrote:
> Signed-off-by: Jun Zhao <mypopydev at gmail.com>
> ---
>  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";

Unlike H.265 these names aren't defined by the standard, so I think I'd write them normally ("IDR slice", "End of sequence") rather than using the shouty enum names.  Doesn't really matter, though.

> +    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;
>  }
> 

LGTM either way.

Thanks,

- Mark