Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow reserved NAL units in H264/H265 

This is needed for Dolby Vision as Dolby Vision uses NAL unit type 62
to carry private information.

Issue #341.

Change-Id: Ib3f06d8f36ef3d89c33162dd74c012a0c3a805e5
This commit is contained in:
KongQun Yang 2019-03-18 13:59:53 -07:00
parent 5d80895923
commit 26bc55503d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packager/media/codecs/nalu_reader.cc
View File

@ -104,10 +104,10 @@ bool Nalu::InitializeFromH264(const uint8_t* data, uint64_t size) {
// Reserved NAL units are not treated as valid NAL units here. // Reserved NAL units are not treated as valid NAL units here.
if (type_ == Nalu::H264_Unspecified || type_ == Nalu::H264_Reserved17 || if (type_ == Nalu::H264_Unspecified || type_ == Nalu::H264_Reserved17 ||
type_ == Nalu::H264_Reserved18 || type_ >= Nalu::H264_Reserved22) { type_ == Nalu::H264_Reserved18 || type_ >= Nalu::H264_Reserved22) {
LOG(WARNING) << "Unspecified or reserved nal_unit_type " << type_ VLOG(1) << "Unspecified or reserved nal_unit_type " << type_
<< " (header 0x" << std::hex << static_cast<int>(header) << " (header 0x" << std::hex << static_cast<int>(header) << ").";
<< ")."; // Allow reserved NAL units. Some encoders and extended codecs use the
return false; // reserved NAL units to carry their private data.
} else if (type_ == Nalu::H264_IDRSlice || type_ == Nalu::H264_SPS || } else if (type_ == Nalu::H264_IDRSlice || type_ == Nalu::H264_SPS ||
type_ == Nalu::H264_SPSExtension || type_ == Nalu::H264_SPSExtension ||
type_ == Nalu::H264_SubsetSPS || type_ == Nalu::H264_PPS) { type_ == Nalu::H264_SubsetSPS || type_ == Nalu::H264_PPS) {
@ -174,9 +174,11 @@ bool Nalu::InitializeFromH265(const uint8_t* data, uint64_t size) {
if ((type_ >= Nalu::H265_RSV_VCL_N10 && type_ <= Nalu::H265_RSV_VCL_R15) || if ((type_ >= Nalu::H265_RSV_VCL_N10 && type_ <= Nalu::H265_RSV_VCL_R15) ||
(type_ >= Nalu::H265_RSV_IRAP_VCL22 && type_ < Nalu::H265_RSV_VCL31) || (type_ >= Nalu::H265_RSV_IRAP_VCL22 && type_ < Nalu::H265_RSV_VCL31) ||
(type_ >= Nalu::H265_RSV_NVCL41)) { (type_ >= Nalu::H265_RSV_NVCL41)) {
LOG(WARNING) << "Unspecified or reserved nal_unit_type " << type_ VLOG(1) << "Unspecified or reserved nal_unit_type " << type_
<< " (header 0x" << std::hex << header << ")."; << " (header 0x" << std::hex << header << ").";
return false; // Allow reserved NAL units. Some encoders and extended codecs use the
// reserved NAL units to carry their private data. For example, Dolby Vision
// uses NAL unit type 62.
} else if ((type_ >= Nalu::H265_BLA_W_LP && } else if ((type_ >= Nalu::H265_BLA_W_LP &&
type_ <= Nalu::H265_RSV_IRAP_VCL23) || type_ <= Nalu::H265_RSV_IRAP_VCL23) ||
type_ == Nalu::H265_VPS || type_ == Nalu::H265_SPS || type_ == Nalu::H265_VPS || type_ == Nalu::H265_SPS ||
@ -197,7 +199,7 @@ bool Nalu::InitializeFromH265(const uint8_t* data, uint64_t size) {
} }
is_aud_ = type_ == H265_AUD; is_aud_ = type_ == H265_AUD;
is_vcl_ = type_ >= Nalu::H265_TRAIL_N && type_ <= Nalu::H265_CRA_NUT; is_vcl_ = type_ >= Nalu::H265_TRAIL_N && type_ <= Nalu::H265_RSV_VCL31;
is_video_slice_ = is_vcl_; is_video_slice_ = is_vcl_;
can_start_access_unit_ = can_start_access_unit_ =
nuh_layer_id_ == 0 && nuh_layer_id_ == 0 &&