Browse Source

fix freeze when reading a stream with both HLS and RTSP

pull/1333/head
aler9 2 years ago
parent
commit
0772db509a
  1. 4
      internal/core/formatprocessor_h264.go
  2. 4
      internal/core/formatprocessor_h265.go

4
internal/core/formatprocessor_h264.go

@ -222,7 +222,9 @@ func (t *formatProcessorH264) process(dat data, hasNonRTSPReaders bool) error { @@ -222,7 +222,9 @@ func (t *formatProcessorH264) process(dat data, hasNonRTSPReaders bool) error {
t.decoder = t.format.CreateDecoder()
}
tdata.rtpPackets = nil
if t.encoder != nil {
tdata.rtpPackets = nil
}
// DecodeUntilMarker() is necessary, otherwise Encode() generates partial groups
nalus, pts, err := t.decoder.DecodeUntilMarker(pkt)

4
internal/core/formatprocessor_h265.go

@ -170,7 +170,9 @@ func (t *formatProcessorH265) process(dat data, hasNonRTSPReaders bool) error { @@ -170,7 +170,9 @@ func (t *formatProcessorH265) process(dat data, hasNonRTSPReaders bool) error {
t.decoder = t.format.CreateDecoder()
}
tdata.rtpPackets = nil
if t.encoder != nil {
tdata.rtpPackets = nil
}
// DecodeUntilMarker() is necessary, otherwise Encode() generates partial groups
nalus, pts, err := t.decoder.DecodeUntilMarker(pkt)

Loading…
Cancel
Save