pimhwang
/
mediamtx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

normalize sources

pull/1060/head
aler9 3 years ago
parent
8267f4c3bb
commit
34eb1d1e7a
3 changed files with 197 additions and 194 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      internal/core/hls_source.go
  2. 298
      internal/core/rtmp_source.go
  3. 64
      internal/core/rtsp_source.go

29
internal/core/hls_source.go
Unescape View File

@ -74,9 +74,20 @@ func (s *hlsSource) run() { @@ -74,9 +74,20 @@ func (s *hlsSource) run() {
outer:
for {
ok := s.runInner()
if !ok {
break outer
innerCtx, innerCtxCancel := context.WithCancel(context.Background())
innerErr := make(chan error)
go func() {
innerErr <- s.runInner(innerCtx)
}()
select {
case err := <-innerErr:
innerCtxCancel()
s.Log(logger.Info, "ERR: %v", err)
case <-s.ctx.Done():
innerCtxCancel()
<-innerErr
}
select {
@ -89,7 +100,7 @@ outer: @@ -89,7 +100,7 @@ outer:
s.ctxCancel()
}
func (s *hlsSource) runInner() bool {
func (s *hlsSource) runInner(innerCtx context.Context) error {
var stream *stream
var videoTrackID int
var audioTrackID int
@ -198,19 +209,17 @@ func (s *hlsSource) runInner() bool { @@ -198,19 +209,17 @@ func (s *hlsSource) runInner() bool {
s,
)
if err != nil {
s.Log(logger.Info, "ERR: %v", err)
return true
return err
}
select {
case err := <-c.Wait():
s.Log(logger.Info, "ERR: %v", err)
return true
return err
case <-s.ctx.Done():
case <-innerCtx.Done():
c.Close()
<-c.Wait()
return false
return nil
}
}

298
internal/core/rtmp_source.go
Unescape View File

@ -61,7 +61,7 @@ func newRTMPSource( @@ -61,7 +61,7 @@ func newRTMPSource(
ctxCancel: ctxCancel,
}
s.log(logger.Info, "started")
s.Log(logger.Info, "started")
s.wg.Add(1)
go s.run()
@ -71,11 +71,11 @@ func newRTMPSource( @@ -71,11 +71,11 @@ func newRTMPSource(
// Close closes a Source.
func (s *rtmpSource) close() {
s.log(logger.Info, "stopped")
s.Log(logger.Info, "stopped")
s.ctxCancel()
}
func (s *rtmpSource) log(level logger.Level, format string, args ...interface{}) {
func (s *rtmpSource) Log(level logger.Level, format string, args ...interface{}) {
s.parent.log(level, "[rtmp source] "+format, args...)
}
@ -84,9 +84,20 @@ func (s *rtmpSource) run() { @@ -84,9 +84,20 @@ func (s *rtmpSource) run() {
outer:
for {
ok := s.runInner()
if !ok {
break outer
innerCtx, innerCtxCancel := context.WithCancel(context.Background())
innerErr := make(chan error)
go func() {
innerErr <- s.runInner(innerCtx)
}()
select {
case err := <-innerErr:
innerCtxCancel()
s.Log(logger.Info, "ERR: %v", err)
case <-s.ctx.Done():
innerCtxCancel()
<-innerErr
}
select {
@ -99,186 +110,167 @@ outer: @@ -99,186 +110,167 @@ outer:
s.ctxCancel()
}
func (s *rtmpSource) runInner() bool {
innerCtx, innerCtxCancel := context.WithCancel(s.ctx)
func (s *rtmpSource) runInner(innerCtx context.Context) error {
s.Log(logger.Debug, "connecting")
runErr := make(chan error)
go func() {
runErr <- func() error {
s.log(logger.Debug, "connecting")
u, err := url.Parse(s.ur)
if err != nil {
return err
}
// add default port
_, _, err = net.SplitHostPort(u.Host)
if err != nil {
u.Host = net.JoinHostPort(u.Host, "1935")
}
u, err := url.Parse(s.ur)
ctx2, cancel2 := context.WithTimeout(innerCtx, time.Duration(s.readTimeout))
defer cancel2()
var d net.Dialer
nconn, err := d.DialContext(ctx2, "tcp", u.Host)
if err != nil {
return err
}
conn := rtmp.NewConn(nconn)
readDone := make(chan error)
go func() {
readDone <- func() error {
nconn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
nconn.SetWriteDeadline(time.Now().Add(time.Duration(s.writeTimeout)))
err = conn.InitializeClient(u, true)
if err != nil {
return err
}
// add default port
_, _, err = net.SplitHostPort(u.Host)
nconn.SetWriteDeadline(time.Time{})
nconn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
videoTrack, audioTrack, err := conn.ReadTracks()
if err != nil {
u.Host = net.JoinHostPort(u.Host, "1935")
return err
}
ctx2, cancel2 := context.WithTimeout(innerCtx, time.Duration(s.readTimeout))
defer cancel2()
var tracks gortsplib.Tracks
videoTrackID := -1
audioTrackID := -1
var d net.Dialer
nconn, err := d.DialContext(ctx2, "tcp", u.Host)
if err != nil {
return err
var h264Encoder *rtph264.Encoder
if videoTrack != nil {
h264Encoder = &rtph264.Encoder{PayloadType: 96}
h264Encoder.Init()
videoTrackID = len(tracks)
tracks = append(tracks, videoTrack)
}
conn := rtmp.NewConn(nconn)
readDone := make(chan error)
go func() {
readDone <- func() error {
nconn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
nconn.SetWriteDeadline(time.Now().Add(time.Duration(s.writeTimeout)))
err = conn.InitializeClient(u, true)
if err != nil {
return err
}
var aacEncoder *rtpaac.Encoder
if audioTrack != nil {
aacEncoder = &rtpaac.Encoder{
PayloadType: 96,
SampleRate: audioTrack.ClockRate(),
SizeLength: 13,
IndexLength: 3,
IndexDeltaLength: 3,
}
aacEncoder.Init()
audioTrackID = len(tracks)
tracks = append(tracks, audioTrack)
}
nconn.SetWriteDeadline(time.Time{})
nconn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
videoTrack, audioTrack, err := conn.ReadTracks()
if err != nil {
return err
}
res := s.parent.onSourceStaticSetReady(pathSourceStaticSetReadyReq{
source: s,
tracks: tracks,
})
if res.err != nil {
return res.err
}
var tracks gortsplib.Tracks
videoTrackID := -1
audioTrackID := -1
s.Log(logger.Info, "ready")
var h264Encoder *rtph264.Encoder
if videoTrack != nil {
h264Encoder = &rtph264.Encoder{PayloadType: 96}
h264Encoder.Init()
videoTrackID = len(tracks)
tracks = append(tracks, videoTrack)
}
defer func() {
s.parent.onSourceStaticSetNotReady(pathSourceStaticSetNotReadyReq{source: s})
}()
var aacEncoder *rtpaac.Encoder
if audioTrack != nil {
aacEncoder = &rtpaac.Encoder{
PayloadType: 96,
SampleRate: audioTrack.ClockRate(),
SizeLength: 13,
IndexLength: 3,
IndexDeltaLength: 3,
for {
nconn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
msg, err := conn.ReadMessage()
if err != nil {
return err
}
switch tmsg := msg.(type) {
case *message.MsgVideo:
if tmsg.H264Type == flvio.AVC_NALU {
if videoTrack == nil {
return fmt.Errorf("received an H264 packet, but track is not set up")
}
aacEncoder.Init()
audioTrackID = len(tracks)
tracks = append(tracks, audioTrack)
}
res := s.parent.onSourceStaticSetReady(pathSourceStaticSetReadyReq{
source: s,
tracks: tracks,
})
if res.err != nil {
return res.err
}
s.log(logger.Info, "ready")
nalus, err := h264.AVCCUnmarshal(tmsg.Payload)
if err != nil {
return fmt.Errorf("unable to decode AVCC: %v", err)
}
defer func() {
s.parent.onSourceStaticSetNotReady(pathSourceStaticSetNotReadyReq{source: s})
}()
pts := tmsg.DTS + tmsg.PTSDelta
for {
nconn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
msg, err := conn.ReadMessage()
pkts, err := h264Encoder.Encode(nalus, pts)
if err != nil {
return err
return fmt.Errorf("error while encoding H264: %v", err)
}
switch tmsg := msg.(type) {
case *message.MsgVideo:
if tmsg.H264Type == flvio.AVC_NALU {
if videoTrack == nil {
return fmt.Errorf("received an H264 packet, but track is not set up")
}
nalus, err := h264.AVCCUnmarshal(tmsg.Payload)
if err != nil {
return fmt.Errorf("unable to decode AVCC: %v", err)
}
pts := tmsg.DTS + tmsg.PTSDelta
pkts, err := h264Encoder.Encode(nalus, pts)
if err != nil {
return fmt.Errorf("error while encoding H264: %v", err)
}
lastPkt := len(pkts) - 1
for i, pkt := range pkts {
if i != lastPkt {
res.stream.writeData(&data{
trackID: videoTrackID,
rtp: pkt,
ptsEqualsDTS: false,
})
} else {
res.stream.writeData(&data{
trackID: videoTrackID,
rtp: pkt,
ptsEqualsDTS: h264.IDRPresent(nalus),
h264NALUs: nalus,
h264PTS: pts,
})
}
}
}
case *message.MsgAudio:
if tmsg.AACType == flvio.AAC_RAW {
if audioTrack == nil {
return fmt.Errorf("received an AAC packet, but track is not set up")
}
pkts, err := aacEncoder.Encode([][]byte{tmsg.Payload}, tmsg.DTS)
if err != nil {
return fmt.Errorf("error while encoding AAC: %v", err)
}
for _, pkt := range pkts {
res.stream.writeData(&data{
trackID: audioTrackID,
rtp: pkt,
ptsEqualsDTS: true,
})
}
lastPkt := len(pkts) - 1
for i, pkt := range pkts {
if i != lastPkt {
res.stream.writeData(&data{
trackID: videoTrackID,
rtp: pkt,
ptsEqualsDTS: false,
})
} else {
res.stream.writeData(&data{
trackID: videoTrackID,
rtp: pkt,
ptsEqualsDTS: h264.IDRPresent(nalus),
h264NALUs: nalus,
h264PTS: pts,
})
}
}
}
}()
}()
select {
case err := <-readDone:
nconn.Close()
return err
case *message.MsgAudio:
if tmsg.AACType == flvio.AAC_RAW {
if audioTrack == nil {
return fmt.Errorf("received an AAC packet, but track is not set up")
}
case <-innerCtx.Done():
nconn.Close()
<-readDone
return nil
pkts, err := aacEncoder.Encode([][]byte{tmsg.Payload}, tmsg.DTS)
if err != nil {
return fmt.Errorf("error while encoding AAC: %v", err)
}
for _, pkt := range pkts {
res.stream.writeData(&data{
trackID: audioTrackID,
rtp: pkt,
ptsEqualsDTS: true,
})
}
}
}
}
}()
}()
select {
case err := <-runErr:
innerCtxCancel()
s.log(logger.Info, "ERR: %s", err)
return true
case <-s.ctx.Done():
innerCtxCancel()
<-runErr
return false
case err := <-readDone:
nconn.Close()
return err
case <-innerCtx.Done():
nconn.Close()
<-readDone
return nil
}
}

64
internal/core/rtsp_source.go
Unescape View File

@ -71,7 +71,7 @@ func newRTSPSource( @@ -71,7 +71,7 @@ func newRTSPSource(
ctxCancel: ctxCancel,
}
s.log(logger.Info, "started")
s.Log(logger.Info, "started")
s.wg.Add(1)
go s.run()
@ -80,44 +80,49 @@ func newRTSPSource( @@ -80,44 +80,49 @@ func newRTSPSource(
}
func (s *rtspSource) close() {
s.log(logger.Info, "stopped")
s.Log(logger.Info, "stopped")
s.ctxCancel()
}
func (s *rtspSource) log(level logger.Level, format string, args ...interface{}) {
func (s *rtspSource) Log(level logger.Level, format string, args ...interface{}) {
s.parent.log(level, "[rtsp source] "+format, args...)
}
func (s *rtspSource) run() {
defer s.wg.Done()
outer:
for {
ok := func() bool {
ok := s.runInner()
if !ok {
return false
}
select {
case <-time.After(rtspSourceRetryPause):
return true
case <-s.ctx.Done():
return false
}
innerCtx, innerCtxCancel := context.WithCancel(context.Background())
innerErr := make(chan error)
go func() {
innerErr <- s.runInner(innerCtx)
}()
if !ok {
break
select {
case err := <-innerErr:
innerCtxCancel()
s.Log(logger.Info, "ERR: %v", err)
case <-s.ctx.Done():
innerCtxCancel()
<-innerErr
}
select {
case <-time.After(rtspSourceRetryPause):
case <-s.ctx.Done():
break outer
}
}
s.ctxCancel()
}
func (s *rtspSource) runInner() bool {
s.log(logger.Debug, "connecting")
func (s *rtspSource) runInner(innerCtx context.Context) error {
s.Log(logger.Debug, "connecting")
var tlsConfig *tls.Config
if s.fingerprint != "" {
tlsConfig = &tls.Config{
InsecureSkipVerify: true,
@ -145,23 +150,21 @@ func (s *rtspSource) runInner() bool { @@ -145,23 +150,21 @@ func (s *rtspSource) runInner() bool {
ReadBufferCount: s.readBufferCount,
AnyPortEnable: s.anyPortEnable,
OnRequest: func(req *base.Request) {
s.log(logger.Debug, "c->s %v", req)
s.Log(logger.Debug, "c->s %v", req)
},
OnResponse: func(res *base.Response) {
s.log(logger.Debug, "s->c %v", res)
s.Log(logger.Debug, "s->c %v", res)
},
}
u, err := url.Parse(s.ur)
if err != nil {
s.log(logger.Info, "ERR: %s", err)
return true
return err
}
err = c.Start(u.Scheme, u.Host)
if err != nil {
s.log(logger.Info, "ERR: %s", err)
return true
return err
}
defer c.Close()
@ -188,7 +191,7 @@ func (s *rtspSource) runInner() bool { @@ -188,7 +191,7 @@ func (s *rtspSource) runInner() bool {
return res.err
}
s.log(logger.Info, "ready")
s.Log(logger.Info, "ready")
defer func() {
s.parent.onSourceStaticSetNotReady(pathSourceStaticSetNotReadyReq{source: s})
@ -223,13 +226,12 @@ func (s *rtspSource) runInner() bool { @@ -223,13 +226,12 @@ func (s *rtspSource) runInner() bool {
select {
case err := <-readErr:
s.log(logger.Info, "ERR: %s", err)
return true
return err
case <-s.ctx.Done():
case <-innerCtx.Done():
c.Close()
<-readErr
return false
return nil
}
}

Write Preview
Loading…
Cancel
Save