Skip to content

Commit

Permalink
1.修复delayclosetimeout值被覆盖的bug
Browse files Browse the repository at this point in the history
2.重构流中订阅者集合,减少订阅者对轨道的无效等待
3.实现内部订阅者功能,使得HLS插件不再影响最后一个订阅者离开逻辑
4.破坏性修改:pull配置中pullonstart类型改为map,pullonsubscribe修改为pullonsub,类型改为map
5.rtmp插件增加对远端流rtmps协议的支持,优化握手过程
6.修复gb28181插件对时间戳的处理bug(引起跳秒等问题)
7.hdl插件对重连机制进行优化,对于服务器返回非200的连接不再重连
  • Loading branch information
langhuihui committed Dec 31, 2022
1 parent 34394b9 commit 27784f0
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
18 changes: 9 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ module monibuca
go 1.18

require (
m7s.live/engine/v4 v4.9.4
m7s.live/engine/v4 v4.9.5
m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2
m7s.live/plugin/edge/v4 v4.0.2
m7s.live/plugin/edge/v4 v4.0.3
m7s.live/plugin/fmp4/v4 v4.0.0-20221126151227-22a117d1b75e
m7s.live/plugin/gb28181/v4 v4.1.6
m7s.live/plugin/hdl/v4 v4.0.5
m7s.live/plugin/hls/v4 v4.0.7
m7s.live/plugin/gb28181/v4 v4.1.7
m7s.live/plugin/hdl/v4 v4.0.6
m7s.live/plugin/hls/v4 v4.0.8
m7s.live/plugin/hook/v4 v4.0.1
m7s.live/plugin/jessica/v4 v4.0.1
m7s.live/plugin/jessica/v4 v4.0.2
m7s.live/plugin/logrotate/v4 v4.0.3
m7s.live/plugin/preview/v4 v4.0.1
m7s.live/plugin/record/v4 v4.0.10
m7s.live/plugin/room/v4 v4.0.2
m7s.live/plugin/rtmp/v4 v4.0.5
m7s.live/plugin/rtsp/v4 v4.0.6
m7s.live/plugin/rtmp/v4 v4.0.6
m7s.live/plugin/rtsp/v4 v4.0.7
m7s.live/plugin/snap/v4 v4.0.0
m7s.live/plugin/webrtc/v4 v4.0.4
m7s.live/plugin/webtransport/v4 v4.0.1
Expand Down Expand Up @@ -80,7 +80,7 @@ require (
github.com/zhangpeihao/goamf v0.0.0-20140409082417-3ff2c19514a8 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.23.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.3.0 // indirect
golang.org/x/exp v0.0.0-20221126150942-6ab00d035af9 // indirect
golang.org/x/mod v0.7.0 // indirect
Expand Down
36 changes: 18 additions & 18 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
Expand Down Expand Up @@ -346,24 +346,24 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
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.9.4 h1:jHjuaxd4Dqk62KF8dNjASF0sLy8aaLojVzInwQurhBg=
m7s.live/engine/v4 v4.9.4/go.mod h1:OgI9lOQ1bE64s9rApdGGop1MBAJIpc/V2MJ190d9ig4=
m7s.live/engine/v4 v4.9.5 h1:xTZYokxH/kNOqrGzQlkOQIsElbkb8VsfwlktjjOXZ08=
m7s.live/engine/v4 v4.9.5/go.mod h1:OgI9lOQ1bE64s9rApdGGop1MBAJIpc/V2MJ190d9ig4=
m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2 h1:0QWJvozTHy7m+G/lOIGiejQ9okFIDjwzVsgXe6ZaJg8=
m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2/go.mod h1:A/C1ViacCOK7EPeeCfiwlUrC2TUtRdEqzrR0Yd9b1KQ=
m7s.live/plugin/edge/v4 v4.0.2 h1:p1wSOS8qM1JY4Usu1XDR/ghgwDMmR/+3eN9WlPY5BkY=
m7s.live/plugin/edge/v4 v4.0.2/go.mod h1:Dhpzmf2dVWWwzb73zdSaKMC4sSOGqWGBkmeUwd2XVuo=
m7s.live/plugin/edge/v4 v4.0.3 h1:uPGuDLp2UG2mac68KM7/Olwp/QK8qCla+WxEuhK/o3c=
m7s.live/plugin/edge/v4 v4.0.3/go.mod h1:AWeJV1Nu2UWsEdlcCATlQW+bz6Pz/3A11AZG9Z4hIc0=
m7s.live/plugin/fmp4/v4 v4.0.0-20221126151227-22a117d1b75e h1:/APKrFkujtI17MBwrc/EvsjkeDuO79Uc0kHdZUF+3tg=
m7s.live/plugin/fmp4/v4 v4.0.0-20221126151227-22a117d1b75e/go.mod h1:9/DlkfpXuBtZziwARFHZogLRnT+vjXPbO5eTrbGkY+8=
m7s.live/plugin/gb28181/v4 v4.1.6 h1:bNiyIIgc5x5U/BuY2If/sMdoaHUFVR7evUDkeEhXWHU=
m7s.live/plugin/gb28181/v4 v4.1.6/go.mod h1:B5RDyhiuKYyQG1KCiMUGE0cP3uTbWdEgpEf8jBEuXgo=
m7s.live/plugin/hdl/v4 v4.0.5 h1:WQLQ1KKgygSgQ627S1B/KOmYFz3MJYSeTuTNQ1qYOIw=
m7s.live/plugin/hdl/v4 v4.0.5/go.mod h1:jwk3aGCp0OE3bQ5b3n1XjJ8DGG13iHJu4dntvjmsRa8=
m7s.live/plugin/hls/v4 v4.0.7 h1:STTITcNqdggzxxRu9AzKo/djNdz1i1Xbf8R+qlY5WEQ=
m7s.live/plugin/hls/v4 v4.0.7/go.mod h1:Dr37gKItRuBqDZRI+jtMTVomdOE7tUgQGEbPiYoi8r0=
m7s.live/plugin/gb28181/v4 v4.1.7 h1:ddhkB+teMAt6z3DV0L4Oag4NW36MDHN6oMeVUuqq90o=
m7s.live/plugin/gb28181/v4 v4.1.7/go.mod h1:B5RDyhiuKYyQG1KCiMUGE0cP3uTbWdEgpEf8jBEuXgo=
m7s.live/plugin/hdl/v4 v4.0.6 h1:MT2b48ZuM4X4jl0QH0WTyrmY6RW/YmpTLJBf43BSiCQ=
m7s.live/plugin/hdl/v4 v4.0.6/go.mod h1:jwk3aGCp0OE3bQ5b3n1XjJ8DGG13iHJu4dntvjmsRa8=
m7s.live/plugin/hls/v4 v4.0.8 h1:bqXbZbuSPVIES4q2IIPnsB7ChJrLjY0Z23ScQX5H29E=
m7s.live/plugin/hls/v4 v4.0.8/go.mod h1:Dr37gKItRuBqDZRI+jtMTVomdOE7tUgQGEbPiYoi8r0=
m7s.live/plugin/hook/v4 v4.0.1 h1:On3GigXkL14pQacu+lF307jJXDtCEpcmvY79a/DfW7A=
m7s.live/plugin/hook/v4 v4.0.1/go.mod h1:uaTVDsOTiaJ8gUal4YnL5rcpUUhbExn2G8VzEvNGLE0=
m7s.live/plugin/jessica/v4 v4.0.1 h1:RYYInpVwVR87UkUeVYU/MwA85ZsCsFJnppumR1sFT7k=
m7s.live/plugin/jessica/v4 v4.0.1/go.mod h1:26HcgIZKSjlbrq7RncdxHrt30qAeRAuoiZ6cGW6+254=
m7s.live/plugin/jessica/v4 v4.0.2 h1:5rc1+PVZhZg3U2cfTyg9SIJG/iwvgcEwnhQd02vQRbo=
m7s.live/plugin/jessica/v4 v4.0.2/go.mod h1:26HcgIZKSjlbrq7RncdxHrt30qAeRAuoiZ6cGW6+254=
m7s.live/plugin/logrotate/v4 v4.0.3 h1:f+teASc5Y5vDOrxXFc/ri3t7jdi6GIb6V9UMjhacb7I=
m7s.live/plugin/logrotate/v4 v4.0.3/go.mod h1:a8hIV59GjpQDE+Ip790CU7yOHaG4+Iweci0sLvo43FU=
m7s.live/plugin/preview/v4 v4.0.1 h1:k8iA5/bMiEWSFcy4zaZ8wG93AtJcSwxtgcQG+Y0xX5E=
Expand All @@ -372,10 +372,10 @@ m7s.live/plugin/record/v4 v4.0.10 h1:txQwT/nY1eMXhEKzikpHjl8tgIpSWm/V3fkCDqcqvWk
m7s.live/plugin/record/v4 v4.0.10/go.mod h1:8fXbmsS+QCQhp136FdqBVEQsbNccWFAYTQDRJW/muQU=
m7s.live/plugin/room/v4 v4.0.2 h1:aw9hy5yuh1nlndI+PgqaobEgraV8NHTNDKce+6Ekgzw=
m7s.live/plugin/room/v4 v4.0.2/go.mod h1:Wr0HHEuAoqQdq+zH6F/Av8prz6Vb7ilYzPjUXoeLCXU=
m7s.live/plugin/rtmp/v4 v4.0.5 h1:V/p3SrpV5y2xQPLYhJwodQyi0IQ3IFtq9mUVoPbNtBw=
m7s.live/plugin/rtmp/v4 v4.0.5/go.mod h1:YMVw6oM+n1ABTQC+1aiBG99zFHg6Rs/Hnqk27VcCs00=
m7s.live/plugin/rtsp/v4 v4.0.6 h1:rA62+CYoKsRGHdqHX5bQor4DqTONvhOc/EzTZjwimZ8=
m7s.live/plugin/rtsp/v4 v4.0.6/go.mod h1:/gPh0HWCbM3fsDf3Ex0Jf3/4PFEkBMxzaPvZFKcTeBk=
m7s.live/plugin/rtmp/v4 v4.0.6 h1:k5419zCad3T63maCQS7NO5LtF/Oa7ge/iVshK2Jid9U=
m7s.live/plugin/rtmp/v4 v4.0.6/go.mod h1:03iNi9vPhDThf2CQL4TY18H6L8410kDSHS6N8qPMr5U=
m7s.live/plugin/rtsp/v4 v4.0.7 h1:ScpTWpxmHjG9glbEzXnxdL2lpLLqfgHFbzZxw1derEE=
m7s.live/plugin/rtsp/v4 v4.0.7/go.mod h1:j5Ym+ZaTK+jSwKdvCD5ZwgjYDYCgByv5a6Q6W/pF490=
m7s.live/plugin/snap/v4 v4.0.0 h1:qCm3to4bfNzfu2+/ke5pqU1NoheJBFEY6BsifQivH9w=
m7s.live/plugin/snap/v4 v4.0.0/go.mod h1:XHggonZ0lIKEX/OP2rXjV2mPpG4urmvMT3foIaFRsus=
m7s.live/plugin/webrtc/v4 v4.0.4 h1:PBHthk7lDHSXQNbobh42GD3ipvFyocCcPJR5qnb3gXU=
Expand Down

0 comments on commit 27784f0

Please sign in to comment.