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

muxer: use h264parser.CheckNALUsType

Browse Source
This commit is contained in:
nareix 2016-07-01 18:31:42 +08:00
parent 6b887066cf
commit 7530d353fd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
muxer.go
View File

@ -146,9 +146,7 @@ func (self *Muxer) writePacket(pkt av.Packet) (err error) {
case av.AAC: case av.AAC:
codec := stream.CodecData.(aacparser.CodecData) codec := stream.CodecData.(aacparser.CodecData)
data := pkt.Data data := pkt.Data
if !aacparser.IsADTSFrame(data) { data = append(codec.MakeADTSHeader(1024, len(data)), data...)
data = append(codec.MakeADTSHeader(1024, len(data)), data...)
}
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
pes := PESHeader{ pes := PESHeader{
@ -174,10 +172,15 @@ func (self *Muxer) writePacket(pkt av.Packet) (err error) {
} }
WritePESHeader(buf, pes, 0) WritePESHeader(buf, pes, 0)
nalus, _ := h264parser.SplitNALUs(pkt.Data) if typ := h264parser.CheckNALUsType(pkt.Data); typ != h264parser.NALU_RAW {
if pkt.IsKeyFrame { err = fmt.Errorf("ts: h264 nalu format=%d invalid", typ)
nalus = append([][]byte{codec.SPS(), codec.PPS()}, nalus...) return
} }
nalus := [][]byte{}
if pkt.IsKeyFrame {
nalus = append([][]byte{codec.SPS(), codec.PPS()})
}
nalus = append(nalus, pkt.Data)
h264parser.WalkNALUsAnnexb(nalus, func(b []byte) { h264parser.WalkNALUsAnnexb(nalus, func(b []byte) {
buf.Write(b) buf.Write(b)
}) })