Navy.gif/owncast
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix passthrough video setting

Browse Source
This commit is contained in:
Gabe Kangas 2020-06-18 21:57:02 -07:00
parent 886485255a
commit 04e8e2d82d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffmpeg.go
View File

@ -109,9 +109,16 @@ func startFfmpeg(configuration Config) {
var videoMapsString = "" var videoMapsString = ""
var audioMapsString = "" var audioMapsString = ""
var streamMappingString = "" var streamMappingString = ""
var profileString = ""
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")
streamMaps = append(streamMaps, fmt.Sprintf("v:%d,a:%d", 0, 0)) streamMaps = append(streamMaps, fmt.Sprintf("v:%d,a:%d", 0, 0))
videoMaps = append(videoMaps, "-map v:0 -c:v copy")
videoMapsString = strings.Join(videoMaps, " ")
audioMaps = append(audioMaps, "-map a:0")
audioMapsString = strings.Join(audioMaps, " ") + " -c:a copy" // Pass through audio for all the variants, don't reencode
} else { } else {
for index, quality := range configuration.VideoSettings.StreamQualities { for index, quality := range configuration.VideoSettings.StreamQualities {
maxRate := math.Floor(float64(quality.Bitrate) * 0.8) maxRate := math.Floor(float64(quality.Bitrate) * 0.8)
@ -120,6 +127,7 @@ func startFfmpeg(configuration Config) {
videoMapsString = strings.Join(videoMaps, " ") videoMapsString = strings.Join(videoMaps, " ")
audioMaps = append(audioMaps, "-map a:0") audioMaps = append(audioMaps, "-map a:0")
audioMapsString = strings.Join(audioMaps, " ") + " -c:a copy" // Pass through audio for all the variants, don't reencode audioMapsString = strings.Join(audioMaps, " ") + " -c:a copy" // Pass through audio for all the variants, don't reencode
profileString = "-profile:v high" // Main – for standard definition (SD) to 640×480, High – for high definition (HD) to 1920×1080
} }
} }
@ -141,7 +149,7 @@ func startFfmpeg(configuration Config) {
// "-r 25", // "-r 25",
"-preset " + configuration.VideoSettings.EncoderPreset, "-preset " + configuration.VideoSettings.EncoderPreset,
"-sc_threshold 0", // don't create key frames on scene change - only according to -g "-sc_threshold 0", // don't create key frames on scene change - only according to -g
"-profile:v high", // Main – for standard definition (SD) to 640×480, High – for high definition (HD) to 1920×1080 profileString,
"-movflags +faststart", "-movflags +faststart",
"-pix_fmt yuv420p", "-pix_fmt yuv420p",
"-f hls", "-f hls",