zishuo/rtsp-simple-server
1
0
Fork 0
mirror of https://github.com/aler9/rtsp-simple-server synced 2025-10-05 07:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove rtmp.Conn.NetConn()

Browse Source
This commit is contained in:
aler9
2021-12-22 17:33:37 +01:00
parent 779d5b61cd
commit 1dff3239d2
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/core/rtmp_source.go
View File

@@ -115,16 +115,16 @@ func (s *rtmpSource) runInner() bool {
readDone := make(chan error)
go func() {
readDone <- func() error {
conn.NetConn().SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
conn.NetConn().SetWriteDeadline(time.Now().Add(time.Duration(s.writeTimeout)))
conn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
conn.SetWriteDeadline(time.Now().Add(time.Duration(s.writeTimeout)))
err = conn.ClientHandshake()
if err != nil {
return err
}
conn.NetConn().SetWriteDeadline(time.Time{})
conn.SetWriteDeadline(time.Time{})
conn.NetConn().SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
conn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
videoTrack, audioTrack, err := conn.ReadMetadata()
if err != nil {
return err
@@ -172,7 +172,7 @@ func (s *rtmpSource) runInner() bool {
}
for {
conn.NetConn().SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
conn.SetReadDeadline(time.Now().Add(time.Duration(s.readTimeout)))
pkt, err := conn.ReadPacket()
if err != nil {
return err
@@ -248,11 +248,11 @@ func (s *rtmpSource) runInner() bool {
select {
case err := <-readDone:
conn.NetConn().Close()
conn.Close()
return err
case <-innerCtx.Done():
conn.NetConn().Close()
conn.Close()
<-readDone
return nil
}