Compare commits

...

5 Commits

Author SHA1 Message Date
langhuihui
dfd9af1efd fix: ps解析异常 tcp 逻辑,avoid repull too fast 2023-09-07 13:11:49 +08:00
langhuihui
9933950f61 feat: gb的 channel增加输出字段,fix summary timeout 2023-09-06 14:18:27 +08:00
langhuihui
055eb6c022 feat: hls add args to subscriber 2023-08-31 13:41:44 +08:00
langhuihui
7d5b0fbb32 fix: rtsp 修复错误的流地址导致的Disconnect时panic 2023-08-31 09:05:13 +08:00
langhuihui
15da702fec fix: memory leak 2023-08-29 09:43:48 +08:00
2 changed files with 28 additions and 6 deletions

13
go.mod
View File

@@ -4,22 +4,22 @@ go 1.20
require (
go.uber.org/zap v1.24.0
m7s.live/engine/v4 v4.13.10
m7s.live/engine/v4 v4.13.11-0.20230907050649-03d22736d5d9
m7s.live/plugin/debug/v4 v4.0.1
m7s.live/plugin/edge/v4 v4.0.6
m7s.live/plugin/fmp4/v4 v4.0.4
m7s.live/plugin/gb28181/v4 v4.4.0
m7s.live/plugin/gb28181/v4 v4.4.1-0.20230906061749-f96767976369
m7s.live/plugin/hdl/v4 v4.1.8
m7s.live/plugin/hls/v4 v4.3.4
m7s.live/plugin/hls/v4 v4.3.5-0.20230831053024-dd556a01641b
m7s.live/plugin/hook/v4 v4.0.2
m7s.live/plugin/jessica/v4 v4.2.1
m7s.live/plugin/logrotate/v4 v4.0.4
m7s.live/plugin/monitor/v4 v4.0.3
m7s.live/plugin/monitor/v4 v4.0.4-0.20230829014148-8645b2dbdba4
m7s.live/plugin/preview/v4 v4.1.2
m7s.live/plugin/record/v4 v4.4.2
m7s.live/plugin/room/v4 v4.0.11
m7s.live/plugin/rtmp/v4 v4.2.6
m7s.live/plugin/rtsp/v4 v4.2.8
m7s.live/plugin/rtsp/v4 v4.2.9-0.20230831004212-4a5ba9b834a3
m7s.live/plugin/snap/v4 v4.0.7
m7s.live/plugin/webrtc/v4 v4.2.1
m7s.live/plugin/webtransport/v4 v4.0.8
@@ -44,6 +44,7 @@ require (
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.2.1 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/google/uuid v1.3.0 // indirect
@@ -102,5 +103,5 @@ require (
golang.org/x/text v0.12.0 // indirect
golang.org/x/tools v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
m7s.live/plugin/ps/v4 v4.1.1 // indirect
m7s.live/plugin/ps/v4 v4.1.2-0.20230907050504-859e7f869639 // indirect
)

21
go.sum
View File

@@ -65,6 +65,7 @@ github.com/gobwas/ws v1.1.0-rc.1/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIb
github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk=
github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -424,6 +425,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
m7s.live/engine/v4 v4.13.10 h1:wcjbmEz7BXilC+NOfOPZJc/g3QFMnl7kSmMP/XMcdh8=
m7s.live/engine/v4 v4.13.10/go.mod h1:Wfs3OMgtRxLIbw1nCjWFgo1kRkypg6L+38QLghMG6Vw=
m7s.live/engine/v4 v4.13.11-0.20230829014128-f89b75ecb159 h1:YUBnyYg3H7Q8d9PZSeB5T8qVoJXTi6Fjlw6AwjFAlMI=
m7s.live/engine/v4 v4.13.11-0.20230829014128-f89b75ecb159/go.mod h1:anE5B1xtiEz6WTtEgvasxsBwEX22ZSuVEfccldDplfI=
m7s.live/engine/v4 v4.13.11-0.20230906053619-934d3cf9d4b9 h1:i4h0kv3u3smzu1br5kAV9sKGRTiySa7KeqE8DpPSOBY=
m7s.live/engine/v4 v4.13.11-0.20230906053619-934d3cf9d4b9/go.mod h1:anE5B1xtiEz6WTtEgvasxsBwEX22ZSuVEfccldDplfI=
m7s.live/engine/v4 v4.13.11-0.20230907050649-03d22736d5d9 h1:ns9MTAjbYBNIJWhgZ1TDihLnPcrxkiCPQblDqJTD0qs=
m7s.live/engine/v4 v4.13.11-0.20230907050649-03d22736d5d9/go.mod h1:anE5B1xtiEz6WTtEgvasxsBwEX22ZSuVEfccldDplfI=
m7s.live/plugin/debug/v4 v4.0.1 h1:sX0UADsiikwSol8qx+8aQzGeaFa8yJFa/cUKpBs5Lzw=
m7s.live/plugin/debug/v4 v4.0.1/go.mod h1:A/C1ViacCOK7EPeeCfiwlUrC2TUtRdEqzrR0Yd9b1KQ=
m7s.live/plugin/edge/v4 v4.0.6 h1:dAxS6cvmWV+pPXCgdu0phoAwH2abjhlKMGfysyxHBNw=
@@ -432,10 +439,16 @@ m7s.live/plugin/fmp4/v4 v4.0.4 h1:DOw7opeMBlei7oyDIzqvkOd5CLKzTv7wT+tyL99dqug=
m7s.live/plugin/fmp4/v4 v4.0.4/go.mod h1:2LD23UrWHEoLOK6CPms1Cw2/h0AQlQm6QDjfxHsRauY=
m7s.live/plugin/gb28181/v4 v4.4.0 h1:wpVn6yxWat2QullzkTGVcEv1aXwRT+x7iyVowARKB0c=
m7s.live/plugin/gb28181/v4 v4.4.0/go.mod h1:6lqP8AwhJOvaoOprdqhX9vbEB4Jg9eD/hT8kXpOJoJQ=
m7s.live/plugin/gb28181/v4 v4.4.1-0.20230906054409-2b72f6c291bf h1:L4Nxs7sjHF+FLFC+Sc5ixXX4gKdjKLCAwlU0LQD58yM=
m7s.live/plugin/gb28181/v4 v4.4.1-0.20230906054409-2b72f6c291bf/go.mod h1:6lqP8AwhJOvaoOprdqhX9vbEB4Jg9eD/hT8kXpOJoJQ=
m7s.live/plugin/gb28181/v4 v4.4.1-0.20230906061749-f96767976369 h1:fdgyiolHKMjqpT6qip6aZdsYYIuSUGq29Z5nmnzFEtA=
m7s.live/plugin/gb28181/v4 v4.4.1-0.20230906061749-f96767976369/go.mod h1:6lqP8AwhJOvaoOprdqhX9vbEB4Jg9eD/hT8kXpOJoJQ=
m7s.live/plugin/hdl/v4 v4.1.8 h1:n7o3bu69UCHjzs8ZXHbB+qWo+AVyIY8T8cAocL9kqag=
m7s.live/plugin/hdl/v4 v4.1.8/go.mod h1:Qyga5ZxL83+1uwT+1JBHhTpgepM4nj7XbWF/mMm2P/o=
m7s.live/plugin/hls/v4 v4.3.4 h1:zhLIbSzqGyWeLCR3XxYJYwz/uLIcSey1p2BbOVzk8wI=
m7s.live/plugin/hls/v4 v4.3.4/go.mod h1:ALhv4u5AEBT/QNmf5bAebUm0Kxfa3T6AI04XcaJBm4c=
m7s.live/plugin/hls/v4 v4.3.5-0.20230831053024-dd556a01641b h1:majmENK01fzGZJi4qDpg7G35bmechkqpshIWSZ1o8IM=
m7s.live/plugin/hls/v4 v4.3.5-0.20230831053024-dd556a01641b/go.mod h1:ALhv4u5AEBT/QNmf5bAebUm0Kxfa3T6AI04XcaJBm4c=
m7s.live/plugin/hook/v4 v4.0.2 h1:fKwsx7gDAzfKfCz0C+knoY4wg/qnlQloM996l3jUWNc=
m7s.live/plugin/hook/v4 v4.0.2/go.mod h1:zoyGSwIIdt4NGFdqrKHLFCwwMk4oAOF+dlvSV6cizGU=
m7s.live/plugin/jessica/v4 v4.2.1 h1:GbQ8V2ElHT7Q/0y1cyXCzw/DvTnqkpP1kCOpVd+0d6Y=
@@ -444,10 +457,16 @@ m7s.live/plugin/logrotate/v4 v4.0.4 h1:y3X+aJ/FSftWMa4yDWF+662xfV5lrEaOZofV8SGQL
m7s.live/plugin/logrotate/v4 v4.0.4/go.mod h1:a8hIV59GjpQDE+Ip790CU7yOHaG4+Iweci0sLvo43FU=
m7s.live/plugin/monitor/v4 v4.0.3 h1:hu0Sh3W8+gcpmZ5LW6Gt/h1Mvl04+k1px5KtddsPPVw=
m7s.live/plugin/monitor/v4 v4.0.3/go.mod h1:wYcjvXM03RK00DGA/R7zfiENNT7jDFQhp0rEBvO1mTw=
m7s.live/plugin/monitor/v4 v4.0.4-0.20230829014148-8645b2dbdba4 h1:mmMpYfEgPndWxytP1vciSOt7vBoHtbiHD8GV9zec5Qw=
m7s.live/plugin/monitor/v4 v4.0.4-0.20230829014148-8645b2dbdba4/go.mod h1:wYcjvXM03RK00DGA/R7zfiENNT7jDFQhp0rEBvO1mTw=
m7s.live/plugin/preview/v4 v4.1.2 h1:ENjeg36xWiPqI2FM0lJzs0t8gyeomEvUFtT5ygu+BrQ=
m7s.live/plugin/preview/v4 v4.1.2/go.mod h1:iYhWqFbTvTNDFplbTOrE5X9M6ED7gCKkKMuM5QmBocg=
m7s.live/plugin/ps/v4 v4.1.1 h1:Chp+HUx/Z1tT8lEFK+Vfib6LhNu14EIeAhbzmYm4wbQ=
m7s.live/plugin/ps/v4 v4.1.1/go.mod h1:v59bPt1T+IxuRLRchQ+PwKkLxTRuEY4tbo13lNX6JPc=
m7s.live/plugin/ps/v4 v4.1.2-0.20230906053424-43be8038f01c h1:1t3Ds932zBOQ+uc5NwRcRLOC8omZ1tkN6FPGYrNVNog=
m7s.live/plugin/ps/v4 v4.1.2-0.20230906053424-43be8038f01c/go.mod h1:v59bPt1T+IxuRLRchQ+PwKkLxTRuEY4tbo13lNX6JPc=
m7s.live/plugin/ps/v4 v4.1.2-0.20230907050504-859e7f869639 h1:hFtTeB3m2hPVP6JJYXxeFqwmgtLr1KqGmhQ45C9cv0k=
m7s.live/plugin/ps/v4 v4.1.2-0.20230907050504-859e7f869639/go.mod h1:v59bPt1T+IxuRLRchQ+PwKkLxTRuEY4tbo13lNX6JPc=
m7s.live/plugin/record/v4 v4.4.2 h1:El5ZzRty+sDr9Mzv+AVzjJiDyCrwk3lNW3PTbKZMi74=
m7s.live/plugin/record/v4 v4.4.2/go.mod h1:vHVl6pLXJImoEeokZyE+1dI+JRXjT9YHmmVwSqkpGM0=
m7s.live/plugin/room/v4 v4.0.11 h1:a4XOzHmsTrvi3N809IMaFGpimiJUMz8D9+BRnBk44Oc=
@@ -456,6 +475,8 @@ m7s.live/plugin/rtmp/v4 v4.2.6 h1:PALpu9P/XYVNz1UQDRCf6t34gkx6DfBMnTWL1syD4X0=
m7s.live/plugin/rtmp/v4 v4.2.6/go.mod h1:+RzS8WC4AhPEb+CD9T4H+5CoApQCw2X3tNjEaqBVnwk=
m7s.live/plugin/rtsp/v4 v4.2.8 h1:3p2gTc4hm08e3/BwhbjKmAcHaXJwdwMqBxQ5l6BzKiQ=
m7s.live/plugin/rtsp/v4 v4.2.8/go.mod h1:+j6sTB5FguIiGe/eNvduQUjoQa8KeYkwpLTxk3b5KmY=
m7s.live/plugin/rtsp/v4 v4.2.9-0.20230831004212-4a5ba9b834a3 h1:yZBzOvZjYTZPjmflfu8aVZMafToKzE4N+zCqsocZkAg=
m7s.live/plugin/rtsp/v4 v4.2.9-0.20230831004212-4a5ba9b834a3/go.mod h1:+j6sTB5FguIiGe/eNvduQUjoQa8KeYkwpLTxk3b5KmY=
m7s.live/plugin/snap/v4 v4.0.7 h1:9otl/K5Iq+wlnrcTEIOnBXGarNXd+Fl4r+684Uz+V+k=
m7s.live/plugin/snap/v4 v4.0.7/go.mod h1:XHggonZ0lIKEX/OP2rXjV2mPpG4urmvMT3foIaFRsus=
m7s.live/plugin/webrtc/v4 v4.2.1 h1:7NPeQpGBbZFUUSbrrwPSzUslgKVHcZXXsv34efQza+Q=