RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2025-02-20 13:36:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

new parameter readBufferCount

Browse Source
This commit is contained in:
aler9 2021-01-10 12:55:53 +01:00
parent 9b20f53119
commit 97305af272
10 changed files with 132 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/clientman/clientman.go
View File

@ -29,7 +29,7 @@ type ClientManager struct {
protocols map[base.StreamProtocol]struct{}
stats *stats.Stats
pathMan *pathman.PathManager
serverTCP *serverplain.Server
serverPlain *serverplain.Server
serverTLS *servertls.Server
parent Parent
@ -53,7 +53,7 @@ func New(
protocols map[base.StreamProtocol]struct{},
stats *stats.Stats,
pathMan *pathman.PathManager,
serverTCP *serverplain.Server,
serverPlain *serverplain.Server,
serverTLS *servertls.Server,
parent Parent) *ClientManager {
@ -65,7 +65,7 @@ func New(
protocols: protocols,
stats: stats,
pathMan: pathMan,
serverTCP: serverTCP,
serverPlain: serverPlain,
serverTLS: serverTLS,
parent: parent,
clients: make(map[*client.Client]struct{}),
@ -93,8 +93,8 @@ func (cm *ClientManager) run() {
defer close(cm.done)
tcpAccept := func() chan *gortsplib.ServerConn {
if cm.serverTCP != nil {
return cm.serverTCP.Accept()
if cm.serverPlain != nil {
return cm.serverPlain.Accept()
}
return make(chan *gortsplib.ServerConn)
}()

4
internal/conf/conf.go
View File

@ -44,6 +44,7 @@ type Conf struct {
AuthMethodsParsed []headers.AuthMethod `yaml:"-" json:"-"`
ReadTimeout time.Duration `yaml:"readTimeout"`
WriteTimeout time.Duration `yaml:"writeTimeout"`
ReadBufferCount uint64 `yaml:"readBufferCount"`
Metrics bool `yaml:"metrics"`
Pprof bool `yaml:"pprof"`
RunOnConnect string `yaml:"runOnConnect"`
@ -182,6 +183,9 @@ func (conf *Conf) fillAndCheck() error {
if conf.WriteTimeout == 0 {
conf.WriteTimeout = 10 * time.Second
}
if conf.ReadBufferCount == 0 {
conf.ReadBufferCount = 512
}
if len(conf.Paths) == 0 {
conf.Paths = map[string]*PathConf{

10
internal/confenv/confenv.go
View File

@ -41,6 +41,16 @@ func load(env map[string]string, envKey string, rv reflect.Value) error {
}
return nil
case reflect.Uint64:
if ev, ok := env[envKey]; ok {
iv, err := strconv.ParseUint(ev, 10, 64)
if err != nil {
return fmt.Errorf("%s: %s", envKey, err)
}
rv.SetUint(iv)
}
return nil
case reflect.Bool:
if ev, ok := env[envKey]; ok {
switch strings.ToLower(ev) {

38
internal/path/path.go
View File

@ -140,15 +140,16 @@ const (
// Path is a path.
type Path struct {
rtspPort int
readTimeout time.Duration
writeTimeout time.Duration
confName string
conf *conf.PathConf
name string
wg *sync.WaitGroup
stats *stats.Stats
parent Parent
rtspPort int
readTimeout time.Duration
writeTimeout time.Duration
readBufferCount uint64
confName string
conf *conf.PathConf
name string
wg *sync.WaitGroup
stats *stats.Stats
parent Parent
clients map[*client.Client]clientState
clientsWg sync.WaitGroup
@ -185,6 +186,7 @@ func New(
rtspPort int,
readTimeout time.Duration,
writeTimeout time.Duration,
readBufferCount uint64,
confName string,
conf *conf.PathConf,
name string,
@ -196,6 +198,7 @@ func New(
rtspPort: rtspPort,
readTimeout: readTimeout,
writeTimeout: writeTimeout,
readBufferCount: readBufferCount,
confName: confName,
conf: conf,
name: name,
@ -482,11 +485,22 @@ func (pa *Path) hasExternalSource() bool {
func (pa *Path) startExternalSource() {
if strings.HasPrefix(pa.conf.Source, "rtsp://") ||
strings.HasPrefix(pa.conf.Source, "rtsps://") {
pa.source = sourcertsp.New(pa.conf.Source, pa.conf.SourceProtocolParsed,
pa.readTimeout, pa.writeTimeout, &pa.sourceWg, pa.stats, pa)
pa.source = sourcertsp.New(
pa.conf.Source,
pa.conf.SourceProtocolParsed,
pa.readTimeout,
pa.writeTimeout,
pa.readBufferCount,
&pa.sourceWg,
pa.stats,
pa)
} else if strings.HasPrefix(pa.conf.Source, "rtmp://") {
pa.source = sourcertmp.New(pa.conf.Source, &pa.sourceWg, pa.stats, pa)
pa.source = sourcertmp.New(
pa.conf.Source,
&pa.sourceWg,
pa.stats,
pa)
}
}

56
internal/pathman/pathman.go
View File

@ -23,13 +23,14 @@ type Parent interface {
// PathManager is a path.Path manager.
type PathManager struct {
rtspPort int
readTimeout time.Duration
writeTimeout time.Duration
authMethods []headers.AuthMethod
pathConfs map[string]*conf.PathConf
stats *stats.Stats
parent Parent
rtspPort int
readTimeout time.Duration
writeTimeout time.Duration
readBufferCount uint64
authMethods []headers.AuthMethod
pathConfs map[string]*conf.PathConf
stats *stats.Stats
parent Parent
paths map[string]*path.Path
wg sync.WaitGroup
@ -52,6 +53,7 @@ func New(
rtspPort int,
readTimeout time.Duration,
writeTimeout time.Duration,
readBufferCount uint64,
authMethods []headers.AuthMethod,
pathConfs map[string]*conf.PathConf,
stats *stats.Stats,
@ -61,6 +63,7 @@ func New(
rtspPort: rtspPort,
readTimeout: readTimeout,
writeTimeout: writeTimeout,
readBufferCount: readBufferCount,
authMethods: authMethods,
pathConfs: pathConfs,
stats: stats,
@ -160,8 +163,17 @@ outer:
// create path if it doesn't exist
if _, ok := pm.paths[req.PathName]; !ok {
pa := path.New(pm.rtspPort, pm.readTimeout, pm.writeTimeout,
pathName, pathConf, req.PathName, &pm.wg, pm.stats, pm)
pa := path.New(
pm.rtspPort,
pm.readTimeout,
pm.writeTimeout,
pm.readBufferCount,
pathName,
pathConf,
req.PathName,
&pm.wg,
pm.stats,
pm)
pm.paths[req.PathName] = pa
}
@ -183,8 +195,17 @@ outer:
// create path if it doesn't exist
if _, ok := pm.paths[req.PathName]; !ok {
pa := path.New(pm.rtspPort, pm.readTimeout, pm.writeTimeout,
pathName, pathConf, req.PathName, &pm.wg, pm.stats, pm)
pa := path.New(
pm.rtspPort,
pm.readTimeout,
pm.writeTimeout,
pm.readBufferCount,
pathName,
pathConf,
req.PathName,
&pm.wg,
pm.stats,
pm)
pm.paths[req.PathName] = pa
}
@ -257,8 +278,17 @@ outer:
func (pm *PathManager) createPaths() {
for pathName, pathConf := range pm.pathConfs {
if _, ok := pm.paths[pathName]; !ok && pathConf.Regexp == nil {
pa := path.New(pm.rtspPort, pm.readTimeout, pm.writeTimeout,
pathName, pathConf, pathName, &pm.wg, pm.stats, pm)
pa := path.New(
pm.rtspPort,
pm.readTimeout,
pm.writeTimeout,
pm.readBufferCount,
pathName,
pathConf,
pathName,
&pm.wg,
pm.stats,
pm)
pm.paths[pathName] = pa
}
}

2
internal/serverplain/server.go
View File

@ -29,6 +29,7 @@ type Server struct {
func New(port int,
readTimeout time.Duration,
writeTimeout time.Duration,
readBufferCount uint64,
udpRTPListener *gortsplib.ServerUDPListener,
udpRTCPListener *gortsplib.ServerUDPListener,
parent Parent) (*Server, error) {
@ -36,6 +37,7 @@ func New(port int,
conf := gortsplib.ServerConf{
ReadTimeout: readTimeout,
WriteTimeout: writeTimeout,
ReadBufferCount: readBufferCount,
UDPRTPListener: udpRTPListener,
UDPRTCPListener: udpRTCPListener,
}

8
internal/servertls/server.go
View File

@ -30,6 +30,7 @@ type Server struct {
func New(port int,
readTimeout time.Duration,
writeTimeout time.Duration,
readBufferCount uint64,
serverKey string,
serverCert string,
parent Parent) (*Server, error) {
@ -40,9 +41,10 @@ func New(port int,
}
conf := gortsplib.ServerConf{
TLSConfig: &tls.Config{Certificates: []tls.Certificate{cert}},
ReadTimeout: readTimeout,
WriteTimeout: writeTimeout,
TLSConfig: &tls.Config{Certificates: []tls.Certificate{cert}},
ReadTimeout: readTimeout,
WriteTimeout: writeTimeout,
ReadBufferCount: readBufferCount,
}
srv, err := conf.Serve(":" + strconv.FormatInt(int64(port), 10))

35
internal/sourcertsp/source.go
View File

@ -26,13 +26,14 @@ type Parent interface {
// Source is a RTSP source.
type Source struct {
ur string
proto *gortsplib.StreamProtocol
readTimeout time.Duration
writeTimeout time.Duration
wg *sync.WaitGroup
stats *stats.Stats
parent Parent
ur string
proto *gortsplib.StreamProtocol
readTimeout time.Duration
writeTimeout time.Duration
readBufferCount uint64
wg *sync.WaitGroup
stats *stats.Stats
parent Parent
// in
terminate chan struct{}
@ -43,18 +44,20 @@ func New(ur string,
proto *gortsplib.StreamProtocol,
readTimeout time.Duration,
writeTimeout time.Duration,
readBufferCount uint64,
wg *sync.WaitGroup,
stats *stats.Stats,
parent Parent) *Source {
s := &Source{
ur: ur,
proto: proto,
readTimeout: readTimeout,
writeTimeout: writeTimeout,
wg: wg,
stats: stats,
parent: parent,
terminate: make(chan struct{}),
ur: ur,
proto: proto,
readTimeout: readTimeout,
writeTimeout: writeTimeout,
readBufferCount: readBufferCount,
wg: wg,
stats: stats,
parent: parent,
terminate: make(chan struct{}),
}
atomic.AddInt64(s.stats.CountSourcesRtsp, +1)
@ -121,7 +124,7 @@ func (s *Source) runInner() bool {
StreamProtocol: s.proto,
ReadTimeout: s.readTimeout,
WriteTimeout: s.writeTimeout,
ReadBufferCount: 1024,
ReadBufferCount: s.readBufferCount,
OnRequest: func(req *base.Request) {
s.log(logger.Debug, "c->s %v", req)
},

22
main.go
View File

@ -34,7 +34,7 @@ type program struct {
pprof *pprof.Pprof
serverUDPRTP *gortsplib.ServerUDPListener
serverUDPRTCP *gortsplib.ServerUDPListener
serverTCP *serverplain.Server
serverPlain *serverplain.Server
serverTLS *servertls.Server
pathMan *pathman.PathManager
clientMan *clientman.ClientManager
@ -202,12 +202,13 @@ func (p *program) createResources(initial bool) error {
}
}
if p.serverTCP == nil {
if p.serverPlain == nil {
if p.conf.EncryptionParsed == conf.EncryptionNo || p.conf.EncryptionParsed == conf.EncryptionOptional {
p.serverTCP, err = serverplain.New(
p.serverPlain, err = serverplain.New(
p.conf.RtspPort,
p.conf.ReadTimeout,
p.conf.WriteTimeout,
p.conf.ReadBufferCount,
p.serverUDPRTP,
p.serverUDPRTCP,
p)
@ -223,6 +224,7 @@ func (p *program) createResources(initial bool) error {
p.conf.RtspsPort,
p.conf.ReadTimeout,
p.conf.WriteTimeout,
p.conf.ReadBufferCount,
p.conf.ServerKey,
p.conf.ServerCert,
p)
@ -237,6 +239,7 @@ func (p *program) createResources(initial bool) error {
p.conf.RtspPort,
p.conf.ReadTimeout,
p.conf.WriteTimeout,
p.conf.ReadBufferCount,
p.conf.AuthMethodsParsed,
p.conf.Paths,
p.stats,
@ -252,7 +255,7 @@ func (p *program) createResources(initial bool) error {
p.conf.ProtocolsParsed,
p.stats,
p.pathMan,
p.serverTCP,
p.serverPlain,
p.serverTLS,
p)
}
@ -302,6 +305,7 @@ func (p *program) closeResources(newConf *conf.Conf) {
newConf.RtspPort != p.conf.RtspPort ||
newConf.ReadTimeout != p.conf.ReadTimeout ||
newConf.WriteTimeout != p.conf.WriteTimeout ||
newConf.ReadBufferCount != p.conf.ReadBufferCount ||
closeServerUDPRTP ||
closeServerUDPRTCP {
closeServerPlain = true
@ -312,7 +316,8 @@ func (p *program) closeResources(newConf *conf.Conf) {
newConf.EncryptionParsed != p.conf.EncryptionParsed ||
newConf.RtspsPort != p.conf.RtspsPort ||
newConf.ReadTimeout != p.conf.ReadTimeout ||
newConf.WriteTimeout != p.conf.WriteTimeout {
newConf.WriteTimeout != p.conf.WriteTimeout ||
newConf.ReadBufferCount != p.conf.ReadBufferCount {
closeServerTLS = true
}
@ -321,6 +326,7 @@ func (p *program) closeResources(newConf *conf.Conf) {
newConf.RtspPort != p.conf.RtspPort ||
newConf.ReadTimeout != p.conf.ReadTimeout ||
newConf.WriteTimeout != p.conf.WriteTimeout ||
newConf.ReadBufferCount != p.conf.ReadBufferCount ||
!reflect.DeepEqual(newConf.AuthMethodsParsed, p.conf.AuthMethodsParsed) {
closePathMan = true
} else if !reflect.DeepEqual(newConf.Paths, p.conf.Paths) {
@ -360,9 +366,9 @@ func (p *program) closeResources(newConf *conf.Conf) {
p.serverTLS = nil
}
if closeServerPlain && p.serverTCP != nil {
p.serverTCP.Close()
p.serverTCP = nil
if closeServerPlain && p.serverPlain != nil {
p.serverPlain.Close()
p.serverPlain = nil
}
if closeServerUDPRTCP && p.serverUDPRTCP != nil {

4
rtsp-simple-server.yml
View File

@ -33,6 +33,10 @@ authMethods: [basic, digest]
readTimeout: 10s
# timeout of write operations.
writeTimeout: 10s
# number of read buffers.
# a higher number allows a higher throughput,
# a lower number allows to save RAM.
readBufferCount: 512
# enable Prometheus-compatible metrics on port 9998.
metrics: no