OPC/mediamtx
2
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

normalize configuration (#2399)

Browse Source
This commit is contained in:
Alessandro Ros
2023-09-23 12:48:34 +02:00
committed by GitHub
parent 1f11d95059
commit 3a7d86ec03
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/conf/path.go
+2 -2
View File
@@ -67,8 +67,8 @@ type PathConf struct {
// RTSP
SourceProtocol SourceProtocol `json:"sourceProtocol"`
SourceAnyPortEnable bool `json:"sourceAnyPortEnable"`
RtspRangeType RtspRangeType `json:"rtspRangeType"`
RtspRangeStart string `json:"rtspRangeStart"`
RTSPRangeType RTSPRangeType `json:"rtspRangeType"`
RTSPRangeStart string `json:"rtspRangeStart"`
// Redirect
SourceRedirect string `json:"sourceRedirect"`
internal/conf/rtsp_range_type.go
+17 -17
View File
@@ -5,32 +5,32 @@ import (
"fmt"
)
// RtspRangeType is the type used in the Range header.
type RtspRangeType int
// RTSPRangeType is the type used in the Range header.
type RTSPRangeType int
// supported rtsp range types.
const (
RtspRangeTypeUndefined RtspRangeType = iota
RtspRangeTypeClock
RtspRangeTypeNPT
RtspRangeTypeSMPTE
RTSPRangeTypeUndefined RTSPRangeType = iota
RTSPRangeTypeClock
RTSPRangeTypeNPT
RTSPRangeTypeSMPTE
)
// MarshalJSON implements json.Marshaler.
func (d RtspRangeType) MarshalJSON() ([]byte, error) {
func (d RTSPRangeType) MarshalJSON() ([]byte, error) {
var out string
switch d {
case RtspRangeTypeClock:
case RTSPRangeTypeClock:
out = "clock"
case RtspRangeTypeNPT:
case RTSPRangeTypeNPT:
out = "npt"
case RtspRangeTypeSMPTE:
case RTSPRangeTypeSMPTE:
out = "smpte"
case RtspRangeTypeUndefined:
case RTSPRangeTypeUndefined:
out = ""
default:
@@ -41,7 +41,7 @@ func (d RtspRangeType) MarshalJSON() ([]byte, error) {
}
// UnmarshalJSON implements json.Unmarshaler.
func (d *RtspRangeType) UnmarshalJSON(b []byte) error {
func (d *RTSPRangeType) UnmarshalJSON(b []byte) error {
var in string
if err := json.Unmarshal(b, &in); err != nil {
return err
@@ -49,16 +49,16 @@ func (d *RtspRangeType) UnmarshalJSON(b []byte) error {
switch in {
case "clock":
*d = RtspRangeTypeClock
*d = RTSPRangeTypeClock
case "npt":
*d = RtspRangeTypeNPT
*d = RTSPRangeTypeNPT
case "smpte":
*d = RtspRangeTypeSMPTE
*d = RTSPRangeTypeSMPTE
case "":
*d = RtspRangeTypeUndefined
*d = RTSPRangeTypeUndefined
default:
return fmt.Errorf("invalid rtsp range type: '%s'", in)
@@ -68,6 +68,6 @@ func (d *RtspRangeType) UnmarshalJSON(b []byte) error {
}
// UnmarshalEnv implements envUnmarshaler.
func (d *RtspRangeType) UnmarshalEnv(s string) error {
func (d *RTSPRangeType) UnmarshalEnv(s string) error {
return d.UnmarshalJSON([]byte(`"` + s + `"`))
}
internal/core/rtsp_source.go
+7 -7
View File
@@ -15,9 +15,9 @@ import (
)
func createRangeHeader(cnf *conf.PathConf) (*headers.Range, error) {
switch cnf.RtspRangeType {
case conf.RtspRangeTypeClock:
start, err := time.Parse("20060102T150405Z", cnf.RtspRangeStart)
switch cnf.RTSPRangeType {
case conf.RTSPRangeTypeClock:
start, err := time.Parse("20060102T150405Z", cnf.RTSPRangeStart)
if err != nil {
return nil, err
}
@@ -28,8 +28,8 @@ func createRangeHeader(cnf *conf.PathConf) (*headers.Range, error) {
},
}, nil
case conf.RtspRangeTypeNPT:
start, err := time.ParseDuration(cnf.RtspRangeStart)
case conf.RTSPRangeTypeNPT:
start, err := time.ParseDuration(cnf.RTSPRangeStart)
if err != nil {
return nil, err
}
@@ -40,8 +40,8 @@ func createRangeHeader(cnf *conf.PathConf) (*headers.Range, error) {
},
}, nil
case conf.RtspRangeTypeSMPTE:
start, err := time.ParseDuration(cnf.RtspRangeStart)
case conf.RTSPRangeTypeSMPTE:
start, err := time.ParseDuration(cnf.RTSPRangeStart)
if err != nil {
return nil, err
}