From 84f9a02e0a133320207106871062a1fb297bf589 Mon Sep 17 00:00:00 2001 From: langhuihui <178529795@qq.com> Date: Mon, 23 Oct 2023 10:09:15 +0800 Subject: [PATCH] fix: hls pull ts no content-length --- go.mod | 22 +++++++++++----------- go.sum | 29 +++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index b9f68c45..67a8de37 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,12 @@ go 1.20 require ( go.uber.org/zap v1.26.0 - m7s.live/engine/v4 v4.13.13-0.20231017121048-afabc2777bc7 + m7s.live/engine/v4 v4.13.13-0.20231019073258-6e1ee72efeae m7s.live/plugin/debug/v4 v4.0.1 m7s.live/plugin/fmp4/v4 v4.0.5 m7s.live/plugin/gb28181/v4 v4.4.3-0.20230929013915-8f6ac6a40c5e m7s.live/plugin/hdl/v4 v4.1.8 - m7s.live/plugin/hls/v4 v4.3.6-0.20231018055810-3c3aef48eb5b + m7s.live/plugin/hls/v4 v4.3.6-0.20231023020514-307a1eeffdf1 m7s.live/plugin/hook/v4 v4.0.2 m7s.live/plugin/jessica/v4 v4.2.1 m7s.live/plugin/logrotate/v4 v4.0.4 @@ -18,7 +18,7 @@ require ( m7s.live/plugin/record/v4 v4.4.4-0.20231008052525-3be25dc538bd m7s.live/plugin/room/v4 v4.0.11 m7s.live/plugin/rtmp/v4 v4.2.7-0.20230928005448-7c3a01385364 - m7s.live/plugin/rtsp/v4 v4.2.11-0.20231011090109-c4700713a8dd + m7s.live/plugin/rtsp/v4 v4.2.11-0.20231020093420-269e7f2cfd41 m7s.live/plugin/snap/v4 v4.0.7 m7s.live/plugin/webrtc/v4 v4.2.2-0.20231003031026-6be7303e501d m7s.live/plugin/webtransport/v4 v4.0.9-0.20231008032223-49d89259a564 @@ -26,13 +26,13 @@ require ( require ( github.com/Eyevinn/mp4ff v0.38.0 // indirect - github.com/abema/go-mp4 v0.13.0 // indirect + github.com/abema/go-mp4 v1.1.1 // indirect github.com/aler9/writerseeker v1.1.0 // indirect github.com/asticode/go-astikit v0.30.0 // indirect github.com/asticode/go-astits v1.13.0 // indirect github.com/bluenviron/gohlslib v1.0.0 // indirect - github.com/bluenviron/gortsplib/v3 v3.10.0 // indirect - github.com/bluenviron/mediacommon v1.3.0 // indirect + github.com/bluenviron/gortsplib/v4 v4.2.1 // indirect + github.com/bluenviron/mediacommon v1.5.0 // indirect github.com/cnotch/ipchub v1.1.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/denisbrodbeck/machineid v1.0.1 // indirect @@ -64,7 +64,7 @@ require ( github.com/pion/mdns v0.0.9 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtcp v1.2.10 // indirect - github.com/pion/rtp v1.8.1 // indirect + github.com/pion/rtp v1.8.2 // indirect github.com/pion/sctp v1.8.9 // indirect github.com/pion/sdp/v3 v3.0.6 // indirect github.com/pion/srtp/v2 v2.0.17 // indirect @@ -91,13 +91,13 @@ require ( github.com/yapingcat/gomedia v0.0.0-20230905155010-55b9713fcec1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.13.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.15.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/term v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.13.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 1d72c986..58f667f5 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,8 @@ github.com/Eyevinn/mp4ff v0.38.0 h1:9DrGxg0qDTsjJuj7MoE0a8IWZP8AnwfRd98csXgrWhs= github.com/Eyevinn/mp4ff v0.38.0/go.mod h1:w/6GSa5ghZ1VavzJK6McQ2/flx8mKtcrKDr11SsEweA= github.com/abema/go-mp4 v0.13.0 h1:gjEZLt7g0ePpYA5sUDrI2r8X+WuI8o+USkgG5wMgmkI= github.com/abema/go-mp4 v0.13.0/go.mod h1:vPl9t5ZK7K0x68jh12/+ECWBCXoWuIDtNgPtU2f04ws= +github.com/abema/go-mp4 v1.1.1 h1:OfzkdMO6SWTBR1ltNSVwlTHatrAK9I3iYLQfkdEMMuc= +github.com/abema/go-mp4 v1.1.1/go.mod h1:vPl9t5ZK7K0x68jh12/+ECWBCXoWuIDtNgPtU2f04ws= github.com/aler9/writerseeker v1.1.0 h1:t+Sm3tjp8scNlqyoa8obpeqwciMNOvdvsxjxEb3Sx3g= github.com/aler9/writerseeker v1.1.0/go.mod h1:QNCcjSKnLsYoTfMmXkEEfgbz6nNXWxKSaBY+hGJGWDA= github.com/asticode/go-astikit v0.30.0 h1:DkBkRQRIxYcknlaU7W7ksNfn4gMFsB0tqMJflxkRsZA= @@ -13,8 +15,12 @@ github.com/bluenviron/gohlslib v1.0.0 h1:UOI7wW7EdXPnnoflPL+WRiUB+bDSyrR9AXtu029 github.com/bluenviron/gohlslib v1.0.0/go.mod h1:fwqXogd2G/CJ/0kD6TTALmWI3KAm66nZoI+06O02YKI= github.com/bluenviron/gortsplib/v3 v3.10.0 h1:E2ytPD1/b6JgzHYVSsyaG2xtXsvaGw9sxTdZ0Wnwsd4= github.com/bluenviron/gortsplib/v3 v3.10.0/go.mod h1:prNU1aMVBmgmmKwlvLiEdjBbTEpTw4BRsqVcqEARgMY= +github.com/bluenviron/gortsplib/v4 v4.2.1 h1:LugQr3TIKoj6GjOf470teDP8goWiL8PTrX2OaF+L2Vc= +github.com/bluenviron/gortsplib/v4 v4.2.1/go.mod h1:VOoeI2VxRKh5eEg6Y48DGb/oLxU1i+X0Xzv9z8dvsUQ= github.com/bluenviron/mediacommon v1.3.0 h1:2ttKdlvEXJSzHTd1+7x4TmJDTqEhLAAPP9QfdnYWo8U= github.com/bluenviron/mediacommon v1.3.0/go.mod h1:/vlOVSebDwzdRtQONOKLua0fOSJg1tUDHpP+h9a0uqM= +github.com/bluenviron/mediacommon v1.5.0 h1:lS0YKNo22ZOyCsYcLh3jn3TgUALqYw0f7RVwalC09vI= +github.com/bluenviron/mediacommon v1.5.0/go.mod h1:Ij/kE1LEucSjryNBVTyPL/gBI0d6/Css3f5PyrM957w= github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/cnotch/apirouter v0.0.0-20200731232942-89e243a791f3/go.mod h1:5deJPLON/x/s2dLOQfuKS0lenhOIT4xX0pvtN/OEIuY= @@ -170,6 +176,8 @@ github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/rtp v1.8.1 h1:26OxTc6lKg/qLSGir5agLyj0QKaOv8OP5wps2SFnVNQ= github.com/pion/rtp v1.8.1/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= +github.com/pion/rtp v1.8.2 h1:oKMM0K1/QYQ5b5qH+ikqDSZRipP5mIxPJcgcvw5sH0w= +github.com/pion/rtp v1.8.2/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= github.com/pion/sctp v1.8.8/go.mod h1:igF9nZBrjh5AtmKc7U30jXltsFHicFCXSmWA2GWRaWs= github.com/pion/sctp v1.8.9 h1:TP5ZVxV5J7rz7uZmbyvnUvsn7EJ2x/5q9uhsTtXbI3g= @@ -274,6 +282,8 @@ golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIi golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -301,6 +311,8 @@ golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -346,6 +358,8 @@ golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -358,6 +372,7 @@ golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -412,8 +427,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/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.13.13-0.20231017121048-afabc2777bc7 h1:Z9pEet27EutJajh/CdYSQIDoQLXTqHpUdb1VctmcgXE= -m7s.live/engine/v4 v4.13.13-0.20231017121048-afabc2777bc7/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4= +m7s.live/engine/v4 v4.13.13-0.20231019073258-6e1ee72efeae h1:ZJRB2Z050O2sqx1269agAGL1SEZ/pKodU5EPFo1Ht7A= +m7s.live/engine/v4 v4.13.13-0.20231019073258-6e1ee72efeae/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4= 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/fmp4/v4 v4.0.5 h1:0madI/TKvrLkYVAKuPK1HBvbVf0RJg0g2WruET3S+9c= @@ -422,10 +437,12 @@ m7s.live/plugin/gb28181/v4 v4.4.3-0.20230929013915-8f6ac6a40c5e h1:xsAti2sUWWXDw m7s.live/plugin/gb28181/v4 v4.4.3-0.20230929013915-8f6ac6a40c5e/go.mod h1:mK5embLQwDULFJjA7jBls1Cwvow98lTWS6n/uZ7Ampk= 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.5 h1:mnJBd57OTeaOeihN3nKhSN2FA3EsvaItqayXjagJnY0= -m7s.live/plugin/hls/v4 v4.3.5/go.mod h1:ALhv4u5AEBT/QNmf5bAebUm0Kxfa3T6AI04XcaJBm4c= m7s.live/plugin/hls/v4 v4.3.6-0.20231018055810-3c3aef48eb5b h1:FKib5B73WmjO9X2PsLRK4YFWlpbOgQ8X0VDuzlFuaAA= m7s.live/plugin/hls/v4 v4.3.6-0.20231018055810-3c3aef48eb5b/go.mod h1:ol/+hCmdqip2Ns1zIDXHWoDD7xk5Dp76AhqlIwrbRSc= +m7s.live/plugin/hls/v4 v4.3.6-0.20231023013038-80af94459271 h1:lX6LhOmhgM1Kg3dxNc2//qYFqcbBd6J0JMSrTk25kIM= +m7s.live/plugin/hls/v4 v4.3.6-0.20231023013038-80af94459271/go.mod h1:ol/+hCmdqip2Ns1zIDXHWoDD7xk5Dp76AhqlIwrbRSc= +m7s.live/plugin/hls/v4 v4.3.6-0.20231023020514-307a1eeffdf1 h1:2XPDYkB6cmu9O+lavsldeQPgB10P6l+6Kb/9WItvYns= +m7s.live/plugin/hls/v4 v4.3.6-0.20231023020514-307a1eeffdf1/go.mod h1:ol/+hCmdqip2Ns1zIDXHWoDD7xk5Dp76AhqlIwrbRSc= 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= @@ -446,6 +463,10 @@ m7s.live/plugin/rtmp/v4 v4.2.7-0.20230928005448-7c3a01385364 h1:eI+Ce9dLBFkK+MQq m7s.live/plugin/rtmp/v4 v4.2.7-0.20230928005448-7c3a01385364/go.mod h1:UqI1l1+3Y2zg2oOUkfVJ719hcv10bMYVAlg5e+gqy2E= m7s.live/plugin/rtsp/v4 v4.2.11-0.20231011090109-c4700713a8dd h1:jFOIP/AaB0kU7Yc4ICXqs9G6DghplidHfdxUfdVj724= m7s.live/plugin/rtsp/v4 v4.2.11-0.20231011090109-c4700713a8dd/go.mod h1:JADpLK19CayyyDA4O2nPIKC+ZIV7YBnd8b3MN5lnoUc= +m7s.live/plugin/rtsp/v4 v4.2.11-0.20231020022129-5ce210d6622d h1:fE5ezNx8yAx9rQl9nFUXYT0rBW6KgN8ARFEoRr/BSto= +m7s.live/plugin/rtsp/v4 v4.2.11-0.20231020022129-5ce210d6622d/go.mod h1:P4cRC2F3f84Vh7Vjjkjv7GZtzKuEVmeNW1NN406K9vY= +m7s.live/plugin/rtsp/v4 v4.2.11-0.20231020093420-269e7f2cfd41 h1:v6zCNuzmMQWCBx2vfnVsxZI1QyI+yMxPnFpjggZFhp4= +m7s.live/plugin/rtsp/v4 v4.2.11-0.20231020093420-269e7f2cfd41/go.mod h1:P4cRC2F3f84Vh7Vjjkjv7GZtzKuEVmeNW1NN406K9vY= 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.2-0.20231003031026-6be7303e501d h1:/05XekAFbbO+v/KhnN1m+qTzm1YsOtWT9aUWQpm37Q0=