Compare commits

...

6 Commits

Author SHA1 Message Date
dexter
87f08066e5 API增加获取远端导入的流以及向远端推流的信息 2022-08-28 22:36:44 +08:00
dexter
da69aae5fa 修复gb插件中的pts和dts覆盖bug,兼容rtsp协议sdp中无sps和pps问题 2022-08-21 19:35:56 +08:00
dexter
6e8081a411 1、增加配置日志级别;2、发布者增加可以配置断线延迟退出时间配置 2022-08-13 18:33:02 +08:00
dexter
2f7bc14986 Merge pull request #63 from dwdcth/v4
添加版本号
2022-08-09 16:56:47 +08:00
hetangj
504e22b558 添加版本号 2022-08-09 16:43:01 +08:00
hetangj
c7b2cbfee3 '添加版本号' 2022-08-09 16:20:01 +08:00
4 changed files with 38 additions and 16 deletions

10
go.mod
View File

@@ -3,20 +3,20 @@ module monibuca
go 1.18
require (
m7s.live/engine/v4 v4.5.8
m7s.live/engine/v4 v4.6.3
m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2
m7s.live/plugin/gb28181/v4 v4.0.0-20220717024155-cf761e09d74b
m7s.live/plugin/gb28181/v4 v4.0.0-20220823105027-709988cf0926
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
m7s.live/plugin/jessica/v4 v4.0.0-20220619154153-bcd0a5960ac1
m7s.live/plugin/logrotate/v4 v4.0.0-20220506113619-1a557d4707a5
m7s.live/plugin/preview/v4 v4.0.0-20220710064653-1bfc340193c8
m7s.live/plugin/record/v4 v4.0.0-20220625032502-232d974a1c93
m7s.live/plugin/record/v4 v4.0.0-20220804085726-e920edb4df2b
m7s.live/plugin/room/v4 v4.0.0-20220512035851-f980d4a7f6a0
m7s.live/plugin/rtmp/v4 v4.0.0-20220730051812-23de2a93993a
m7s.live/plugin/rtsp/v4 v4.0.0-20220723035926-9b058153d227
m7s.live/plugin/snap/v4 v4.0.0-20220619154320-97a4991e775b
m7s.live/plugin/rtsp/v4 v4.0.0-20220821064954-7d08e06922b2
m7s.live/plugin/snap/v4 v4.0.0-20220821111204-b7e2559a2767
m7s.live/plugin/webrtc/v4 v4.0.0-20220625121305-db54d6ee4d17
m7s.live/plugin/webtransport/v4 v4.0.0-20220619154419-bf138bc5958b
)

22
go.sum
View File

@@ -502,12 +502,18 @@ 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.8 h1:bsmso744C/OtA2bWAUEH2Xv503jfSHZBmE/4Nwsw6/8=
m7s.live/engine/v4 v4.5.8/go.mod h1:uzpGiVnIcuoXehpvqOj9iTVxnyf7RZQZ/Ikiwyjs01E=
m7s.live/engine/v4 v4.6.2 h1:TkGwKdtT8jZ52kFlmcFRXMIV9g+ipkV8dXB6T7Y5h6A=
m7s.live/engine/v4 v4.6.2/go.mod h1:uzpGiVnIcuoXehpvqOj9iTVxnyf7RZQZ/Ikiwyjs01E=
m7s.live/engine/v4 v4.6.3 h1:6PzeK0doQmU6oZrsofEmZSPoFDMSBCud/h43qUMs6sY=
m7s.live/engine/v4 v4.6.3/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-20220717024155-cf761e09d74b h1:Q65xt8j7h8erXOiiq9JfvM44ttI99v1eLiKfuHvU9vk=
m7s.live/plugin/gb28181/v4 v4.0.0-20220717024155-cf761e09d74b/go.mod h1:Tn34m/YLi7hLteNBbeRmFkwxy4Y/mmd9okdKMvdbmkY=
m7s.live/plugin/gb28181/v4 v4.0.0-20220813041333-a09080641d33 h1:DVQgss2kqUcNpyyCb55Ndsghv0nxVLhO9FnqP0606g0=
m7s.live/plugin/gb28181/v4 v4.0.0-20220813041333-a09080641d33/go.mod h1:Tn34m/YLi7hLteNBbeRmFkwxy4Y/mmd9okdKMvdbmkY=
m7s.live/plugin/gb28181/v4 v4.0.0-20220821111125-9cf8c1acc1ec h1:ag2lhx0FBl8BTUlXPNXkEpKRULj3NIow2oMecN6SuW0=
m7s.live/plugin/gb28181/v4 v4.0.0-20220821111125-9cf8c1acc1ec/go.mod h1:Tn34m/YLi7hLteNBbeRmFkwxy4Y/mmd9okdKMvdbmkY=
m7s.live/plugin/gb28181/v4 v4.0.0-20220823105027-709988cf0926 h1:hPM5qVXUwqBQvR4uOlJkVW4HGcjULVtTDsVCh4MtvlM=
m7s.live/plugin/gb28181/v4 v4.0.0-20220823105027-709988cf0926/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=
@@ -520,16 +526,20 @@ m7s.live/plugin/logrotate/v4 v4.0.0-20220506113619-1a557d4707a5 h1:XkkHG9sYk45GX
m7s.live/plugin/logrotate/v4 v4.0.0-20220506113619-1a557d4707a5/go.mod h1:a8hIV59GjpQDE+Ip790CU7yOHaG4+Iweci0sLvo43FU=
m7s.live/plugin/preview/v4 v4.0.0-20220710064653-1bfc340193c8 h1:RjeD7x5PpWQfSuygquGgRR0S5/ycgQ4VI9pzJpHbHIc=
m7s.live/plugin/preview/v4 v4.0.0-20220710064653-1bfc340193c8/go.mod h1:iYhWqFbTvTNDFplbTOrE5X9M6ED7gCKkKMuM5QmBocg=
m7s.live/plugin/record/v4 v4.0.0-20220625032502-232d974a1c93 h1:4voF7d0cDsSm0QV7CpJuyBxWaMOPYoPz6Ub/e96g5zA=
m7s.live/plugin/record/v4 v4.0.0-20220625032502-232d974a1c93/go.mod h1:pOe8VNiXm/m1SiJSO16iFZhqrWJeb1xcV3s9qv5v6eo=
m7s.live/plugin/record/v4 v4.0.0-20220804085726-e920edb4df2b h1:r1ZCicEEPzSWMvTxTCNIgc6WfR3Oww522HhEk0h5l5g=
m7s.live/plugin/record/v4 v4.0.0-20220804085726-e920edb4df2b/go.mod h1:pOe8VNiXm/m1SiJSO16iFZhqrWJeb1xcV3s9qv5v6eo=
m7s.live/plugin/room/v4 v4.0.0-20220512035851-f980d4a7f6a0 h1:rv/GTbcVz1k3/7xWHTXnp4f9LU7Bzf+qC3Dqe9TIEZs=
m7s.live/plugin/room/v4 v4.0.0-20220512035851-f980d4a7f6a0/go.mod h1:s/e+9cyOkJVMAsOVRM08RDvlPikeaeh5R26qk8oekFA=
m7s.live/plugin/rtmp/v4 v4.0.0-20220730051812-23de2a93993a h1:dkTwholGSb65s17syGEtgP79a5reNbsv4I+MNi/5FyI=
m7s.live/plugin/rtmp/v4 v4.0.0-20220730051812-23de2a93993a/go.mod h1:Y+1A1ds4GgcoDennFy5DJntiuzeptO7EEqgu32bjJ70=
m7s.live/plugin/rtsp/v4 v4.0.0-20220723035926-9b058153d227 h1:+RGtDVBVRWMwozpreVvZvVsG4c79LolxqLYQfPoWgy8=
m7s.live/plugin/rtsp/v4 v4.0.0-20220723035926-9b058153d227/go.mod h1:vzkSksXHo7Im77Yazqucrsa+VyOBV4UBlnrWW/oZpuo=
m7s.live/plugin/rtsp/v4 v4.0.0-20220821064954-7d08e06922b2 h1:IWKvoYkluAeMMRnpXwilejCT9kKrEYw9p4+U5eQ2kdA=
m7s.live/plugin/rtsp/v4 v4.0.0-20220821064954-7d08e06922b2/go.mod h1:DkTgdPHG94BvrjPJb8cNKoBzUN10Ztlu12fpqaSyt9k=
m7s.live/plugin/snap/v4 v4.0.0-20220619154320-97a4991e775b h1:fyy2rnRkjJnOIDJ4lIYHpDlxaAMJPYvXmhd/PbNhgrQ=
m7s.live/plugin/snap/v4 v4.0.0-20220619154320-97a4991e775b/go.mod h1:XHggonZ0lIKEX/OP2rXjV2mPpG4urmvMT3foIaFRsus=
m7s.live/plugin/snap/v4 v4.0.0-20220821111204-b7e2559a2767 h1:HN72EyEZ3++aVC7J9WrmoTQx3SvMYJETwUKAf2jNH3k=
m7s.live/plugin/snap/v4 v4.0.0-20220821111204-b7e2559a2767/go.mod h1:XHggonZ0lIKEX/OP2rXjV2mPpG4urmvMT3foIaFRsus=
m7s.live/plugin/webrtc/v4 v4.0.0-20220625121305-db54d6ee4d17 h1:gWGEjZ8rT7kDD3u7rnQX17XDQtRA7pEWgRQoE47VMXY=
m7s.live/plugin/webrtc/v4 v4.0.0-20220625121305-db54d6ee4d17/go.mod h1:F78F1+ILZZbKYoHXr42YBXkHoi9D4W7jvjSazN38000=
m7s.live/plugin/webtransport/v4 v4.0.0-20220619154419-bf138bc5958b h1:VIZh7EDfZ6kLv+f9sLMQzrRZObDiMVgFFaTalVAU+MI=

View File

@@ -3,9 +3,13 @@ archives:
-
files:
- config.yaml
- monibuca.com.key
- monibuca.com.pem
builds:
- id: "with-debug"
env: [CGO_ENABLED=0]
ldflags:
- -s -w -X main.version={{.Tag}}
ignore:
- goos: darwin
goarch: arm64
@@ -25,6 +29,8 @@ builds:
- id: "without-debug"
env: [CGO_ENABLED=0]
ldflags:
- -s -w -X main.version={{.Tag}}
goos:
- windows
- darwin

16
main.go
View File

@@ -3,14 +3,14 @@ package main
//go:generate go run gen.go $debug
/*
███╗ ███╗ ██████╗ ███╗ ██╗██╗██████╗ ██╗ ██╗ ██████╗ █████╗
███╗ ███╗ ██████╗ ███╗ ██╗██╗██████╗ ██╗ ██╗ ██████╗ █████╗
████╗ ████║██╔═══██╗████╗ ██║██║██╔══██╗██║ ██║██╔════╝██╔══██╗
██╔████╔██║██║ ██║██╔██╗ ██║██║██████╔╝██║ ██║██║ ███████║
██║╚██╔╝██║██║ ██║██║╚██╗██║██║██╔══██╗██║ ██║██║ ██╔══██║
██║ ╚═╝ ██║╚██████╔╝██║ ╚████║██║██████╔╝╚██████╔╝╚██████╗██║ ██║
╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═══╝╚═╝╚═════╝ ╚═════╝ ╚═════╝╚═╝ ╚═╝
The live stream server for Go
(c) dexter 2019-present
*/
@@ -18,6 +18,7 @@ The live stream server for Go
import (
"context"
"flag"
"fmt"
"m7s.live/engine/v4"
"m7s.live/engine/v4/util"
@@ -34,15 +35,20 @@ import (
_ "m7s.live/plugin/room/v4"
_ "m7s.live/plugin/rtmp/v4"
_ "m7s.live/plugin/rtsp/v4"
_ "m7s.live/plugin/snap/v4"
_ "m7s.live/plugin/webrtc/v4"
_ "m7s.live/plugin/webtransport/v4"
_ "m7s.live/plugin/snap/v4"
)
var (
version = "dev"
)
func main() {
fmt.Println("start monibuca version:", version)
conf := flag.String("c", "config.yaml", "config file")
flag.Parse()
ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(context.WithValue(context.Background(), "version", version))
go util.WaitTerm(cancel)
engine.Run(ctx, *conf)
}