har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/h2645_parse: add h264_nal_unit_name for h264 NAL type.

Browse Source 
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
This commit is contained in:
Jun Zhao 2018-05-11 10:28:32 +08:00 committed by Jun Zhao
parent 7582a907e4
commit b7cd2ab22e
2 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/h264.h
View File

@ -26,8 +26,12 @@
#define QP_MAX_NUM (51 + 6*6) // The maximum supported qp #define QP_MAX_NUM (51 + 6*6) // The maximum supported qp
/* NAL unit types */ /*
* Table 7-1 – NAL unit type codes, syntax element categories, and NAL unit type classes in
* T-REC-H.264-201704
*/
enum { enum {
H264_NAL_UNSPECIFIED = 0,
H264_NAL_SLICE = 1, H264_NAL_SLICE = 1,
H264_NAL_DPA = 2, H264_NAL_DPA = 2,
H264_NAL_DPB = 3, H264_NAL_DPB = 3,
@ -41,7 +45,24 @@ enum {
H264_NAL_END_STREAM = 11, H264_NAL_END_STREAM = 11,
H264_NAL_FILLER_DATA = 12, H264_NAL_FILLER_DATA = 12,
H264_NAL_SPS_EXT = 13, H264_NAL_SPS_EXT = 13,
H264_NAL_PREFIX = 14,
H264_NAL_SUB_SPS = 15,
H264_NAL_DPS = 16,
H264_NAL_RESERVED17 = 17,
H264_NAL_RESERVED18 = 18,
H264_NAL_AUXILIARY_SLICE = 19, H264_NAL_AUXILIARY_SLICE = 19,
H264_NAL_EXTEN_SLICE = 20,
H264_NAL_DEPTH_EXTEN_SLICE = 21,
H264_NAL_RESERVED22 = 22,
H264_NAL_RESERVED23 = 23,
H264_NAL_UNSPECIFIED24 = 24,
H264_NAL_UNSPECIFIED25 = 25,
H264_NAL_UNSPECIFIED26 = 26,
H264_NAL_UNSPECIFIED27 = 27,
H264_NAL_UNSPECIFIED28 = 28,
H264_NAL_UNSPECIFIED29 = 29,
H264_NAL_UNSPECIFIED30 = 30,
H264_NAL_UNSPECIFIED31 = 31,
}; };

46
libavcodec/h2645_parse.c
View File

@ -28,6 +28,7 @@
#include "bytestream.h" #include "bytestream.h"
#include "hevc.h" #include "hevc.h"
#include "h264.h"
#include "h2645_parse.h" #include "h2645_parse.h"
int ff_h2645_extract_rbsp(const uint8_t *src, int length, int ff_h2645_extract_rbsp(const uint8_t *src, int length,
@ -218,6 +219,47 @@ static const char *hevc_nal_unit_name(int nal_type)
return hevc_nal_type_name[nal_type]; return hevc_nal_type_name[nal_type];
} }
static const char *h264_nal_type_name[32] = {
"Unspecified 0", //H264_NAL_UNSPECIFIED
"Coded slice of a non-IDR picture", // H264_NAL_SLICE
"Coded slice data partition A", // H264_NAL_DPA
"Coded slice data partition B", // H264_NAL_DPB
"Coded slice data partition C", // H264_NAL_DPC
"IDR", // H264_NAL_IDR_SLICE
"SEI", // H264_NAL_SEI
"SPS", // H264_NAL_SPS
"PPS", // H264_NAL_PPS
"AUD", // H264_NAL_AUD
"End of sequence", // H264_NAL_END_SEQUENCE
"End of stream", // H264_NAL_END_STREAM
"Filler data", // H264_NAL_FILLER_DATA
"SPS extension", // H264_NAL_SPS_EXT
"Prefix", // H264_NAL_PREFIX
"Subset SPS", // H264_NAL_SUB_SPS
"Depth parameter set", // H264_NAL_DPS
"Reserved 17", // H264_NAL_RESERVED17
"Reserved 18", // H264_NAL_RESERVED18
"Auxiliary coded picture without partitioning", // H264_NAL_AUXILIARY_SLICE
"Slice extension", // H264_NAL_EXTEN_SLICE
"Slice extension for a depth view or a 3D-AVC texture view", // H264_NAL_DEPTH_EXTEN_SLICE
"Reserved 22", // H264_NAL_RESERVED22
"Reserved 23", // H264_NAL_RESERVED23
"Unspecified 24", // H264_NAL_UNSPECIFIED24
"Unspecified 25", // H264_NAL_UNSPECIFIED25
"Unspecified 26", // H264_NAL_UNSPECIFIED26
"Unspecified 27", // H264_NAL_UNSPECIFIED27
"Unspecified 28", // H264_NAL_UNSPECIFIED28
"Unspecified 29", // H264_NAL_UNSPECIFIED29
"Unspecified 30", // H264_NAL_UNSPECIFIED30
"Unspecified 31", // H264_NAL_UNSPECIFIED31
};
static const char *h264_nal_unit_name(int nal_type)
{
av_assert0(nal_type >= 0 && nal_type < 32);
return h264_nal_type_name[nal_type];
}
static int get_bit_length(H2645NAL *nal, int skip_trailing_zeros) static int get_bit_length(H2645NAL *nal, int skip_trailing_zeros)
{ {
int size = nal->size; int size = nal->size;
@ -280,8 +322,8 @@ static int h264_parse_nal_header(H2645NAL *nal, void *logctx)
nal->type = get_bits(gb, 5); nal->type = get_bits(gb, 5);
av_log(logctx, AV_LOG_DEBUG, av_log(logctx, AV_LOG_DEBUG,
"nal_unit_type: %d, nal_ref_idc: %d\n", "nal_unit_type: %d(%s), nal_ref_idc: %d\n",
nal->type, nal->ref_idc); nal->type, h264_nal_unit_name(nal->type), nal->ref_idc);
return 1; return 1;
} }