apps/rtsp2rtmp
1
0
Fork 0
mirror of https://github.com/hkmadao/rtsp2rtmp.git synced 2025-09-27 03:35:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

支持使用ffmpeg状态切换

Browse Source
This commit is contained in:
madao
2024-12-18 16:51:13 +08:00
parent 549ec6c2aa
commit 4dbd2e08f9
14 changed files with 115 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/init/rtsp2rtmp-postgresql.sql
View File

@@ -43,7 +43,7 @@ CREATE TABLE public.camera_share (
id varchar NOT NULL,
camera_id varchar NULL, -- 摄像头标识
auth_code varchar NULL, -- 播放权限码
enabled varchar NULL, -- 启用状态：1.启用；0.禁用；
enabled int2 NULL, -- 启用状态：1.启用；0.禁用；
created timestamp(0) NULL, -- 创建时间
deadline timestamp(0) NULL, -- 截止日期
"name" varchar NULL, -- 分享说明

13
main.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/ffmpegmanager"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/rtmpserver"
// "github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/rtspclientmanager"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/rtspclientmanager"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web"
_ "github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web/dao/register"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web/task"
@@ -17,13 +17,22 @@ import (
// "net/http"
// _ "net/http/pprof"
"github.com/beego/beego/v2/core/config"
"github.com/beego/beego/v2/core/logs"
)
func main() {
// rtspclientmanager.GetSingleRtspClientManager().StartClient()
fgUseFfmpeg, err := config.Bool("server.use-ffmpeg")
if err != nil {
logs.Error("get use-ffmpeg fail : %v", err)
fgUseFfmpeg = false
}
if fgUseFfmpeg {
rtmpserver.GetSingleRtmpServer().StartRtmpServer()
ffmpegmanager.GetSingleFFmpegManager().StartClient()
} else {
rtspclientmanager.GetSingleRtspClientManager().StartClient()
}
task.GetSingleTask().StartTask()
web.GetSingleWeb().StartWeb()
sigs := make(chan os.Signal, 1)

6
resources/conf/conf-dev.yml
View File

@@ -1,11 +1,15 @@
server:
use-ffmpeg: false
security: true
user:
name: admin
password: admin
rtmp:
port: 1936
http:
port: 8080
static:
path: D:\development\project\rtsp2rtmp-web\build
path: ./resources/static
fileflv:
path: ./resources/output/live
log:

5
resources/conf/conf-prod.yml
View File

@@ -1,5 +1,6 @@
server:
security: false
use-ffmpeg: false
security: true
user:
name: admin
password: admin
@@ -18,5 +19,5 @@ server:
driver-type: 4
driver: postgres
url: user=postgres password=123456 dbname=rtsp2rtmp host=localhost port=5432 sslmode=disable TimeZone=UTC
show-sql: true
show-sql: false

8
src/rtsp2rtmp/ffmpegmanager/ffmpegmanager.go
View File

@@ -114,15 +114,9 @@ func (s *FFmpegManager) startConnections() {
logs.Error("rtspManager panic %v", r)
}
}()
condition := common.GetEmptyCondition()
es, err := base_service.CameraFindCollectionByCondition(condition)
if err != nil {
logs.Error("camera list query error: %s", err)
return
}
for {
condition := common.GetEmptyCondition()
es, err = base_service.CameraFindCollectionByCondition(condition)
es, err := base_service.CameraFindCollectionByCondition(condition)
if err != nil {
logs.Error("camera list query error: %s", err)
return

28
src/rtsp2rtmp/rtmpserver/rtmpserver.go
View File

@@ -5,6 +5,7 @@ import (
"strconv"
"strings"
"sync"
"time"
"github.com/beego/beego/v2/core/config"
"github.com/beego/beego/v2/core/logs"
@@ -175,11 +176,33 @@ func (r *rtmpServer) handleRtmpConn(conn *rtmp.Conn) {
done := make(chan int)
//添加缓冲，缓解前后速率不一致问题，但是如果收包平均速率大于消费平均速率，依然会导致丢包
pktStream := make(chan av.Packet, 1024)
heartBeatChan := make(chan int)
defer func() {
close(done)
close(pktStream)
close(heartBeatChan)
}()
go func() {
defer func() {
if recover_rusult := recover(); recover_rusult != nil {
logs.Error("HandleConn error : %v", recover_rusult)
}
}()
ticker := time.NewTicker(10 * time.Second)
for {
select {
case _, ok := <-heartBeatChan:
if !ok {
return
}
ticker.Reset(10 * time.Second)
case <-ticker.C:
conn.Close()
return
}
}
}()
p := rtmppublisher.NewPublisher(done, pktStream, code, codecs, r)
r.rms.Store(camera.Code, p)
for {
@@ -188,6 +211,11 @@ func (r *rtmpServer) handleRtmpConn(conn *rtmp.Conn) {
logs.Error("ReadPacket error : %v", err)
break
}
select {
case heartBeatChan <- 1:
default:
}
select {
case pktStream <- pkt:
default:

6
src/rtsp2rtmp/rtspclientmanager/rtspclientmanager.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/utils"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web/common"
// ext_controller "github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web/controllers/ext"
ext_controller "github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web/controllers/ext"
base_service "github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web/service/base"
)
@@ -33,7 +33,7 @@ func GetSingleRtspClientManager() *RtspClientManager {
func (rs *RtspClientManager) StartClient() {
go rs.startConnections()
// go rs.stopConn(ext_controller.CodeStream())
go rs.stopConn(ext_controller.CodeStream())
}
func (rc *RtspClientManager) ExistsPublisher(code string) bool {
@@ -104,7 +104,7 @@ func (s *RtspClientManager) startConnections() {
}
go s.connRtsp(camera.Code)
}
<-time.After(1 * time.Second)
<-time.After(5 * time.Second)
}
}

2
src/rtsp2rtmp/web/dao/entity/camerashare.go
View File

@@ -13,7 +13,7 @@ type CameraShare struct {
// 权限码:
AuthCode string `orm:"column(auth_code)" json:"authCode"`
// 启用状态:
Enabled bool `orm:"column(enabled)" json:"enabled"`
Enabled int `orm:"column(enabled)" json:"enabled"`
// 创建时间:
Created time.Time `orm:"column(created)" json:"created"`
// 开始时间:

2
src/rtsp2rtmp/web/dto/po/base/camera_share/camere_share_po.go
View File

@@ -11,7 +11,7 @@ type CameraSharePO struct {
// 权限码:
AuthCode string `json:"authCode"`
// 启用状态:
Enabled bool `json:"enabled"`
Enabled int `json:"enabled"`
// 创建时间:
Created time.Time `json:"created"`
// 开始时间:

2
src/rtsp2rtmp/web/dto/vo/base/camera/camere_vo.go
View File

@@ -39,7 +39,7 @@ type CameraShareVO struct {
// 权限码:
AuthCode string `json:"authCode"`
// 启用状态:
Enabled bool `json:"enabled"`
Enabled int `json:"enabled"`
// 创建时间:
Created time.Time `json:"created"`
// 开始时间:

2
src/rtsp2rtmp/web/dto/vo/base/camera_share/camere_share_vo.go
View File

@@ -11,7 +11,7 @@ type CameraShareVO struct {
// 权限码:
AuthCode string `json:"authCode"`
// 启用状态:
Enabled bool `json:"enabled"`
Enabled int `json:"enabled"`
// 创建时间:
Created time.Time `json:"created"`
// 开始时间:

18
src/rtsp2rtmp/web/dyn_query/dq_mysql_generator.go
View File

@@ -204,10 +204,28 @@ func (dynQuery *DynQueryMysql) makeConditionsToken(conditionExpr ConditionExpres
params = append(params, fmt.Sprintf("%s", simpleExpr.Values[0])+"%")
} else if simpleExpr.ExprType == Equal {
simpleExprTokens = append(simpleExprTokens, "=", "?")
vBool, ok := simpleExpr.Values[0].(bool)
if ok {
param := 0
if vBool {
param = 1
}
params = append(params, param)
} else {
params = append(params, simpleExpr.Values[0])
}
} else if simpleExpr.ExprType == NotEqual {
simpleExprTokens = append(simpleExprTokens, "!=", "?")
vBool, ok := simpleExpr.Values[0].(bool)
if ok {
param := 0
if vBool {
param = 1
}
params = append(params, param)
} else {
params = append(params, simpleExpr.Values[0])
}
} else if simpleExpr.ExprType == GT {
simpleExprTokens = append(simpleExprTokens, ">", "?")
params = append(params, simpleExpr.Values[0])

18
src/rtsp2rtmp/web/dyn_query/dq_postgres_generator.go
View File

@@ -203,10 +203,28 @@ func (dynQuery *DynQueryPostgres) makeConditionsToken(conditionExpr ConditionExp
params = append(params, fmt.Sprintf("%s", simpleExpr.Values[0])+"%")
} else if simpleExpr.ExprType == Equal {
simpleExprTokens = append(simpleExprTokens, "=", "?")
vBool, ok := simpleExpr.Values[0].(bool)
if ok {
param := 0
if vBool {
param = 1
}
params = append(params, param)
} else {
params = append(params, simpleExpr.Values[0])
}
} else if simpleExpr.ExprType == NotEqual {
simpleExprTokens = append(simpleExprTokens, "!=", "?")
vBool, ok := simpleExpr.Values[0].(bool)
if ok {
param := 0
if vBool {
param = 1
}
params = append(params, param)
} else {
params = append(params, simpleExpr.Values[0])
}
} else if simpleExpr.ExprType == GT {
simpleExprTokens = append(simpleExprTokens, ">", "?")
params = append(params, simpleExpr.Values[0])

14
src/rtsp2rtmp/web/task/task.go
View File

@@ -4,8 +4,10 @@ import (
"runtime/debug"
"time"
"github.com/beego/beego/v2/core/config"
"github.com/beego/beego/v2/core/logs"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/rtmpserver"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/rtspclientmanager"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web"
"github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web/common"
base_service "github.com/hkmadao/rtsp2rtmp/src/rtsp2rtmp/web/service/base"
@@ -47,6 +49,11 @@ func (t *task) offlineCamera() {
logs.Error("system painc : %v \nstack : %v", r, string(debug.Stack()))
}
}()
fgUseFfmpeg, err := config.Bool("server.use-ffmpeg")
if err != nil {
logs.Error("get use-ffmpeg fail : %v", err)
fgUseFfmpeg = false
}
for {
condition := common.GetEmptyCondition()
css, err := base_service.CameraFindCollectionByCondition(condition)
@@ -57,10 +64,17 @@ func (t *task) offlineCamera() {
if cs.OnlineStatus != 1 {
continue
}
if fgUseFfmpeg {
if exists := rtmpserver.GetSingleRtmpServer().ExistsPublisher(cs.Code); !exists {
cs.OnlineStatus = 0
base_service.CameraUpdateById(cs)
}
} else {
if exists := rtspclientmanager.GetSingleRtspClientManager().ExistsPublisher(cs.Code); !exists {
cs.OnlineStatus = 0
base_service.CameraUpdateById(cs)
}
}
}
<-time.After(10 * time.Minute)
}