Fix H264 in RTSP processing

This commit is contained in:
Alexey Khit
2022-09-06 07:00:22 +03:00
parent 6b274f2a37
commit e4f565f343
+16 -18
View File
@@ -37,32 +37,34 @@ func RTPDepay(track *streamer.Track) streamer.WrapperFunc {
return nil return nil
} }
for { for len(units) > 0 {
i := int(binary.BigEndian.Uint32(units)) + 4 i := int(binary.BigEndian.Uint32(units)) + 4
unitAVC := units[:i] unit := units[:i] // NAL Unit with AVC header
units = units[i:]
unitType := NALUType(unitAVC) unitType := NALUType(unit)
//fmt.Printf("[H264] type: %2d, size: %6d\n", unitType, i)
switch unitType { switch unitType {
case NALUTypeSPS: case NALUTypeSPS:
//println("new SPS") //println("new SPS")
sps = unitAVC sps = unit
return nil continue
case NALUTypePPS: case NALUTypePPS:
//println("new PPS") //println("new PPS")
pps = unitAVC pps = unit
return nil continue
} }
// ffmpeg with `-tune zerolatency` enable option `-x264opts sliced-threads=1` // ffmpeg with `-tune zerolatency` enable option `-x264opts sliced-threads=1`
// and every NALU will be sliced to multiple NALUs // and every NALU will be sliced to multiple NALUs
if !packet.Marker { if !packet.Marker {
buffer = append(buffer, unitAVC...) buffer = append(buffer, unit...)
return nil continue
} }
if buffer != nil { if buffer != nil {
buffer = append(buffer, unitAVC...) buffer = append(buffer, unit...)
unitAVC = buffer unit = buffer
buffer = nil buffer = nil
} }
@@ -86,17 +88,13 @@ func RTPDepay(track *streamer.Track) streamer.WrapperFunc {
clone = *packet clone = *packet
clone.Version = RTPPacketVersionAVC clone.Version = RTPPacketVersionAVC
clone.Payload = unitAVC clone.Payload = unit
if err = push(&clone); err != nil { if err = push(&clone); err != nil {
return err return err
} }
if len(units) == i {
return nil
}
units = units[i:]
} }
return nil
} }
} }
} }