Browse Source

Allow unique streampipe fifos. Closes #883

pull/884/head
Gabe Kangas 5 years ago
parent
commit
64a5720a21
  1. 2
      core/rtmp/rtmp.go
  2. 2
      core/transcoder/transcoder.go
  3. 4
      utils/utils.go

2
core/rtmp/rtmp.go

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

2
core/transcoder/transcoder.go

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

4
utils/utils.go

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

Loading…
Cancel
Save