Skip to content

Commit 438a8dd

Browse files
committed
fix: rtmp play write timeout
1 parent 4e68cfc commit 438a8dd

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

example/custom/main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
_ "m7s.live/v5/plugin/flv"
1414
_ "m7s.live/v5/plugin/gb28181"
1515
_ "m7s.live/v5/plugin/logrotate"
16-
_ "m7s.live/v5/plugin/monitor"
1716
_ "m7s.live/v5/plugin/mp4"
1817
mp4 "m7s.live/v5/plugin/mp4/pkg"
1918
_ "m7s.live/v5/plugin/preview"

example/multiple/main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
_ "m7s.live/v5/plugin/debug"
1010
_ "m7s.live/v5/plugin/flv"
1111
_ "m7s.live/v5/plugin/logrotate"
12-
_ "m7s.live/v5/plugin/monitor"
1312
_ "m7s.live/v5/plugin/rtmp"
1413
_ "m7s.live/v5/plugin/rtsp"
1514
_ "m7s.live/v5/plugin/test"

plugin/rtmp/pkg/net-connection.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,11 +449,11 @@ func (nc *NetConnection) SendMessage(t byte, msg RtmpMessage) (err error) {
449449
if sid, ok := msg.(HaveStreamID); ok {
450450
head.MessageStreamID = sid.GetStreamID()
451451
}
452-
nc.SetWriteDeadline(time.Now().Add(time.Second * 5)) // 设置写入超时时间为5秒
453452
return nc.sendChunk(util.NewMemory(nc.tmpBuf), head, RTMP_CHUNK_HEAD_12)
454453
}
455454

456455
func (nc *NetConnection) sendChunk(mem util.Memory, head *ChunkHeader, headType byte) (err error) {
456+
nc.SetWriteDeadline(time.Now().Add(time.Second * 5)) // 设置写入超时时间为5秒
457457
head.WriteTo(headType, &nc.chunkHeaderBuf)
458458
defer func(reuse net.Buffers) {
459459
nc.sendBuffers = reuse

0 commit comments

Comments
 (0)