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

write DataLength for PESHeader in Muxer

Browse Source
This commit is contained in:
nareix 2016-03-09 01:27:37 +08:00
parent 7a1c3ed2cc
commit 4aa58ada6f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
muxer.go
View File

@ -32,7 +32,7 @@ func (self *Track) setPCR() {
} }
} }
func (self *Track) getPesHeader() (data []byte){ func (self *Track) getPesHeader(dataLength int) (data []byte){
if self.PTS == 0 { if self.PTS == 0 {
self.PTS = self.TimeScale self.PTS = self.TimeScale
} }
@ -41,7 +41,7 @@ func (self *Track) getPesHeader() (data []byte){
StreamId: self.streamId, StreamId: self.streamId,
PTS: uint64(self.PTS)*PTS_HZ/uint64(self.TimeScale), PTS: uint64(self.PTS)*PTS_HZ/uint64(self.TimeScale),
} }
WritePESHeader(buf, pes) WritePESHeader(buf, pes, dataLength)
return buf.Bytes() return buf.Bytes()
} }
@ -60,7 +60,6 @@ func (self *Track) WriteH264NALU(sync bool, duration int, nalu []byte) (err erro
nalus = append(nalus, nalu) nalus = append(nalus, nalu)
data := &iovec{} data := &iovec{}
data.Append(self.getPesHeader())
for i, nalu := range nalus { for i, nalu := range nalus {
var startCode []byte var startCode []byte
if i == 0 { if i == 0 {
@ -72,6 +71,7 @@ func (self *Track) WriteH264NALU(sync bool, duration int, nalu []byte) (err erro
data.Append(nalu) data.Append(nalu)
} }
data.Prepend(self.getPesHeader(data.Len))
self.tsw.RandomAccessIndicator = sync self.tsw.RandomAccessIndicator = sync
self.setPCR() self.setPCR()
if err = self.tsw.WriteIovec(data); err != nil { if err = self.tsw.WriteIovec(data); err != nil {
@ -84,6 +84,7 @@ func (self *Track) WriteH264NALU(sync bool, duration int, nalu []byte) (err erro
func (self *Track) WriteADTSAACFrame(duration int, frame []byte) (err error) { func (self *Track) WriteADTSAACFrame(duration int, frame []byte) (err error) {
if self.dataBuf != nil && self.dataBuf.Len > self.cacheSize { if self.dataBuf != nil && self.dataBuf.Len > self.cacheSize {
self.dataBuf.Prepend(self.getPesHeader(self.dataBuf.Len))
self.tsw.RandomAccessIndicator = true self.tsw.RandomAccessIndicator = true
self.setPCR() self.setPCR()
if err = self.tsw.WriteIovec(self.dataBuf); err != nil { if err = self.tsw.WriteIovec(self.dataBuf); err != nil {
@ -91,14 +92,10 @@ func (self *Track) WriteADTSAACFrame(duration int, frame []byte) (err error) {
} }
self.dataBuf = nil self.dataBuf = nil
} }
if self.dataBuf == nil { if self.dataBuf == nil {
self.dataBuf = &iovec{} self.dataBuf = &iovec{}
self.dataBuf.Append(self.getPesHeader())
} else {
self.dataBuf.Append(frame)
} }
self.dataBuf.Append(frame)
self.incPTS(duration) self.incPTS(duration)
return return
} }
@ -108,7 +105,7 @@ func newTrack(w io.Writer, pid uint, streamId uint) (track *Track) {
tsw: &TSWriter{ tsw: &TSWriter{
W: w, W: w,
PID: pid, PID: pid,
//DiscontinuityIndicator: true, DiscontinuityIndicator: true,
}, },
streamId: streamId, streamId: streamId,
} }
@ -162,12 +159,12 @@ func (self *Muxer) WriteHeader() (err error) {
tswPMT := &TSWriter{ tswPMT := &TSWriter{
W: self.W, W: self.W,
PID: 0x1000, PID: 0x1000,
//DiscontinuityIndicator: true, DiscontinuityIndicator: true,
} }
tswPAT := &TSWriter{ tswPAT := &TSWriter{
W: self.W, W: self.W,
PID: 0, PID: 0,
//DiscontinuityIndicator: true, DiscontinuityIndicator: true,
} }
if err = tswPAT.Write(bufPAT.Bytes()); err != nil { if err = tswPAT.Write(bufPAT.Bytes()); err != nil {
return return