mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-25 06:12:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow unique streampipe fifos. Closes #883

Browse source
This commit is contained in:
Gabe Kangas 2021-04-01 18:56:00 -07:00
parent d4d738a8ae
commit 64a5720a21
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/rtmp/rtmp.go
View file

@ -89,7 +89,7 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) {
log.Infoln("Inbound stream connected.") log.Infoln("Inbound stream connected.")
_setStreamAsConnected() _setStreamAsConnected()
pipePath := utils.GetTemporaryPipePath() pipePath := utils.GetTemporaryPipePath(fmt.Sprint(data.GetRTMPPortNumber()))
if !utils.DoesFileExists(pipePath) { if !utils.DoesFileExists(pipePath) {
err := syscall.Mkfifo(pipePath, 0666) err := syscall.Mkfifo(pipePath, 0666)
if err != nil { if err != nil {

2
core/transcoder/transcoder.go
View file

@ -216,7 +216,7 @@ func NewTranscoder() *Transcoder {
// Playlists are available via the local HTTP server // Playlists are available via the local HTTP server
transcoder.playlistOutputPath = config.PublicHLSStoragePath transcoder.playlistOutputPath = config.PublicHLSStoragePath
transcoder.input = utils.GetTemporaryPipePath() transcoder.input = utils.GetTemporaryPipePath(fmt.Sprint(data.GetRTMPPortNumber()))
for index, quality := range transcoder.currentStreamOutputSettings { for index, quality := range transcoder.currentStreamOutputSettings {
variant := getVariantFromConfigQuality(quality, index) variant := getVariantFromConfigQuality(quality, index)

4
utils/utils.go
View file

@ -21,8 +21,8 @@ import (
) )
// GetTemporaryPipePath gets the temporary path for the streampipe.flv file. // GetTemporaryPipePath gets the temporary path for the streampipe.flv file.
func GetTemporaryPipePath() string { func GetTemporaryPipePath(identifier string) string {
return filepath.Join(os.TempDir(), "streampipe.flv") return filepath.Join(os.TempDir(), "streampipe."+identifier)
} }
// DoesFileExists checks if the file exists. // DoesFileExists checks if the file exists.