LogalDeveloper/owncast
LogalDeveloper/owncast
0
Fork 0
Code

Fix crash when an invalid inbound stream is disconnected. Closes #1439 (#1483)

Browse Source
This commit is contained in:
Gabe Kangas 2021-10-21 17:21:17 -07:00 committed by GitHub
parent b50540dfe9
commit c4d2ffd834
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/streamState.go
View File

@ -106,6 +106,15 @@ func SetStreamAsDisconnected() {
_yp.Stop() _yp.Stop()
} }
// If there is no current broadcast available the previous stream
// likely failed for some reason. Don't try to append to it.
// Just transition to offline.
if _currentBroadcast == nil {
stopOnlineCleanupTimer()
transitionToOfflineVideoStreamContent()
return
}
for index := range _currentBroadcast.OutputSettings { for index := range _currentBroadcast.OutputSettings {
playlistFilePath := fmt.Sprintf(filepath.Join(config.HLSStoragePath, "%d/stream.m3u8"), index) playlistFilePath := fmt.Sprintf(filepath.Join(config.HLSStoragePath, "%d/stream.m3u8"), index)
segmentFilePath := fmt.Sprintf(filepath.Join(config.HLSStoragePath, "%d/%s"), index, offlineFilename) segmentFilePath := fmt.Sprintf(filepath.Join(config.HLSStoragePath, "%d/%s"), index, offlineFilename)

2
core/transcoder/utils.go
View File

@ -34,6 +34,7 @@ var errorMap = map[string]string{
`Unknown encoder 'h264_x264'`: "your copy of ffmpeg does not have support for the default x264 codec (h264_x264). download a version of ffmpeg that supports this.", `Unknown encoder 'h264_x264'`: "your copy of ffmpeg does not have support for the default x264 codec (h264_x264). download a version of ffmpeg that supports this.",
`Unrecognized option 'x264-params`: "your copy of ffmpeg does not have support for the default libx264 codec (h264_x264). download a version of ffmpeg that supports this.", `Unrecognized option 'x264-params`: "your copy of ffmpeg does not have support for the default libx264 codec (h264_x264). download a version of ffmpeg that supports this.",
`Failed to set value '/dev/dri/renderD128' for option 'vaapi_device': Invalid argument`: "failed to set va-api device to /dev/dri/renderD128. your system is likely not properly configured for va-api", `Failed to set value '/dev/dri/renderD128' for option 'vaapi_device': Invalid argument`: "failed to set va-api device to /dev/dri/renderD128. your system is likely not properly configured for va-api",
`Stream map 'v:0' matches no streams`: "the stream provided looks to have no video included, it may be audio-only. owncast requires a video stream.",
// Generic error for a codec // Generic error for a codec
"Unrecognized option": "error with codec. if your copy of ffmpeg or your hardware does not support your selected codec you may need to select another", "Unrecognized option": "error with codec. if your copy of ffmpeg or your hardware does not support your selected codec you may need to select another",
@ -55,6 +56,7 @@ var ignoredErrors = []string{
"maybe the hls segment duration will not precise", "maybe the hls segment duration will not precise",
"Non-monotonous DTS in output", "Non-monotonous DTS in output",
"frames duplicated", "frames duplicated",
"To ignore this",
} }
func handleTranscoderMessage(message string) { func handleTranscoderMessage(message string) {