Compare commits

...

4 Commits

Author SHA1 Message Date
langhuihui
9cbbee3f54 fix: record hls ts duration wrong 2023-11-07 11:11:11 +08:00
langhuihui
3bdc5074e0 fix: rtsp relay 2023-11-03 14:12:56 +08:00
langhuihui
35a10e1c39 fix: rtsp repull bug 2023-11-03 09:45:51 +08:00
langhuihui
722f7d1a5e feat: 兼容不规范的 rtp 包和 sdp 2023-10-27 18:04:11 +08:00
3 changed files with 23 additions and 14 deletions

View File

@@ -82,7 +82,7 @@ Inspired by:
- [mp4ff](https://github.com/edgeware/mp4ff) mp4 file format library [@edgeware](https://github.com/edgeware)
- [gosip](https://github.com/ghettovoice/gosip) go sip library [@ghettovoice](https://github.com/ghettovoice)
- [webrtc](https://github.com/pion/webrtc) go library and whole [@pion](https://github.com/pion) team
- [gortsplib](https://github.com/aler9/gortsplib) rtsp library [@aler9](https://github.com/aler9)
- [gortsplib](https://github.com/bluenviron/gortsplib) rtsp library [@aler9](https://github.com/aler9)
## Remote console

12
go.mod
View File

@@ -4,21 +4,21 @@ go 1.20
require (
go.uber.org/zap v1.26.0
m7s.live/engine/v4 v4.14.0
m7s.live/engine/v4 v4.14.2-0.20231103061048-25e15d049267
m7s.live/plugin/debug/v4 v4.0.1
m7s.live/plugin/fmp4/v4 v4.0.5
m7s.live/plugin/gb28181/v4 v4.4.3
m7s.live/plugin/hdl/v4 v4.1.9
m7s.live/plugin/hls/v4 v4.3.6
m7s.live/plugin/hls/v4 v4.3.7-0.20231103015059-5130b70672ff
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.4
m7s.live/plugin/preview/v4 v4.1.2
m7s.live/plugin/record/v4 v4.4.4
m7s.live/plugin/record/v4 v4.4.5-0.20231107020615-7fff7454b246
m7s.live/plugin/room/v4 v4.0.11
m7s.live/plugin/rtmp/v4 v4.2.7
m7s.live/plugin/rtsp/v4 v4.3.0
m7s.live/plugin/rtsp/v4 v4.3.2-0.20231103061205-855038c1322e
m7s.live/plugin/snap/v4 v4.0.7
m7s.live/plugin/webrtc/v4 v4.2.2
m7s.live/plugin/webtransport/v4 v4.0.9
@@ -31,7 +31,7 @@ require (
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/v4 v4.2.1 // indirect
github.com/bluenviron/gortsplib/v4 v4.3.0 // 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
@@ -46,7 +46,7 @@ require (
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/husanpao/ip v0.0.0-20220711082147-73160bb611a8 // indirect
github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect

23
go.sum
View File

@@ -11,8 +11,8 @@ github.com/asticode/go-astits v1.13.0 h1:XOgkaadfZODnyZRR5Y0/DWkA9vrkLLPLeeOvDwf
github.com/asticode/go-astits v1.13.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
github.com/bluenviron/gohlslib v1.0.0 h1:UOI7wW7EdXPnnoflPL+WRiUB+bDSyrR9AXtu029n5EY=
github.com/bluenviron/gohlslib v1.0.0/go.mod h1:fwqXogd2G/CJ/0kD6TTALmWI3KAm66nZoI+06O02YKI=
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/gortsplib/v4 v4.3.0 h1:wYtXickYP9zkCxbBIt2WEseQPX0wROB+K0DAew4Ls7g=
github.com/bluenviron/gortsplib/v4 v4.3.0/go.mod h1:4XBcXsbK4MDFqnraexSDeKj++ZzrSd81CVplSpSNqKk=
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=
@@ -85,8 +85,9 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8 h1:gpptm606MZYGaMHMsB4Srmb6EbW/IVHnt04rcMXnkBQ=
github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/husanpao/ip v0.0.0-20220711082147-73160bb611a8 h1:4Jk58quTZmzJcTrLlbB5L1Q6qXu49EIjCReWxcBFWKo=
@@ -417,8 +418,10 @@ 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.14.0 h1:bvsRe2Ho8M95X9SZ/Sw+pzHJRWmt+f7F7S8LwfS8tHU=
m7s.live/engine/v4 v4.14.0/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
m7s.live/engine/v4 v4.14.1 h1:T9GxP6cWEGgjJTBqBK9rowuRBVysl08YlnNez/KMGOk=
m7s.live/engine/v4 v4.14.1/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
m7s.live/engine/v4 v4.14.2-0.20231103061048-25e15d049267 h1:mO+uKVTkLVLt6yC4h06D/xospR5GX+6LYtx468Lwh6c=
m7s.live/engine/v4 v4.14.2-0.20231103061048-25e15d049267/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=
@@ -429,6 +432,8 @@ m7s.live/plugin/hdl/v4 v4.1.9 h1:exhX4sEjvlkUknz1/np9kldjMkGgRFwBxs567XLPo24=
m7s.live/plugin/hdl/v4 v4.1.9/go.mod h1:SzMML8acGj8QD5AwihVTnTuCAdKCOpdf+q/CYl/3/Hc=
m7s.live/plugin/hls/v4 v4.3.6 h1:yEfwpv8WZLMqnrnsO8gu6IuKAMP1oblTcuA5CMzKbE8=
m7s.live/plugin/hls/v4 v4.3.6/go.mod h1:ol/+hCmdqip2Ns1zIDXHWoDD7xk5Dp76AhqlIwrbRSc=
m7s.live/plugin/hls/v4 v4.3.7-0.20231103015059-5130b70672ff h1:Br01FfIhZMcPCxj3RbCDFkkHXluwlthmquGug1sASzE=
m7s.live/plugin/hls/v4 v4.3.7-0.20231103015059-5130b70672ff/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=
@@ -443,12 +448,16 @@ m7s.live/plugin/ps/v4 v4.1.3 h1:Lbvu3ZlX/s3w9lcOwF0SCOCvxtxongPexCIn6x4yukw=
m7s.live/plugin/ps/v4 v4.1.3/go.mod h1:RAb507iNmPG43I5kUA6ewF1fTRHDRsKbIVkIdLdKeeI=
m7s.live/plugin/record/v4 v4.4.4 h1:zP+fgDPmLlm+9eEnKNVfvKB3gjuB0M1P1sE4Gzgjo5M=
m7s.live/plugin/record/v4 v4.4.4/go.mod h1:lwVE6xn4sGQBLOWgshw3L1fa5zyEM7NlmQ8otTQGXUY=
m7s.live/plugin/record/v4 v4.4.5-0.20231107020615-7fff7454b246 h1:+wzGtlx6j4hzgPPZf75icxAuyPDXpXFCn2PDZivlZ7I=
m7s.live/plugin/record/v4 v4.4.5-0.20231107020615-7fff7454b246/go.mod h1:lwVE6xn4sGQBLOWgshw3L1fa5zyEM7NlmQ8otTQGXUY=
m7s.live/plugin/room/v4 v4.0.11 h1:a4XOzHmsTrvi3N809IMaFGpimiJUMz8D9+BRnBk44Oc=
m7s.live/plugin/room/v4 v4.0.11/go.mod h1:bGNV2Me/k2KBfbO+fiUdC+HKJBE2wS84HczzSHfrSAI=
m7s.live/plugin/rtmp/v4 v4.2.7 h1:eQtrcTuuBZVInvRaDUROcLMeLXJWXo79LAnymRd0L3Y=
m7s.live/plugin/rtmp/v4 v4.2.7/go.mod h1:UqI1l1+3Y2zg2oOUkfVJ719hcv10bMYVAlg5e+gqy2E=
m7s.live/plugin/rtsp/v4 v4.3.0 h1:Q6R7uijgtzCPFbe1JBvB2x7IUs/KV7fvn52UQHoc9Cw=
m7s.live/plugin/rtsp/v4 v4.3.0/go.mod h1:P4cRC2F3f84Vh7Vjjkjv7GZtzKuEVmeNW1NN406K9vY=
m7s.live/plugin/rtsp/v4 v4.3.1 h1:oSUc1bnHFI52y+nhnBpBhb7Rv+144T1NhvfHE1bIGSo=
m7s.live/plugin/rtsp/v4 v4.3.1/go.mod h1:NfIyqdD/iJo8NYmnxXNN8/z5cc/YBec7RllOhWcOlI8=
m7s.live/plugin/rtsp/v4 v4.3.2-0.20231103061205-855038c1322e h1:DBJDURrrQCgDkSRIIQf59V5G3i9AFjPvn+/ukKRzaSw=
m7s.live/plugin/rtsp/v4 v4.3.2-0.20231103061205-855038c1322e/go.mod h1:8v44lipQrAvYcnhK/n5Wk9fZJjod4kzAZqsL/zCcLJ4=
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 h1:QV+ghnBFnKleWm072Pptmrta+SxNyR8PvCAafuIo4W4=