Skip to content

Commit

Permalink
修复gb28181插件ssrc取值以及ip获取的兼容性
Browse files Browse the repository at this point in the history
  • Loading branch information
langhuihui committed Jul 17, 2022
1 parent 7a0964b commit d12052e
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 31 deletions.
57 changes: 32 additions & 25 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,35 @@
# 插件配置参考各个插件的文档
# 插件都有一个enable配置,如果为false则不启用该插件,默认为true即不需要配置。

# global:
# secret: "123456"
# http:
# listenaddrtls: :8081
# certfile: monibuca.com.pem
# keyfile: monibuca.com.key
# record:
# mp4:
# autorecord: true
# fragment: 20
# webtransport:
# enable: false
# certfile: monibuca.com.pem
# keyfile: monibuca.com.key
# rtsp:
# pull:
# pullonstart: true
# pulllist:
# live/rtsp : rtsp://admin:[email protected]:18554/Streaming/Channels/101
# hls:
# enable: false
# pull:
# pullonstart: true
# pulllist:
# live/hls: http://111.40.196.27/PLTV/88888888/224/3221225548/index.m3u8
global:
console:
secret: "ab0f6913670062af4d2f15c621205178"
# publish:
# pubaudio: false
http:
listenaddrtls: :8081
certfile: monibuca.com.pem
keyfile: monibuca.com.key
record:
enable: false
hls:
autorecord: true
fragment: 20
webtransport:
# enable: false
certfile: monibuca.com.pem
keyfile: monibuca.com.key
gb28181:
# enable: false
rtsp:
enable: false
pull:
pullonstart: true
pulllist:
live/rtsp : rtsp://admin:[email protected]/Streaming/Channels/201?transportmode=unicast
hls:
enable: false
pull:
pullonstart: true
pulllist:
live/hls: http://111.40.196.27/PLTV/88888888/224/3221225548/index.m3u8
5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module monibuca
go 1.18

require (
m7s.live/engine/v4 v4.5.1
m7s.live/engine/v4 v4.5.4
m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2
m7s.live/plugin/gb28181/v4 v4.0.0-20220710074849-8f2a90e8ac40
m7s.live/plugin/gb28181/v4 v4.0.0-20220717024155-cf761e09d74b
m7s.live/plugin/hdl/v4 v4.0.0-20220619154106-b109dd48a6e4
m7s.live/plugin/hls/v4 v4.0.0-20220701023227-8b8d68de154f
m7s.live/plugin/hook/v4 v4.0.0-20220510140048-d4f76fd1c415
Expand Down Expand Up @@ -36,6 +36,7 @@ require (
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/husanpao/ip v0.0.0-20220711072141-f1e1174bc11b // indirect
github.com/icza/bitio v1.1.0 // indirect
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
github.com/lucas-clemente/quic-go v0.26.0 // indirect
Expand Down
10 changes: 6 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/husanpao/ip v0.0.0-20220711072141-f1e1174bc11b h1:Sz6yYtmUAECABK80QzOrXp4EiqqAtHvaviIujATSJN4=
github.com/husanpao/ip v0.0.0-20220711072141-f1e1174bc11b/go.mod h1:medl9/CfYoQlqAXtAARmMW5dAX2UOdwwkhaszYPk0AM=
github.com/icza/bitio v1.1.0 h1:ysX4vtldjdi3Ygai5m1cWy4oLkhWTAi+SyO6HC8L9T0=
github.com/icza/bitio v1.1.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A=
github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lToqnXgA8Mz1DP11X4zSJ159C3k=
Expand Down Expand Up @@ -495,12 +497,12 @@ grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJd
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
m7s.live/engine/v4 v4.5.1 h1:TKXIgxrZ9YPT6ArZUQ8iByn9Y3yUbiXtIpM8CnceeBY=
m7s.live/engine/v4 v4.5.1/go.mod h1:uzpGiVnIcuoXehpvqOj9iTVxnyf7RZQZ/Ikiwyjs01E=
m7s.live/engine/v4 v4.5.4 h1:wjkC8KSuoPbrfy0PFyZWiVy3t8Ed9Umm0T+uT9imjpg=
m7s.live/engine/v4 v4.5.4/go.mod h1:uzpGiVnIcuoXehpvqOj9iTVxnyf7RZQZ/Ikiwyjs01E=
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/gb28181/v4 v4.0.0-20220710074849-8f2a90e8ac40 h1:YAaLlBzUhDVXptjtDK33YyFBXiD7az99mMXkFI8GMBM=
m7s.live/plugin/gb28181/v4 v4.0.0-20220710074849-8f2a90e8ac40/go.mod h1:ZF35yYBY2wPBVtZv3Gwd+j5Eg5wznRTwNHCazTM6UAQ=
m7s.live/plugin/gb28181/v4 v4.0.0-20220717024155-cf761e09d74b h1:Q65xt8j7h8erXOiiq9JfvM44ttI99v1eLiKfuHvU9vk=
m7s.live/plugin/gb28181/v4 v4.0.0-20220717024155-cf761e09d74b/go.mod h1:Tn34m/YLi7hLteNBbeRmFkwxy4Y/mmd9okdKMvdbmkY=
m7s.live/plugin/hdl/v4 v4.0.0-20220619154106-b109dd48a6e4 h1:l9y3NU/mD2lWnBop3sq1mGbGcQhzutxIZ6++wWIOlUM=
m7s.live/plugin/hdl/v4 v4.0.0-20220619154106-b109dd48a6e4/go.mod h1:oYox1NW5lUlwWNuAqqmgY7csuP8Hyd8TlIGuF7DoxIk=
m7s.live/plugin/hls/v4 v4.0.0-20220701023227-8b8d68de154f h1:ZSBTBj/LkoVaGWwfgV/qFMTj/UR/iyyAuIWrDjYm47U=
Expand Down

0 comments on commit d12052e

Please sign in to comment.