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

change PTS to timeScale unit in SimpleH264Writer

Browse Source
This commit is contained in:
nareix 2015-12-12 10:58:21 +08:00
parent b0b956fc26
commit 20551c6a1d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
writer.go
View File

@ -542,8 +542,8 @@ type SimpleH264Writer struct {
tswPMT *TSWriter tswPMT *TSWriter
tswH264 *TSWriter tswH264 *TSWriter
PTS uint64 PTS int64
PCR uint64 PCR int64
prepared bool prepared bool
writeSPS bool writeSPS bool
@ -590,10 +590,12 @@ func (self *SimpleH264Writer) prepare() (err error) {
self.tswH264.EnableVecWriter() self.tswH264.EnableVecWriter()
if self.PTS == 0 { if self.PTS == 0 {
self.PTS = PTS_HZ // 1s
self.PTS = int64(self.TimeScale)
} }
if self.PCR == 0 { if self.PCR == 0 {
self.PCR = PCR_HZ // 1s
self.PCR = int64(self.TimeScale)
} }
self.pesBuf = &bytes.Buffer{} self.pesBuf = &bytes.Buffer{}
@ -638,7 +640,7 @@ func (self *SimpleH264Writer) WriteNALU(sync bool, duration int, nalu []byte) (e
pes := PESHeader{ pes := PESHeader{
StreamId: StreamIdH264, StreamId: StreamIdH264,
PTS: self.PTS, PTS: uint64(self.PTS)*PTS_HZ/uint64(self.TimeScale),
} }
if err = WritePESHeader(self.pesBuf, pes); err != nil { if err = WritePESHeader(self.pesBuf, pes); err != nil {
return return
@ -658,15 +660,15 @@ func (self *SimpleH264Writer) WriteNALU(sync bool, duration int, nalu []byte) (e
} }
self.tswH264.RandomAccessIndicator = sync self.tswH264.RandomAccessIndicator = sync
self.tswH264.PCR = self.PCR self.tswH264.PCR = uint64(self.PCR)*PCR_HZ/uint64(self.TimeScale)
self.tswH264.W = self.W self.tswH264.W = self.W
if err = self.tswH264.WriteIovec(data); err != nil { if err = self.tswH264.WriteIovec(data); err != nil {
return return
} }
self.PTS += uint64(duration)*PTS_HZ/uint64(self.TimeScale) self.PTS += int64(duration)
self.PCR += uint64(duration)*PCR_HZ/uint64(self.TimeScale) self.PCR += int64(duration)
self.pesBuf.Reset() self.pesBuf.Reset()
return return