Browse Source
* split data into specialized structs * move MPEG4-audio decoding into streamTrack * restore video/audio synchronization in HLS muxer and RTMP server * log decode errors * move H264 decoding and re-encoding here from gortsplib * add tests * update gortsplibpull/1212/head
Alessandro Ros
3 years ago
committed by
GitHub
19 changed files with 860 additions and 246 deletions
@ -1,19 +1,33 @@ |
|||||||
package core |
package core |
||||||
|
|
||||||
import ( |
import ( |
||||||
"github.com/aler9/gortsplib" |
"fmt" |
||||||
) |
) |
||||||
|
|
||||||
type streamTrackGeneric struct { |
const ( |
||||||
writeDataInner func(*data) |
// 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header)
|
||||||
|
maxPacketSize = 1472 |
||||||
|
) |
||||||
|
|
||||||
|
type streamTrackGeneric struct{} |
||||||
|
|
||||||
|
func newStreamTrackGeneric() *streamTrackGeneric { |
||||||
|
return &streamTrackGeneric{} |
||||||
} |
} |
||||||
|
|
||||||
func newStreamTrackGeneric(track gortsplib.Track, writeDataInner func(*data)) *streamTrackGeneric { |
func (t *streamTrackGeneric) onData(dat data, hasNonRTSPReaders bool) error { |
||||||
return &streamTrackGeneric{ |
tdata := dat.(*dataGeneric) |
||||||
writeDataInner: writeDataInner, |
|
||||||
|
pkt := tdata.rtpPackets[0] |
||||||
|
|
||||||
|
// remove padding
|
||||||
|
pkt.Header.Padding = false |
||||||
|
pkt.PaddingSize = 0 |
||||||
|
|
||||||
|
if pkt.MarshalSize() > maxPacketSize { |
||||||
|
return fmt.Errorf("payload size (%d) is greater than maximum allowed (%d)", |
||||||
|
pkt.MarshalSize(), maxPacketSize) |
||||||
} |
} |
||||||
} |
|
||||||
|
|
||||||
func (t *streamTrackGeneric) writeData(data *data) { |
return nil |
||||||
t.writeDataInner(data) |
|
||||||
} |
} |
||||||
|
|||||||
@ -1,58 +1,89 @@ |
|||||||
package core |
package core |
||||||
|
|
||||||
import ( |
import ( |
||||||
|
"fmt" |
||||||
|
|
||||||
"github.com/aler9/gortsplib" |
"github.com/aler9/gortsplib" |
||||||
"github.com/aler9/gortsplib/pkg/rtpmpeg4audio" |
"github.com/aler9/gortsplib/pkg/rtpmpeg4audio" |
||||||
) |
) |
||||||
|
|
||||||
type streamTrackMPEG4Audio struct { |
type streamTrackMPEG4Audio struct { |
||||||
writeDataInner func(*data) |
track *gortsplib.TrackMPEG4Audio |
||||||
|
encoder *rtpmpeg4audio.Encoder |
||||||
rtpEncoder *rtpmpeg4audio.Encoder |
decoder *rtpmpeg4audio.Decoder |
||||||
} |
} |
||||||
|
|
||||||
func newStreamTrackMPEG4Audio( |
func newStreamTrackMPEG4Audio( |
||||||
track *gortsplib.TrackMPEG4Audio, |
track *gortsplib.TrackMPEG4Audio, |
||||||
generateRTPPackets bool, |
generateRTPPackets bool, |
||||||
writeDataInner func(*data), |
|
||||||
) *streamTrackMPEG4Audio { |
) *streamTrackMPEG4Audio { |
||||||
t := &streamTrackMPEG4Audio{ |
t := &streamTrackMPEG4Audio{ |
||||||
writeDataInner: writeDataInner, |
track: track, |
||||||
} |
} |
||||||
|
|
||||||
if generateRTPPackets { |
if generateRTPPackets { |
||||||
t.rtpEncoder = &rtpmpeg4audio.Encoder{ |
t.encoder = &rtpmpeg4audio.Encoder{ |
||||||
PayloadType: 96, |
PayloadType: 96, |
||||||
SampleRate: track.ClockRate(), |
SampleRate: track.ClockRate(), |
||||||
SizeLength: 13, |
SizeLength: 13, |
||||||
IndexLength: 3, |
IndexLength: 3, |
||||||
IndexDeltaLength: 3, |
IndexDeltaLength: 3, |
||||||
} |
} |
||||||
t.rtpEncoder.Init() |
t.encoder.Init() |
||||||
} |
} |
||||||
|
|
||||||
return t |
return t |
||||||
} |
} |
||||||
|
|
||||||
func (t *streamTrackMPEG4Audio) generateRTPPackets(dat *data) { |
func (t *streamTrackMPEG4Audio) generateRTPPackets(tdata *dataMPEG4Audio) error { |
||||||
pkts, err := t.rtpEncoder.Encode([][]byte{dat.mpeg4AudioAU}, dat.pts) |
pkts, err := t.encoder.Encode(tdata.aus, tdata.pts) |
||||||
if err != nil { |
if err != nil { |
||||||
return |
return err |
||||||
} |
} |
||||||
|
|
||||||
for _, pkt := range pkts { |
tdata.rtpPackets = pkts |
||||||
t.writeDataInner(&data{ |
return nil |
||||||
trackID: dat.trackID, |
|
||||||
rtpPacket: pkt, |
|
||||||
ptsEqualsDTS: true, |
|
||||||
}) |
|
||||||
} |
|
||||||
} |
} |
||||||
|
|
||||||
func (t *streamTrackMPEG4Audio) writeData(dat *data) { |
func (t *streamTrackMPEG4Audio) onData(dat data, hasNonRTSPReaders bool) error { |
||||||
if dat.rtpPacket != nil { |
tdata := dat.(*dataMPEG4Audio) |
||||||
t.writeDataInner(dat) |
|
||||||
} else { |
if tdata.rtpPackets != nil { |
||||||
t.generateRTPPackets(dat) |
pkt := tdata.rtpPackets[0] |
||||||
|
|
||||||
|
// remove padding
|
||||||
|
pkt.Header.Padding = false |
||||||
|
pkt.PaddingSize = 0 |
||||||
|
|
||||||
|
if pkt.MarshalSize() > maxPacketSize { |
||||||
|
return fmt.Errorf("payload size (%d) is greater than maximum allowed (%d)", |
||||||
|
pkt.MarshalSize(), maxPacketSize) |
||||||
|
} |
||||||
|
|
||||||
|
// decode from RTP
|
||||||
|
if hasNonRTSPReaders { |
||||||
|
if t.decoder == nil { |
||||||
|
t.decoder = &rtpmpeg4audio.Decoder{ |
||||||
|
SampleRate: t.track.Config.SampleRate, |
||||||
|
SizeLength: t.track.SizeLength, |
||||||
|
IndexLength: t.track.IndexLength, |
||||||
|
IndexDeltaLength: t.track.IndexDeltaLength, |
||||||
|
} |
||||||
|
t.decoder.Init() |
||||||
|
} |
||||||
|
|
||||||
|
aus, pts, err := t.decoder.Decode(pkt) |
||||||
|
if err != nil { |
||||||
|
return err |
||||||
|
} |
||||||
|
|
||||||
|
tdata.aus = aus |
||||||
|
tdata.pts = pts |
||||||
|
} |
||||||
|
|
||||||
|
// route packet as is
|
||||||
|
return nil |
||||||
} |
} |
||||||
|
|
||||||
|
return t.generateRTPPackets(tdata) |
||||||
} |
} |
||||||
|
|||||||
Loading…
Reference in new issue