Browse Source

Make setting the segment length optional

pull/68/head
Gabe Kangas 5 years ago
parent
commit
d51901e191
  1. 1
      config-example.yaml
  2. 9
      config/config.go
  3. 2
      core/ffmpeg/transcoder.go

1
config-example.yaml

@ -31,7 +31,6 @@ instanceDetails: @@ -31,7 +31,6 @@ instanceDetails:
url: http://soundcloud.com/owncast
videoSettings:
chunkLengthInSeconds: 4
streamingKey: abc123
offlineContent: static/offline.m4v # Is displayed when a stream ends

9
config/config.go

@ -155,6 +155,15 @@ func (c *config) GetFFMpegPath() string { @@ -155,6 +155,15 @@ func (c *config) GetFFMpegPath() string {
return path
}
func (c *config) GetVideoSegmentSecondsLength() int {
if c.VideoSettings.ChunkLengthInSeconds != 0 {
return c.VideoSettings.ChunkLengthInSeconds
}
// Default
return 4
}
//Load tries to load the configuration file
func Load(filePath string, versionInfo string) error {
Config = new(config)

2
core/ffmpeg/transcoder.go

@ -190,7 +190,7 @@ func NewTranscoder() Transcoder { @@ -190,7 +190,7 @@ func NewTranscoder() Transcoder {
transcoder.playlistOutputPath = config.Config.PublicHLSPath
transcoder.input = utils.GetTemporaryPipePath()
transcoder.segmentLengthSeconds = config.Config.VideoSettings.ChunkLengthInSeconds
transcoder.segmentLengthSeconds = config.Config.GetVideoSegmentSecondsLength()
qualities := config.Config.VideoSettings.StreamQualities
if len(qualities) == 0 {

Loading…
Cancel
Save