Skip to content

Commit

Permalink
Merge pull request #124 from aler9/hevc
Browse files Browse the repository at this point in the history 
add H265 box types
  • Loading branch information
@sunfish-shogi
sunfish-shogi committed Dec 30, 2022
2 parents 7d8e5a7 + f3d01e7 commit b881637
Show file tree
Hide file tree
Showing 2 changed files with 216 additions and 0 deletions.
99 changes: 99 additions & 0 deletions box_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,24 @@ type DecoderConfigDescriptor struct {
AvgBitrate uint32 `mp4:"6,size=32"`
}

/*************************** fiel ****************************/

func BoxTypeFiel() BoxType { return StrToBoxType("fiel") }

func init() {
AddBoxDef(&Fiel{})
}

type Fiel struct {
Box
FieldCount uint8 `mp4:"0,size=8"`
FieldOrdering uint8 `mp4:"1,size=8"`
}

func (Fiel) GetType() BoxType {
return BoxTypeFiel()
}

/************************ free, skip *************************/

func BoxTypeFree() BoxType { return StrToBoxType("free") }
Expand Down Expand Up @@ -768,6 +786,85 @@ func (hdlr *Hdlr) OnReadName(r bitio.ReadSeeker, leftBits uint64, ctx Context) (
return leftBits, true, nil
}

/*************************** hvcC ****************************/

func BoxTypeHvcC() BoxType { return StrToBoxType("hvcC") }

func init() {
AddBoxDef(&HvcC{})
}

type HEVCNalu struct {
BaseCustomFieldObject
Length uint16 `mp4:"0,size=16"`
NALUnit []byte `mp4:"1,size=8,len=dynamic"`
}

func (s HEVCNalu) GetFieldLength(name string, ctx Context) uint {
switch name {
case "NALUnit":
return uint(s.Length)
}
return 0
}

type HEVCNaluArray struct {
BaseCustomFieldObject
Completeness bool `mp4:"0,size=1"`
Reserved bool `mp4:"1,size=1"`
NaluType uint8 `mp4:"2,size=6"`
NumNalus uint16 `mp4:"3,size=16"`
Nalus []HEVCNalu `mp4:"4,len=dynamic"`
}

func (a HEVCNaluArray) GetFieldLength(name string, ctx Context) uint {
switch name {
case "Nalus":
return uint(a.NumNalus)
}
return 0
}

type HvcC struct {
Box
ConfigurationVersion uint8 `mp4:"0,size=8"`
GeneralProfileSpace uint8 `mp4:"1,size=2"`
GeneralTierFlag bool `mp4:"2,size=1"`
GeneralProfileIdc uint8 `mp4:"3,size=5"`
GeneralProfileCompatibility [32]bool `mp4:"4,size=1"`
GeneralConstraintIndicator [6]uint8 `mp4:"5,size=8"`
GeneralLevelIdc uint8 `mp4:"6,size=8"`
Reserved1 uint8 `mp4:"7,size=4,const=15"`
MinSpatialSegmentationIdc uint16 `mp4:"8,size=12"`
Reserved2 uint8 `mp4:"9,size=6,const=63"`
ParallelismType uint8 `mp4:"10,size=2"`
Reserved3 uint8 `mp4:"11,size=6,const=63"`
ChromaFormatIdc uint8 `mp4:"12,size=2"`
Reserved4 uint8 `mp4:"13,size=5,const=31"`
BitDepthLumaMinus8 uint8 `mp4:"14,size=3"`
Reserved5 uint8 `mp4:"15,size=5,const=31"`
BitDepthChromaMinus8 uint8 `mp4:"16,size=3"`
AvgFrameRate uint16 `mp4:"17,size=16"`
ConstantFrameRate uint8 `mp4:"18,size=2"`
NumTemporalLayers uint8 `mp4:"19,size=2"`
TemporalIdNested uint8 `mp4:"20,size=2"`
LengthSizeMinusOne uint8 `mp4:"21,size=2"`
NumOfNaluArrays uint8 `mp4:"22,size=8"`
NaluArrays []HEVCNaluArray `mp4:"23,len=dynamic"`
}

func (HvcC) GetType() BoxType {
return BoxTypeHvcC()
}

func (hvcc HvcC) GetFieldLength(name string, ctx Context) uint {
switch name {
case "NaluArrays":
return uint(hvcc.NumOfNaluArrays)
}
return 0
}

/*************************** ilst ****************************/

func BoxTypeIlst() BoxType { return StrToBoxType("ilst") }
Expand Down Expand Up @@ -1450,6 +1547,7 @@ func (*Saiz) GetType() BoxType {

func BoxTypeAvc1() BoxType { return StrToBoxType("avc1") }
func BoxTypeEncv() BoxType { return StrToBoxType("encv") }
func BoxTypeHev1() BoxType { return StrToBoxType("hev1") }
func BoxTypeMp4a() BoxType { return StrToBoxType("mp4a") }
func BoxTypeEnca() BoxType { return StrToBoxType("enca") }
func BoxTypeAvcC() BoxType { return StrToBoxType("avcC") }
Expand All @@ -1458,6 +1556,7 @@ func BoxTypePasp() BoxType { return StrToBoxType("pasp") }
func init() {
AddAnyTypeBoxDef(&VisualSampleEntry{}, BoxTypeAvc1())
AddAnyTypeBoxDef(&VisualSampleEntry{}, BoxTypeEncv())
AddAnyTypeBoxDef(&VisualSampleEntry{}, BoxTypeHev1())
AddAnyTypeBoxDef(&AudioSampleEntry{}, BoxTypeMp4a())
AddAnyTypeBoxDef(&AudioSampleEntry{}, BoxTypeEnca())
AddAnyTypeBoxDef(&AVCDecoderConfiguration{}, BoxTypeAvcC())
Expand Down
117 changes: 117 additions & 0 deletions box_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,16 @@ func TestBoxTypes(t *testing.T) {
"{Tag=DecSpecificInfo Size=3 Data=[0x11, 0x22, 0x33]}, " +
"{Tag=SLConfigDescr Size=5 Data=[0x11, 0x22, 0x33, 0x44, 0x55]}]",
},
{
name: "fiel",
src: &Fiel{
FieldCount: 233,
FieldOrdering: 112,
},
dst: &Fiel{},
bin: []byte{0xe9, 0x70},
str: `FieldCount=0xe9 FieldOrdering=0x70`,
},
{
name: "free",
src: &Free{
Expand Down Expand Up @@ -548,6 +558,113 @@ func TestBoxTypes(t *testing.T) {
},
str: `Version=0 Flags=0x000000 PreDefined=305419896 HandlerType="abem" Name="Abema"`,
},
{
name: "hvcC",
src: &HvcC{
ConfigurationVersion: 1,
GeneralProfileIdc: 1,
GeneralProfileCompatibility: [32]bool{
false, true, true, false, false, false, false, false,
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
},
GeneralConstraintIndicator: [6]uint8{144, 0, 0, 0, 0, 0},
GeneralLevelIdc: 120,
Reserved1: 0xe,
Reserved2: 0x3f,
Reserved3: 0x3f,
ChromaFormatIdc: 1,
Reserved4: 31,
Reserved5: 31,
TemporalIdNested: 3,
LengthSizeMinusOne: 3,
NumOfNaluArrays: 4,
NaluArrays: []HEVCNaluArray{
{
NaluType: 32,
NumNalus: 1,
Nalus: []HEVCNalu{{
Length: 24,
NALUnit: []byte{
64, 1, 12, 1, 255, 255, 1, 96,
0, 0, 3, 0, 144, 0, 0, 3,
0, 0, 3, 0, 120, 153, 152, 9,
},
}},
},
{
NaluType: 33,
NumNalus: 1,
Nalus: []HEVCNalu{{
Length: 42,
NALUnit: []byte{
6, 1, 1, 1, 96, 0, 0, 3,
0, 144, 0, 0, 3, 0, 0, 3,
0, 120, 160, 3, 192, 128, 16, 229,
150, 102, 105, 36, 202, 224, 16,
0, 0, 3, 0, 16, 0, 0, 3,
1, 224, 128,
},
}},
},
{
NaluType: 34,
NumNalus: 1,
Nalus: []HEVCNalu{{
Length: 7,
NALUnit: []byte{
68, 1, 193, 114, 180, 98, 64,
},
}},
},
{
NaluType: 39,
NumNalus: 1,
Nalus: []HEVCNalu{{
Length: 11,
NALUnit: []byte{
78, 1, 5, 255, 255, 255, 166, 44,
162, 222, 9,
},
}},
},
},
},
dst: &HvcC{},
bin: []byte{
0x01, 0x01, 0x60, 0x00, 0x00, 0x00, 0x90, 0x00,
0x00, 0x00, 0x00, 0x00, 0x78, 0xe0, 0x00, 0xfc,
0xfd, 0xf8, 0xf8, 0x00, 0x00, 0x0f, 0x04, 0x20,
0x00, 0x01, 0x00, 0x18, 0x40, 0x01, 0x0c, 0x01,
0xff, 0xff, 0x01, 0x60, 0x00, 0x00, 0x03, 0x00,
0x90, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00,
0x78, 0x99, 0x98, 0x09, 0x21, 0x00, 0x01, 0x00,
0x2a, 0x06, 0x01, 0x01, 0x01, 0x60, 0x00, 0x00,
0x03, 0x00, 0x90, 0x00, 0x00, 0x03, 0x00, 0x00,
0x03, 0x00, 0x78, 0xa0, 0x03, 0xc0, 0x80, 0x10,
0xe5, 0x96, 0x66, 0x69, 0x24, 0xca, 0xe0, 0x10,
0x00, 0x00, 0x03, 0x00, 0x10, 0x00, 0x00, 0x03,
0x01, 0xe0, 0x80, 0x22, 0x00, 0x01, 0x00, 0x07,
0x44, 0x01, 0xc1, 0x72, 0xb4, 0x62, 0x40, 0x27,
0x00, 0x01, 0x00, 0x0b, 0x4e, 0x01, 0x05, 0xff,
0xff, 0xff, 0xa6, 0x2c, 0xa2, 0xde, 0x09,
},
str: `ConfigurationVersion=0x1 GeneralProfileSpace=0x0 GeneralTierFlag=false GeneralProfileIdc=0x1 ` +
`GeneralProfileCompatibility=[false, true, true, false, false, false, false, false, false, false, false, ` +
`false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, ` +
`false, false, false, false, false, false] GeneralConstraintIndicator=[0x90, 0x0, 0x0, 0x0, 0x0, 0x0] GeneralLevelIdc=0x78 ` +
`MinSpatialSegmentationIdc=0 ParallelismType=0x0 ChromaFormatIdc=0x1 BitDepthLumaMinus8=0x0 BitDepthChromaMinus8=0x0 ` +
`AvgFrameRate=0 ConstantFrameRate=0x0 NumTemporalLayers=0x0 TemporalIdNested=0x3 LengthSizeMinusOne=0x3 NumOfNaluArrays=0x4 ` +
`NaluArrays=[{Completeness=false Reserved=false NaluType=0x20 NumNalus=1 Nalus=[{Length=24 NALUnit=[0x40, 0x1, 0xc, 0x1, ` +
`0xff, 0xff, 0x1, 0x60, 0x0, 0x0, 0x3, 0x0, 0x90, 0x0, 0x0, 0x3, 0x0, 0x0, 0x3, 0x0, 0x78, 0x99, 0x98, 0x9]}]}, ` +
`{Completeness=false Reserved=false NaluType=0x21 NumNalus=1 Nalus=[{Length=42 NALUnit=[0x6, 0x1, 0x1, 0x1, 0x60, 0x0, ` +
`0x0, 0x3, 0x0, 0x90, 0x0, 0x0, 0x3, 0x0, 0x0, 0x3, 0x0, 0x78, 0xa0, 0x3, 0xc0, 0x80, 0x10, 0xe5, 0x96, 0x66, 0x69, 0x24, ` +
`0xca, 0xe0, 0x10, 0x0, 0x0, 0x3, 0x0, 0x10, 0x0, 0x0, 0x3, 0x1, 0xe0, 0x80]}]}, {Completeness=false Reserved=false ` +
`NaluType=0x22 NumNalus=1 Nalus=[{Length=7 NALUnit=[0x44, 0x1, 0xc1, 0x72, 0xb4, 0x62, 0x40]}]}, ` +
`{Completeness=false Reserved=false NaluType=0x27 NumNalus=1 Nalus=[{Length=11 NALUnit=[0x4e, 0x1, 0x5, 0xff, 0xff, 0xff, ` +
`0xa6, 0x2c, 0xa2, 0xde, 0x9]}]}]`,
},
{
name: "ilst",
src: &Ilst{},
Expand Down

0 comments on commit b881637

Please sign in to comment.