thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix missing track.TrackAtom.Media.Info.Sound and cttsEntry append pointer bug

Browse Source
This commit is contained in:
nareix 2016-04-01 16:47:07 +08:00
parent 08a5195078
commit 767dcd85b6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
muxer.go
View File

@ -42,8 +42,6 @@ func (self *Muxer) newTrack() *Track {
TrackId: len(self.Tracks)+1, TrackId: len(self.Tracks)+1,
Flags: 0x0003, // Track enabled | Track in movie Flags: 0x0003, // Track enabled | Track in movie
Duration: 0, // fill later Duration: 0, // fill later
Volume: atom.IntToFixed(1),
AlternateGroup: 1,
Matrix: [9]int{0x10000, 0, 0, 0, 0x10000, 0, 0, 0, 0x40000000}, Matrix: [9]int{0x10000, 0, 0, 0, 0x10000, 0, 0, 0, 0x40000000},
}, },
Media: &atom.Media{ Media: &atom.Media{
@ -52,8 +50,6 @@ func (self *Muxer) newTrack() *Track {
Duration: 0, // fill later Duration: 0, // fill later
}, },
Info: &atom.MediaInfo{ Info: &atom.MediaInfo{
Sound: &atom.SoundMediaInfo{
},
Sample: track.sample, Sample: track.sample,
Data: &atom.DataInfo{ Data: &atom.DataInfo{
Refer: &atom.DataRefer{ Refer: &atom.DataRefer{
@ -83,10 +79,13 @@ func (self *Muxer) AddAACTrack() (track *Track) {
SampleRate: 0, // fill later SampleRate: 0, // fill later
Conf: &atom.ElemStreamDesc{}, Conf: &atom.ElemStreamDesc{},
} }
track.TrackAtom.Header.Volume = atom.IntToFixed(1)
track.TrackAtom.Header.AlternateGroup = 1
track.TrackAtom.Media.Handler = &atom.HandlerRefer{ track.TrackAtom.Media.Handler = &atom.HandlerRefer{
SubType: "soun", SubType: "soun",
Name: "Sound Handler", Name: "Sound Handler",
} }
track.TrackAtom.Media.Info.Sound = &atom.SoundMediaInfo{}
return return
} }
@ -109,6 +108,10 @@ func (self *Muxer) AddH264Track() (track *Track) {
SubType: "vide", SubType: "vide",
Name: "Video Media Handler", Name: "Video Media Handler",
} }
track.sample.CompositionOffset = &atom.CompositionOffset{}
track.TrackAtom.Media.Info.Video = &atom.VideoMediaInfo{
Flags: 0x000001,
}
return return
} }
@ -164,18 +167,16 @@ func (self *Track) WriteSample(pts int64, dts int64, isKeyFrame bool, data []byt
self.sttsEntry.Count++ self.sttsEntry.Count++
} }
if pts != dts { if self.sample.CompositionOffset != nil {
if pts < dts { if pts < dts {
err = fmt.Errorf("pts must greater than dts") err = fmt.Errorf("pts must greater than dts")
return return
} }
offset := int(pts-dts) offset := int(pts-dts)
if self.cttsEntry == nil || offset != self.cttsEntry.Offset { if self.cttsEntry == nil || offset != self.cttsEntry.Offset {
self.cttsEntry = &atom.CompositionOffsetEntry{Offset: offset} table := self.sample.CompositionOffset
if self.sample.CompositionOffset == nil { table.Entries = append(table.Entries, atom.CompositionOffsetEntry{Offset: offset})
self.sample.CompositionOffset = &atom.CompositionOffset{} self.cttsEntry = &table.Entries[len(table.Entries)-1]
}
self.sample.CompositionOffset.Entries = append(self.sample.CompositionOffset.Entries, *self.cttsEntry)
} }
self.cttsEntry.Count++ self.cttsEntry.Count++
} }