This commit is contained in:
Andrey Semochkin
2024-12-18 14:00:58 +03:00
parent 7bb8737cc8
commit dc22c36964
2 changed files with 128 additions and 40 deletions

View File

@@ -1,6 +1,7 @@
package mp4io
import (
"errors"
"time"
"github.com/deepch/vdk/utils/bits/pio"
@@ -24,17 +25,18 @@ func (self AVC1Desc) Tag() Tag {
return AVC1
}
//0x31766568
// 0x31766568
const HEV1 = Tag(0x68766331)
func (self HV1Desc) Tag() Tag {
return HEV1
}
//const HVC1 = Tag(0x68766331)
//func (self HVC1Desc) Tag() Tag {
// return HVC1
//}
// const HVC1 = Tag(0x68766331)
//
// func (self HVC1Desc) Tag() Tag {
// return HVC1
// }
const URL = Tag(0x75726c20)
func (self DataReferUrl) Tag() Tag {
@@ -304,6 +306,10 @@ func (self *Movie) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("trak", n+offset, err)
return
}
if len(self.Tracks) > 100 {
err = errors.New("too many tracks")
return
}
self.Tracks = append(self.Tracks, atom)
}
default:
@@ -313,6 +319,10 @@ func (self *Movie) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -601,6 +611,10 @@ func (self *Track) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -940,6 +954,10 @@ func (self *Media) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -1173,6 +1191,10 @@ func (self *MediaInfo) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -1255,6 +1277,10 @@ func (self *DataInfo) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -1817,6 +1843,10 @@ func (self *SampleDesc) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -1982,6 +2012,10 @@ func (self *MP4ADesc) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -2291,6 +2325,10 @@ func (self *AVC1Desc) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -2411,6 +2449,10 @@ func (self *HV1Desc) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -2954,6 +2996,10 @@ func (self *MovieFrag) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("traf", n+offset, err)
return
}
if len(self.Tracks) > 100 {
err = errors.New("too many tracks")
return
}
self.Tracks = append(self.Tracks, atom)
}
default:
@@ -2963,6 +3009,10 @@ func (self *MovieFrag) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -3127,6 +3177,10 @@ func (self *TrackFrag) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}
@@ -3197,6 +3251,10 @@ func (self *MovieExtend) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("trex", n+offset, err)
return
}
if len(self.Tracks) > 100 {
err = errors.New("too many tracks")
return
}
self.Tracks = append(self.Tracks, atom)
}
default:
@@ -3206,6 +3264,10 @@ func (self *MovieExtend) Unmarshal(b []byte, offset int) (n int, err error) {
err = parseErr("", n+offset, err)
return
}
if len(self.Unknowns) > 100 {
err = errors.New("too many unknowns")
return
}
self.Unknowns = append(self.Unknowns, atom)
}
}