Compare commits

...

3 Commits

Author SHA1 Message Date
langhuihui
eb3ffe6cd6 fix: repull will dead 2023-11-16 19:28:54 +08:00
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
3 changed files with 38 additions and 30 deletions

View File

@@ -2,22 +2,15 @@
global:
disableall: true # 需要转换其他协议的话需要将disableall设置为false
enableavcc: false # 如果需要转换成rtmp和flv的话需要改成true
delayclosetimeout: 2s # 无订阅者时2s后关闭拉流
publish:
delayclosetimeout: 2s # 无订阅者时2s后关闭拉流
preview:
enable: true
rtsp:
enable: true # 如果disableall为false的话这个可以不需要写
pullprotocol: tcp
pull:
pullonstart:
rtsp/obs: rtsp://localhost:8554/live
# live/test1: rtsp://localhost:8554/live/rtsp
# live/test2: rtsp://localhost:8554/live/rtsp
# live/test3: rtsp://localhost:8554/live/rtsp
# live/test4: rtsp://localhost:8554/live/rtsp
# live/test5: rtsp://localhost:8554/live/rtsp
# live/test6: rtsp://localhost:8554/live/rtsp
# live/test7: rtsp://localhost:8554/live/rtsp
# live/test8: rtsp://localhost:8554/live/rtsp
# live/test9: rtsp://localhost:8554/live/rtsp
rtsp/test: rtsp://localhost:8554/live
pullonsub: # 按需拉流
rtsp/100: rtsp://admin:admin@192.168.0.100/cam/realmonitor?channel=1&subtype=0
rtsp/101: rtsp://admin:admin@192.168.0.101/cam/realmonitor?channel=1&subtype=0

13
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.1
m7s.live/engine/v4 v4.14.3-0.20231116015522-6c6a28855d35
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
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
m7s.live/plugin/room/v4 v4.0.11
m7s.live/plugin/rtmp/v4 v4.2.7
m7s.live/plugin/rtsp/v4 v4.3.1
m7s.live/plugin/rtmp/v4 v4.2.9
m7s.live/plugin/rtsp/v4 v4.3.2
m7s.live/plugin/snap/v4 v4.0.7
m7s.live/plugin/webrtc/v4 v4.2.2
m7s.live/plugin/webtransport/v4 v4.0.9
@@ -72,6 +72,7 @@ require (
github.com/pion/transport/v2 v2.2.4 // indirect
github.com/pion/turn/v2 v2.1.3 // indirect
github.com/pion/webrtc/v3 v3.2.20 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
github.com/q191201771/naza v0.30.48 // indirect
@@ -101,5 +102,5 @@ require (
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.13.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
m7s.live/plugin/ps/v4 v4.1.3 // indirect
m7s.live/plugin/ps/v4 v4.1.4 // indirect
)

38
go.sum
View File

@@ -196,6 +196,8 @@ github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUY
github.com/pion/webrtc/v3 v3.2.20 h1:BQJiXQsJq9LgLp3op7rLy1y8d2WD+LtiS9cpY0uQ22A=
github.com/pion/webrtc/v3 v3.2.20/go.mod h1:vVURQTBOG5BpWKOJz3nlr23NfTDeyKVmubRNqzQp+Tg=
github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -418,8 +420,20 @@ 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.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 h1:j4v7yB9A6T4O1v/iqwpirI6oUoZqH3lY6KaBfMJ7Ee0=
m7s.live/engine/v4 v4.14.2/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
m7s.live/engine/v4 v4.14.3-0.20231113112744-6a65a1f43885 h1:/UIaoPI72HyGIowpElyiNS9Ig0mU4RiL4AnpN6Zbb+8=
m7s.live/engine/v4 v4.14.3-0.20231113112744-6a65a1f43885/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
m7s.live/engine/v4 v4.14.3-0.20231113113256-eb8d8f47b4f2 h1:+oCzsK7WkccBczrzkwAyZ0gBCsmMVUIVc3+csaK0EYU=
m7s.live/engine/v4 v4.14.3-0.20231113113256-eb8d8f47b4f2/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
m7s.live/engine/v4 v4.14.3-0.20231114044423-67b15ce231c2 h1:qJtCc/ZBCvlQ+a34JK129Nrv0HxPy/HzS6jVBm/LfIo=
m7s.live/engine/v4 v4.14.3-0.20231114044423-67b15ce231c2/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
m7s.live/engine/v4 v4.14.3-0.20231114101849-0f2869b8668d h1:vSKch7cPXp+aNlM+BsAT6iPXoA6sYM00Kz0WBxV+AQM=
m7s.live/engine/v4 v4.14.3-0.20231114101849-0f2869b8668d/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
m7s.live/engine/v4 v4.14.3-0.20231115070502-2b658ec78642 h1:aeiGtwIPilWMLgdUK97uYAPwOLg7+Nj8AxoXvDmnad8=
m7s.live/engine/v4 v4.14.3-0.20231115070502-2b658ec78642/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
m7s.live/engine/v4 v4.14.3-0.20231116015522-6c6a28855d35 h1:KOaYnVBo610JktkkwK7tdIlzoAcXxDvlaGnecOtew+E=
m7s.live/engine/v4 v4.14.3-0.20231116015522-6c6a28855d35/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=
@@ -428,8 +442,8 @@ m7s.live/plugin/gb28181/v4 v4.4.3 h1:Vrgtgq8bstX2R7EtuSjiqEHjwaP74HpRanvhNsr2kEk
m7s.live/plugin/gb28181/v4 v4.4.3/go.mod h1:mK5embLQwDULFJjA7jBls1Cwvow98lTWS6n/uZ7Ampk=
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 h1:cSXSAsplk1vhqnhF0eTykQV9f66FGsGvjvGDJJoxW0Y=
m7s.live/plugin/hls/v4 v4.3.7/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=
@@ -440,16 +454,16 @@ m7s.live/plugin/monitor/v4 v4.0.4 h1:vJ/gZctUej9s5ukjsNXDvl6JWqK5I+7L6W0REXR2Xpg
m7s.live/plugin/monitor/v4 v4.0.4/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.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/ps/v4 v4.1.4 h1:Hycrjyk6uJRxrGfytSoIdstAotGx69L5jumFVr9yTV4=
m7s.live/plugin/ps/v4 v4.1.4/go.mod h1:RAb507iNmPG43I5kUA6ewF1fTRHDRsKbIVkIdLdKeeI=
m7s.live/plugin/record/v4 v4.4.5 h1:v5xjJiC1inpsqIUeNmI8QWOCN0bsTe1x6IlO4z9blzg=
m7s.live/plugin/record/v4 v4.4.5/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.1 h1:oSUc1bnHFI52y+nhnBpBhb7Rv+144T1NhvfHE1bIGSo=
m7s.live/plugin/rtsp/v4 v4.3.1/go.mod h1:NfIyqdD/iJo8NYmnxXNN8/z5cc/YBec7RllOhWcOlI8=
m7s.live/plugin/rtmp/v4 v4.2.9 h1:2wIFZ3KHvnI4yJ+ahmknnvfptOJGLEPdXALRLNtGdLA=
m7s.live/plugin/rtmp/v4 v4.2.9/go.mod h1:UqI1l1+3Y2zg2oOUkfVJ719hcv10bMYVAlg5e+gqy2E=
m7s.live/plugin/rtsp/v4 v4.3.2 h1:tgvZQlcPWdJWS6zx/K8FgccS/w5/N/pBQx6JclQ1M6Q=
m7s.live/plugin/rtsp/v4 v4.3.2/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=