Browse Source

move 'srtReadPassphrase' into the right section (#2435)

pull/2428/head
Alessandro Ros 2 years ago committed by GitHub
parent
commit
2d929e1132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      apidocs/openapi.yaml
  2. 2
      internal/conf/path.go
  3. 7
      mediamtx.yml

4
apidocs/openapi.yaml

@ -213,6 +213,8 @@ components:
type: string type: string
maxReaders: maxReaders:
type: integer type: integer
srtReadPassphrase:
type: string
record: record:
type: boolean type: boolean
@ -241,8 +243,6 @@ components:
type: string type: string
srtPublishPassphrase: srtPublishPassphrase:
type: string type: string
srtReadPassphrase:
type: string
# RTSP # RTSP
sourceProtocol: sourceProtocol:

2
internal/conf/path.go

@ -59,6 +59,7 @@ type PathConf struct {
SourceOnDemandStartTimeout StringDuration `json:"sourceOnDemandStartTimeout"` SourceOnDemandStartTimeout StringDuration `json:"sourceOnDemandStartTimeout"`
SourceOnDemandCloseAfter StringDuration `json:"sourceOnDemandCloseAfter"` SourceOnDemandCloseAfter StringDuration `json:"sourceOnDemandCloseAfter"`
MaxReaders int `json:"maxReaders"` MaxReaders int `json:"maxReaders"`
SRTReadPassphrase string `json:"srtReadPassphrase"`
Record bool `json:"record"` Record bool `json:"record"`
// Authentication // Authentication
@ -74,7 +75,6 @@ type PathConf struct {
DisablePublisherOverride bool `json:"disablePublisherOverride"` // deprecated DisablePublisherOverride bool `json:"disablePublisherOverride"` // deprecated
Fallback string `json:"fallback"` Fallback string `json:"fallback"`
SRTPublishPassphrase string `json:"srtPublishPassphrase"` SRTPublishPassphrase string `json:"srtPublishPassphrase"`
SRTReadPassphrase string `json:"srtReadPassphrase"`
// RTSP // RTSP
SourceProtocol SourceProtocol `json:"sourceProtocol"` SourceProtocol SourceProtocol `json:"sourceProtocol"`

7
mediamtx.yml

@ -1,4 +1,3 @@
############################################### ###############################################
# General settings # General settings
@ -306,6 +305,8 @@ paths:
sourceOnDemandCloseAfter: 10s sourceOnDemandCloseAfter: 10s
# Maximum number of readers. Zero means no limit. # Maximum number of readers. Zero means no limit.
maxReaders: 0 maxReaders: 0
# SRT encryption passphrase require to read from this path
srtReadPassphrase:
# Record streams to disk (if global recording is enabled). # Record streams to disk (if global recording is enabled).
record: yes record: yes
@ -338,10 +339,8 @@ paths:
# if no one is publishing, redirect readers to this path. # if no one is publishing, redirect readers to this path.
# It can be can be a relative path (i.e. /otherstream) or an absolute RTSP URL. # It can be can be a relative path (i.e. /otherstream) or an absolute RTSP URL.
fallback: fallback:
# SRT encryption passphrase required to publish on this path # SRT encryption passphrase required to publish to this path
srtPublishPassphrase: srtPublishPassphrase:
# SRT encryption passphrase require to read from this path
srtReadPassphrase:
############################################### ###############################################
# RTSP path settings (when source is a RTSP or a RTSPS URL) # RTSP path settings (when source is a RTSP or a RTSPS URL)

Loading…
Cancel
Save