Browse Source

Remove hardcoded urls

pull/5/head
Gabe Kangas 5 years ago
parent
commit
d9ce2c0575
  1. 4
      ffmpeg.go
  2. 4
      webroot/index.html

4
ffmpeg.go

@ -40,11 +40,9 @@ func startFfmpeg(configuration Config) {
var streamMappingString = "" var streamMappingString = ""
if configuration.VideoSettings.EnablePassthrough || len(configuration.VideoSettings.StreamQualities) == 0 { if configuration.VideoSettings.EnablePassthrough || len(configuration.VideoSettings.StreamQualities) == 0 {
fmt.Println("Enabling passthrough video") fmt.Println("Enabling passthrough video")
// videoMaps = append(videoMaps, fmt.Sprintf("-map 0:v -c:v copy"))
streamMaps = append(streamMaps, fmt.Sprintf("v:%d,a:%d", 0, 0)) streamMaps = append(streamMaps, fmt.Sprintf("v:%d,a:%d", 0, 0))
} else { } else {
for index, quality := range configuration.VideoSettings.StreamQualities { for index, quality := range configuration.VideoSettings.StreamQualities {
// minRate := math.Floor(float64(quality.Bitrate) / 2)
maxRate := math.Floor(float64(quality.Bitrate) * 0.8) maxRate := math.Floor(float64(quality.Bitrate) * 0.8)
videoMaps = append(videoMaps, fmt.Sprintf("-map v:0 -c:v:%d libx264 -b:v:%d %dk -maxrate %dk -bufsize %dk", index, index, int(quality.Bitrate), int(maxRate), int(maxRate))) videoMaps = append(videoMaps, fmt.Sprintf("-map v:0 -c:v:%d libx264 -b:v:%d %dk -maxrate %dk -bufsize %dk", index, index, int(quality.Bitrate), int(maxRate), int(maxRate)))
streamMaps = append(streamMaps, fmt.Sprintf("v:%d,a:%d", index, index)) streamMaps = append(streamMaps, fmt.Sprintf("v:%d,a:%d", index, index))
@ -54,7 +52,7 @@ func startFfmpeg(configuration Config) {
} }
} }
framerate := 30 framerate := 25
streamMappingString = "-var_stream_map \"" + strings.Join(streamMaps, " ") + "\"" streamMappingString = "-var_stream_map \"" + strings.Join(streamMaps, " ") + "\""
ffmpegFlags := []string{ ffmpegFlags := []string{

4
webroot/index.html

@ -59,10 +59,10 @@
autoplay autoplay
playsinline playsinline
muted muted
poster="https://goth.land/thumbnail.png" poster="/thumbnail.png"
data-setup='{}' data-setup='{}'
> >
<source src="https://goth.land/hls/stream.m3u8" type="application/x-mpegURL"/> <source src="hls/stream.m3u8" type="application/x-mpegURL"/>
</video> </video>
</div> </div>

Loading…
Cancel
Save