🐛 FIX: rtmp插件与srs服务器互通的问题

🐛 FIX: hook插件读取配置文件错误
🐛 FIX: gb拉流信令拼接错误
2025-09-27 05:35:57 +08:00 · 2022-09-24 21:08:06 +08:00 · 2022-09-19 00:23:16 +08:00 · 2022-09-16 19:19:00 +08:00 · 2022-09-16 13:40:29 +08:00 · 2022-09-12 23:02:01 +08:00
5 changed files with 58 additions and 47 deletions
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -61,6 +61,7 @@ jobs:
        name=`echo $releaseinfo | jq   ".name" | sed -e 's/^"//' -e 's/"$//'`
        touch apps/m7s-website/src/release.txt
        echo -e "# $name\n$body" | cat - apps/m7s-website/src/release.txt > temp && mv temp apps/m7s-website/src/release.txt
+        sed "/## Changelog/d" -i apps/m7s-website/src/release.txt
        git config --global user.name 'langhuihui' 
        git config --global user.email '178529795@qq.com'
        git add -A
--- a/go.mod
+++ b/go.mod
@@ -3,21 +3,21 @@ module monibuca
 go 1.18

 require (
-	m7s.live/engine/v4 v4.5.8
+	m7s.live/engine/v4 v4.6.11
 	m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2
-	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
+	m7s.live/plugin/gb28181/v4 v4.0.6
+	m7s.live/plugin/hdl/v4 v4.0.0
+	m7s.live/plugin/hls/v4 v4.0.0
+	m7s.live/plugin/hook/v4 v4.0.0
 	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/preview/v4 v4.0.1
+	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/webrtc/v4 v4.0.0-20220625121305-db54d6ee4d17
+	m7s.live/plugin/rtmp/v4 v4.0.1
+	m7s.live/plugin/rtsp/v4 v4.0.1
+	m7s.live/plugin/snap/v4 v4.0.0-20220821111204-b7e2559a2767
+	m7s.live/plugin/webrtc/v4 v4.0.1
 	m7s.live/plugin/webtransport/v4 v4.0.0-20220619154419-bf138bc5958b
 )

@@ -66,7 +66,7 @@ require (
 	github.com/pion/transport v0.13.1 // indirect
 	github.com/pion/turn/v2 v2.0.8 // indirect
 	github.com/pion/udp v0.1.1 // indirect
-	github.com/pion/webrtc/v3 v3.1.43 // indirect
+	github.com/pion/webrtc/v3 v3.1.44 // indirect
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
 	github.com/q191201771/naza v0.30.3 // indirect
 	github.com/quangngotan95/go-m3u8 v0.1.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -221,8 +221,8 @@ github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw=
 github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
 github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
 github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
-github.com/pion/webrtc/v3 v3.1.43 h1:YT3ZTO94UT4kSBvZnRAH82+0jJPUruiKr9CEstdlQzk=
-github.com/pion/webrtc/v3 v3.1.43/go.mod h1:G/J8k0+grVsjC/rjCZ24AKoCCxcFFODgh7zThNZGs0M=
+github.com/pion/webrtc/v3 v3.1.44 h1:uY11C9cOupY36bS3Q16NI298c/XKhl5S9EMCo/TxH3Y=
+github.com/pion/webrtc/v3 v3.1.44/go.mod h1:G/J8k0+grVsjC/rjCZ24AKoCCxcFFODgh7zThNZGs0M=
 github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -502,36 +502,36 @@ 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.11 h1:6QVzekG3tsLAM/hcmpxE1MairWKCLON1ROlAzwphndI=
+m7s.live/engine/v4 v4.6.11/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/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=
-m7s.live/plugin/hls/v4 v4.0.0-20220701023227-8b8d68de154f/go.mod h1:Qn4dDz5xlyBJwO+eZ3w8CUQ8Hl6KN1nmv0a3IsOjJvw=
-m7s.live/plugin/hook/v4 v4.0.0-20220510140048-d4f76fd1c415 h1:ByaKrp8iWIDhASzxxCsJRBx0Cyw1P466KLgvSiMSix4=
-m7s.live/plugin/hook/v4 v4.0.0-20220510140048-d4f76fd1c415/go.mod h1:ky3FOzCMKSDIiosPOw3wrKrQLM3YERSe5YrQZToJh/I=
+m7s.live/plugin/gb28181/v4 v4.0.6 h1:B0EdRO2KNa4QgfHk43P22d9jpbh1zIXdbgxqW+bGWXE=
+m7s.live/plugin/gb28181/v4 v4.0.6/go.mod h1:Tn34m/YLi7hLteNBbeRmFkwxy4Y/mmd9okdKMvdbmkY=
+m7s.live/plugin/hdl/v4 v4.0.0 h1:w0eYl9dDTwGXTeJ0/hK392hDUQxCYJ4Jw3M0xWCLJHM=
+m7s.live/plugin/hdl/v4 v4.0.0/go.mod h1:oYox1NW5lUlwWNuAqqmgY7csuP8Hyd8TlIGuF7DoxIk=
+m7s.live/plugin/hls/v4 v4.0.0 h1:UspPoDWoAOgpimqsdLL6cm43PUA6PmhundwBlNziIiU=
+m7s.live/plugin/hls/v4 v4.0.0/go.mod h1:Qn4dDz5xlyBJwO+eZ3w8CUQ8Hl6KN1nmv0a3IsOjJvw=
+m7s.live/plugin/hook/v4 v4.0.0 h1:HdkYt+I0IKsLC5SW9hetkrI6LvWA/7JI151OpkVg6+8=
+m7s.live/plugin/hook/v4 v4.0.0/go.mod h1:ky3FOzCMKSDIiosPOw3wrKrQLM3YERSe5YrQZToJh/I=
 m7s.live/plugin/jessica/v4 v4.0.0-20220619154153-bcd0a5960ac1 h1:7muSZHyx6EQSzO8svuZKlFNVk3OrOdra+e8proeGAUY=
 m7s.live/plugin/jessica/v4 v4.0.0-20220619154153-bcd0a5960ac1/go.mod h1:mJCONeOUeIPPA7Pfgge844l65KzHXa+QwE+AJ64Cf+4=
 m7s.live/plugin/logrotate/v4 v4.0.0-20220506113619-1a557d4707a5 h1:XkkHG9sYk45GXVxZXDbY7WgtwoiXfJ8Mf58CPT5Bzss=
 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/preview/v4 v4.0.1 h1:k8iA5/bMiEWSFcy4zaZ8wG93AtJcSwxtgcQG+Y0xX5E=
+m7s.live/plugin/preview/v4 v4.0.1/go.mod h1:iYhWqFbTvTNDFplbTOrE5X9M6ED7gCKkKMuM5QmBocg=
+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/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/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/rtmp/v4 v4.0.1 h1:jq0MT3Tm6jTxiCzRZCNEil+N+NoDCTvuhLJ3qVWOkF0=
+m7s.live/plugin/rtmp/v4 v4.0.1/go.mod h1:Y+1A1ds4GgcoDennFy5DJntiuzeptO7EEqgu32bjJ70=
+m7s.live/plugin/rtsp/v4 v4.0.1 h1:V7c8WdfINa/eBqh+WCu/CKGwS/lMKt6zqYwpbRBytdA=
+m7s.live/plugin/rtsp/v4 v4.0.1/go.mod h1:DkTgdPHG94BvrjPJb8cNKoBzUN10Ztlu12fpqaSyt9k=
+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.1 h1:itQt98NYtkZUxv+/EO6mmLgDZ1KqTGnrmjbKhpxm608=
+m7s.live/plugin/webrtc/v4 v4.0.1/go.mod h1:a55k7ZL84j5dxbwFVF3NAPnLDzYAms97OLhvw6HlEg8=
 m7s.live/plugin/webtransport/v4 v4.0.0-20220619154419-bf138bc5958b h1:VIZh7EDfZ6kLv+f9sLMQzrRZObDiMVgFFaTalVAU+MI=
 m7s.live/plugin/webtransport/v4 v4.0.0-20220619154419-bf138bc5958b/go.mod h1:RtqizBkC2q3QNA+gfYD1mMH6SVK8T/iprvaX+3SQ1B0=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
--- a/goreleaser.yml
+++ b/goreleaser.yml
@@ -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
--- a/main.go
+++ b/main.go
@@ -2,15 +2,13 @@ package main

 //go:generate go run gen.go $debug

-/*
-                                              
-███╗   ███╗ ██████╗ ███╗   ██╗██╗██████╗ ██╗   ██╗ ██████╗ █████╗ 
-████╗ ████║██╔═══██╗████╗  ██║██║██╔══██╗██║   ██║██╔════╝██╔══██╗
-██╔████╔██║██║   ██║██╔██╗ ██║██║██████╔╝██║   ██║██║     ███████║
-██║╚██╔╝██║██║   ██║██║╚██╗██║██║██╔══██╗██║   ██║██║     ██╔══██║
-██║ ╚═╝ ██║╚██████╔╝██║ ╚████║██║██████╔╝╚██████╔╝╚██████╗██║  ██║
-╚═╝     ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚═╝╚═════╝  ╚═════╝  ╚═════╝╚═╝  ╚═╝
-                                                                                                                            
+/* 
+███    ███  ██████  ███    ██ 👑 ██████  ██    ██  ██████  █████ 
+████  ████ ██    ██ ████   ██ ██ ██   ██ ██    ██ ██      ██   ██
+██ ████ ██ ██    ██ ██ ██  ██ ██ ██████  ██    ██ ██      ███████
+██  ██  ██ ██    ██ ██  ██ ██ ██ ██   ██ ██    ██ ██      ██   ██
+██      ██  ██████  ██   ████ ██ ██████   ██████   ██████ ██   ██
+
 The live stream server for Go
 (c) dexter 2019-present
 */
@@ -18,6 +16,7 @@ The live stream server for Go
 import (
 	"context"
 	"flag"
+	"fmt"

 	"m7s.live/engine/v4"
 	"m7s.live/engine/v4/util"
@@ -34,15 +33,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)
 }
Author	SHA1	Message	Date
dexter	6f9fe7c646	🐛 FIX: rtmp插件与srs服务器互通的问题	2022-09-24 21:08:06 +08:00
dexter	96d886c7a5	🐛 FIX: hook插件读取配置文件错误	2022-09-19 00:23:16 +08:00
dexter	ca2f69539d	🐛 FIX: gb拉流信令拼接错误	2022-09-16 19:19:00 +08:00
dexter	0fd608aefc	🐛 FIX: engine中订阅关键帧被覆盖问题，gb的ptzcmd中发送的deviceID值问题，acc的rtp包超过一个mtu时的解析问题	2022-09-16 13:40:29 +08:00
dexter	d5e6a517fb	🐛 FIX: dts在无B帧情况下的生成机制修正，gb插件增加设备信息持久化重启实例后可快速恢复	2022-09-12 23:02:01 +08:00
dexter	e035cf0846	👌 IMPROVE: 增加rtsp拉流报错信息，gb插件增加ps流dump功能方便排查错误	2022-09-11 21:15:47 +08:00
dexter	e7ff340c7a	🚀 RELEASE: 修复远端拉流保存并发问题，修复gb拉流PS包解析bug，导出部分插件	2022-09-04 22:23:40 +08:00
dexter	91d1d5502b	Merge pull request #66 from dwdcth/patch-1 删除"## Changelog"	2022-09-02 16:00:01 +08:00
banshan	b1ef460af1	删除"## Changelog"	2022-09-02 15:53:08 +08:00
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