forked from External/mediamtx
update dependencies (#2113)
This commit is contained in:
Alessandro Ros
GitHub
parent
583fee26f6
commit
e4bd1b35a2
8 changed files with 225 additions and 290 deletions
|
|
@ -6,11 +6,8 @@ import (
|
|||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/asticode/go-astits"
|
||||
"github.com/bluenviron/gortsplib/v3/pkg/formats"
|
||||
"github.com/bluenviron/gortsplib/v3/pkg/media"
|
||||
"github.com/bluenviron/mediacommon/pkg/codecs/h264"
|
||||
"github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio"
|
||||
"github.com/bluenviron/mediacommon/pkg/formats/mpegts"
|
||||
"golang.org/x/net/ipv4"
|
||||
|
||||
|
|
@ -24,43 +21,6 @@ const (
|
|||
udpMTU = 1472
|
||||
)
|
||||
|
||||
var opusDurations = [32]int{
|
||||
480, 960, 1920, 2880, /* Silk NB */
|
||||
480, 960, 1920, 2880, /* Silk MB */
|
||||
480, 960, 1920, 2880, /* Silk WB */
|
||||
480, 960, /* Hybrid SWB */
|
||||
480, 960, /* Hybrid FB */
|
||||
120, 240, 480, 960, /* CELT NB */
|
||||
120, 240, 480, 960, /* CELT NB */
|
||||
120, 240, 480, 960, /* CELT NB */
|
||||
120, 240, 480, 960, /* CELT NB */
|
||||
}
|
||||
|
||||
func opusGetPacketDuration(pkt []byte) time.Duration {
|
||||
if len(pkt) == 0 {
|
||||
return 0
|
||||
}
|
||||
|
||||
frameDuration := opusDurations[pkt[0]>>3]
|
||||
|
||||
frameCount := 0
|
||||
switch pkt[0] & 3 {
|
||||
case 0:
|
||||
frameCount = 1
|
||||
case 1:
|
||||
frameCount = 2
|
||||
case 2:
|
||||
frameCount = 2
|
||||
case 3:
|
||||
if len(pkt) < 2 {
|
||||
return 0
|
||||
}
|
||||
frameCount = int(pkt[1] & 63)
|
||||
}
|
||||
|
||||
return (time.Duration(frameDuration) * time.Duration(frameCount) * time.Millisecond) / 48
|
||||
}
|
||||
|
||||
func joinMulticastGroupOnAtLeastOneInterface(p *ipv4.PacketConn, listenIP net.IP) error {
|
||||
intfs, err := net.Interfaces()
|
||||
if err != nil {
|
||||
|
|
@ -86,38 +46,18 @@ func joinMulticastGroupOnAtLeastOneInterface(p *ipv4.PacketConn, listenIP net.IP
|
|||
}
|
||||
|
||||
type packetConnReader struct {
|
||||
pc net.PacketConn
|
||||
midbuf []byte
|
||||
midbufpos int
|
||||
pc net.PacketConn
|
||||
}
|
||||
|
||||
func newPacketConnReader(pc net.PacketConn) *packetConnReader {
|
||||
return &packetConnReader{
|
||||
pc: pc,
|
||||
midbuf: make([]byte, 0, 1500),
|
||||
pc: pc,
|
||||
}
|
||||
}
|
||||
|
||||
func (r *packetConnReader) Read(p []byte) (int, error) {
|
||||
if r.midbufpos < len(r.midbuf) {
|
||||
n := copy(p, r.midbuf[r.midbufpos:])
|
||||
r.midbufpos += n
|
||||
return n, nil
|
||||
}
|
||||
|
||||
mn, _, err := r.pc.ReadFrom(r.midbuf[:cap(r.midbuf)])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
if (mn % 188) != 0 {
|
||||
return 0, fmt.Errorf("received packet with size %d not multiple of 188", mn)
|
||||
}
|
||||
|
||||
r.midbuf = r.midbuf[:mn]
|
||||
n := copy(p, r.midbuf)
|
||||
r.midbufpos = n
|
||||
return n, nil
|
||||
n, _, err := r.pc.ReadFrom(p)
|
||||
return n, err
|
||||
}
|
||||
|
||||
type udpSourceParent interface {
|
||||
|
|
@ -174,193 +114,10 @@ func (s *udpSource) run(ctx context.Context, cnf *conf.PathConf, _ chan *conf.Pa
|
|||
}
|
||||
}
|
||||
|
||||
dem := astits.NewDemuxer(
|
||||
context.Background(),
|
||||
newPacketConnReader(pc),
|
||||
astits.DemuxerOptPacketSize(188))
|
||||
|
||||
readerErr := make(chan error)
|
||||
|
||||
go func() {
|
||||
readerErr <- func() error {
|
||||
pc.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
|
||||
tracks, err := mpegts.FindTracks(dem)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var medias media.Medias
|
||||
mediaCallbacks := make(map[uint16]func(time.Duration, []byte), len(tracks))
|
||||
var stream *stream
|
||||
|
||||
for _, track := range tracks {
|
||||
var medi *media.Media
|
||||
|
||||
switch tcodec := track.Codec.(type) {
|
||||
case *mpegts.CodecH264:
|
||||
medi = &media.Media{
|
||||
Type: media.TypeVideo,
|
||||
Formats: []formats.Format{&formats.H264{
|
||||
PayloadTyp: 96,
|
||||
PacketizationMode: 1,
|
||||
}},
|
||||
}
|
||||
|
||||
mediaCallbacks[track.ES.ElementaryPID] = func(pts time.Duration, data []byte) {
|
||||
au, err := h264.AnnexBUnmarshal(data)
|
||||
if err != nil {
|
||||
s.Log(logger.Warn, "%v", err)
|
||||
return
|
||||
}
|
||||
|
||||
stream.writeUnit(medi, medi.Formats[0], &formatprocessor.UnitH264{
|
||||
PTS: pts,
|
||||
AU: au,
|
||||
NTP: time.Now(),
|
||||
})
|
||||
}
|
||||
|
||||
case *mpegts.CodecH265:
|
||||
medi = &media.Media{
|
||||
Type: media.TypeVideo,
|
||||
Formats: []formats.Format{&formats.H265{
|
||||
PayloadTyp: 96,
|
||||
}},
|
||||
}
|
||||
|
||||
mediaCallbacks[track.ES.ElementaryPID] = func(pts time.Duration, data []byte) {
|
||||
au, err := h264.AnnexBUnmarshal(data)
|
||||
if err != nil {
|
||||
s.Log(logger.Warn, "%v", err)
|
||||
return
|
||||
}
|
||||
|
||||
stream.writeUnit(medi, medi.Formats[0], &formatprocessor.UnitH265{
|
||||
PTS: pts,
|
||||
AU: au,
|
||||
NTP: time.Now(),
|
||||
})
|
||||
}
|
||||
|
||||
case *mpegts.CodecMPEG4Audio:
|
||||
medi = &media.Media{
|
||||
Type: media.TypeAudio,
|
||||
Formats: []formats.Format{&formats.MPEG4Audio{
|
||||
PayloadTyp: 96,
|
||||
SizeLength: 13,
|
||||
IndexLength: 3,
|
||||
IndexDeltaLength: 3,
|
||||
Config: &tcodec.Config,
|
||||
}},
|
||||
}
|
||||
|
||||
mediaCallbacks[track.ES.ElementaryPID] = func(pts time.Duration, data []byte) {
|
||||
var pkts mpeg4audio.ADTSPackets
|
||||
err := pkts.Unmarshal(data)
|
||||
if err != nil {
|
||||
s.Log(logger.Warn, "%v", err)
|
||||
return
|
||||
}
|
||||
|
||||
aus := make([][]byte, len(pkts))
|
||||
for i, pkt := range pkts {
|
||||
aus[i] = pkt.AU
|
||||
}
|
||||
|
||||
stream.writeUnit(medi, medi.Formats[0], &formatprocessor.UnitMPEG4AudioGeneric{
|
||||
PTS: pts,
|
||||
AUs: aus,
|
||||
NTP: time.Now(),
|
||||
})
|
||||
}
|
||||
|
||||
case *mpegts.CodecOpus:
|
||||
medi = &media.Media{
|
||||
Type: media.TypeAudio,
|
||||
Formats: []formats.Format{&formats.Opus{
|
||||
PayloadTyp: 96,
|
||||
IsStereo: (tcodec.Channels == 2),
|
||||
}},
|
||||
}
|
||||
|
||||
mediaCallbacks[track.ES.ElementaryPID] = func(pts time.Duration, data []byte) {
|
||||
pos := 0
|
||||
|
||||
for {
|
||||
var au mpegts.OpusAccessUnit
|
||||
n, err := au.Unmarshal(data[pos:])
|
||||
if err != nil {
|
||||
s.Log(logger.Warn, "%v", err)
|
||||
return
|
||||
}
|
||||
pos += n
|
||||
|
||||
stream.writeUnit(medi, medi.Formats[0], &formatprocessor.UnitOpus{
|
||||
PTS: pts,
|
||||
Frame: au.Frame,
|
||||
NTP: time.Now(),
|
||||
})
|
||||
|
||||
if len(data[pos:]) == 0 {
|
||||
break
|
||||
}
|
||||
|
||||
pts += opusGetPacketDuration(au.Frame)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
medias = append(medias, medi)
|
||||
}
|
||||
|
||||
res := s.parent.sourceStaticImplSetReady(pathSourceStaticSetReadyReq{
|
||||
medias: medias,
|
||||
generateRTPPackets: true,
|
||||
})
|
||||
if res.err != nil {
|
||||
return res.err
|
||||
}
|
||||
|
||||
defer s.parent.sourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
|
||||
|
||||
s.Log(logger.Info, "ready: %s", sourceMediaInfo(medias))
|
||||
|
||||
stream = res.stream
|
||||
var timedec *mpegts.TimeDecoder
|
||||
|
||||
for {
|
||||
pc.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
|
||||
data, err := dem.NextData()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if data.PES == nil {
|
||||
continue
|
||||
}
|
||||
|
||||
if data.PES.Header.OptionalHeader == nil ||
|
||||
data.PES.Header.OptionalHeader.PTSDTSIndicator == astits.PTSDTSIndicatorNoPTSOrDTS ||
|
||||
data.PES.Header.OptionalHeader.PTSDTSIndicator == astits.PTSDTSIndicatorIsForbidden {
|
||||
return fmt.Errorf("PTS is missing")
|
||||
}
|
||||
|
||||
var pts time.Duration
|
||||
if timedec == nil {
|
||||
timedec = mpegts.NewTimeDecoder(data.PES.Header.OptionalHeader.PTS.Base)
|
||||
pts = 0
|
||||
} else {
|
||||
pts = timedec.Decode(data.PES.Header.OptionalHeader.PTS.Base)
|
||||
}
|
||||
|
||||
cb, ok := mediaCallbacks[data.PID]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
|
||||
cb(pts, data.PES.Data)
|
||||
}
|
||||
}()
|
||||
readerErr <- s.runReader(pc)
|
||||
}()
|
||||
|
||||
select {
|
||||
|
|
@ -374,6 +131,129 @@ func (s *udpSource) run(ctx context.Context, cnf *conf.PathConf, _ chan *conf.Pa
|
|||
}
|
||||
}
|
||||
|
||||
func (s *udpSource) runReader(pc net.PacketConn) error {
|
||||
pc.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
|
||||
r, err := mpegts.NewReader(newMPEGTSBufferedReader(newPacketConnReader(pc)))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var medias media.Medias
|
||||
var stream *stream
|
||||
|
||||
var td *mpegts.TimeDecoder
|
||||
decodeTime := func(t int64) time.Duration {
|
||||
if td == nil {
|
||||
td = mpegts.NewTimeDecoder(t)
|
||||
}
|
||||
return td.Decode(t)
|
||||
}
|
||||
|
||||
for _, track := range r.Tracks() {
|
||||
var medi *media.Media
|
||||
|
||||
switch tcodec := track.Codec.(type) {
|
||||
case *mpegts.CodecH264:
|
||||
medi = &media.Media{
|
||||
Type: media.TypeVideo,
|
||||
Formats: []formats.Format{&formats.H264{
|
||||
PayloadTyp: 96,
|
||||
PacketizationMode: 1,
|
||||
}},
|
||||
}
|
||||
|
||||
r.OnDataH26x(track, func(pts int64, _ int64, au [][]byte) error {
|
||||
stream.writeUnit(medi, medi.Formats[0], &formatprocessor.UnitH264{
|
||||
PTS: decodeTime(pts),
|
||||
AU: au,
|
||||
NTP: time.Now(),
|
||||
})
|
||||
return nil
|
||||
})
|
||||
|
||||
case *mpegts.CodecH265:
|
||||
medi = &media.Media{
|
||||
Type: media.TypeVideo,
|
||||
Formats: []formats.Format{&formats.H265{
|
||||
PayloadTyp: 96,
|
||||
}},
|
||||
}
|
||||
|
||||
r.OnDataH26x(track, func(pts int64, _ int64, au [][]byte) error {
|
||||
stream.writeUnit(medi, medi.Formats[0], &formatprocessor.UnitH265{
|
||||
PTS: decodeTime(pts),
|
||||
AU: au,
|
||||
NTP: time.Now(),
|
||||
})
|
||||
return nil
|
||||
})
|
||||
|
||||
case *mpegts.CodecMPEG4Audio:
|
||||
medi = &media.Media{
|
||||
Type: media.TypeAudio,
|
||||
Formats: []formats.Format{&formats.MPEG4Audio{
|
||||
PayloadTyp: 96,
|
||||
SizeLength: 13,
|
||||
IndexLength: 3,
|
||||
IndexDeltaLength: 3,
|
||||
Config: &tcodec.Config,
|
||||
}},
|
||||
}
|
||||
|
||||
r.OnDataMPEG4Audio(track, func(pts int64, _ int64, aus [][]byte) error {
|
||||
stream.writeUnit(medi, medi.Formats[0], &formatprocessor.UnitMPEG4AudioGeneric{
|
||||
PTS: decodeTime(pts),
|
||||
AUs: aus,
|
||||
NTP: time.Now(),
|
||||
})
|
||||
return nil
|
||||
})
|
||||
|
||||
case *mpegts.CodecOpus:
|
||||
medi = &media.Media{
|
||||
Type: media.TypeAudio,
|
||||
Formats: []formats.Format{&formats.Opus{
|
||||
PayloadTyp: 96,
|
||||
IsStereo: (tcodec.ChannelCount == 2),
|
||||
}},
|
||||
}
|
||||
|
||||
r.OnDataOpus(track, func(pts int64, _ int64, packets [][]byte) error {
|
||||
stream.writeUnit(medi, medi.Formats[0], &formatprocessor.UnitOpus{
|
||||
PTS: decodeTime(pts),
|
||||
Packets: packets,
|
||||
NTP: time.Now(),
|
||||
})
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
medias = append(medias, medi)
|
||||
}
|
||||
|
||||
res := s.parent.sourceStaticImplSetReady(pathSourceStaticSetReadyReq{
|
||||
medias: medias,
|
||||
generateRTPPackets: true,
|
||||
})
|
||||
if res.err != nil {
|
||||
return res.err
|
||||
}
|
||||
|
||||
defer s.parent.sourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
|
||||
|
||||
s.Log(logger.Info, "ready: %s", sourceMediaInfo(medias))
|
||||
|
||||
stream = res.stream
|
||||
|
||||
for {
|
||||
pc.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
|
||||
err := r.Read()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// apiSourceDescribe implements sourceStaticImpl.
|
||||
func (*udpSource) apiSourceDescribe() pathAPISourceOrReader {
|
||||
return pathAPISourceOrReader{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue