Merge pull request #26 from richard-austin/stage_2.0.0.1_determine_hevc_codec_string

Change log.Fatalln to log.Errorln in http.go as it's not a fatal erro…
This commit is contained in:
richard-austin
2023-08-14 17:57:28 +01:00
committed by GitHub
2 changed files with 3 additions and 10 deletions

View File

@@ -5,16 +5,9 @@
"stream1": {
"audio_bitrate": "8000",
"descr": "HD",
"netcam_uri": "rtsp://192.168.1.23:554/11",
"netcam_uri": "rtsp://192.168.1.29:554/11",
"client_uri": "http://localhost:8081/live/stream?suuid=stream1",
"uri": "http://localhost:8081/ws/stream/suuid=stream1"
},
"stream2": {
"audio_bitrate": "0",
"descr": "SD",
"netcam_uri": "rtsp://192.168.1.23:554/12",
"client_uri": "http://localhost:8081/live/stream?suuid=stream2",
"uri": "http://localhost:8081/ws/stream/suuid=stream2"
}
}
}

View File

@@ -17,7 +17,7 @@ var streams = NewStreams()
ReadBox
Sometimes the ftyp and moov atoms at the start of the stream from ffmpeg are combined in one packet. This
function separates them if this occurs, so they can be put in their respective places and the moov
atom analyes to get the codec data. THis is only used to handle those first two messages. From then on it doesn't
atom analysis to get the codec data. THis is only used to handle those first two messages. From then on it doesn't
matter if messages get appended to each other as they are going straight to mse (or ffmpeg for recordings)
*/
@@ -183,7 +183,7 @@ func serveHTTP() {
addr := fmt.Sprintf(":%d", config.ServerPort)
err := router.Run(addr)
if err != nil {
log.Fatalln(err)
log.Errorln(err)
}
}