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

change to h264parser.FindDataNALUInAVCCNALUs()

Browse Source
This commit is contained in:
nareix 2016-07-01 19:20:07 +08:00
parent ebdf95b174
commit 88373387b8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtmp.go
View File

@ -708,11 +708,11 @@ func (self *Conn) ReadPacket() (pkt av.Packet, err error) {
switch tag := _tag.(type) { switch tag := _tag.(type) {
case *flvio.Videodata: case *flvio.Videodata:
pkt.CompositionTime = tsToTime(uint32(tag.CompositionTime)) pkt.CompositionTime = tsToTime(uint32(tag.CompositionTime))
if typ := h264parser.CheckNALUsType(tag.Data); typ != h264parser.NALU_AVCC { var ok bool
err = fmt.Errorf("rtmp: input h264 nalu format=%d invalid", typ) if pkt.Data, ok = h264parser.FindDataNALUInAVCCNALUs(tag.Data); !ok {
err = fmt.Errorf("rtmp: input h264 format invalid")
return return
} }
pkt.Data = tag.Data[4:]
pkt.IsKeyFrame = tag.FrameType == flvio.FRAME_KEY pkt.IsKeyFrame = tag.FrameType == flvio.FRAME_KEY
pkt.Idx = int8(self.videostreamidx) pkt.Idx = int8(self.videostreamidx)
break poll break poll