Provide public RTMP URL to runners

3 files changed, 12 insertions, 6 deletions

diff --git a/server/lib/live/shared/transcoding-wrapper/abstract-transcoding-wrapper.ts b/server/lib/live/shared/transcoding-wrapper/abstract-transcoding-wrapper.ts
index 226ba4573..ee61d7690 100644
--- a/server/lib/live/shared/transcoding-wrapper/abstract-transcoding-wrapper.ts
+++ b/server/lib/live/shared/transcoding-wrapper/abstract-transcoding-wrapper.ts
@@ -25,7 +25,9 @@ interface AbstractTranscodingWrapperOptions {
 
   lTags: LoggerTagsFn
 
-  inputUrl: string
+  inputLocalUrl: string
+  inputPublicUrl: string
+
   fps: number
   toTranscode: {
     resolution: number
@@ -50,7 +52,9 @@ abstract class AbstractTranscodingWrapper extends EventEmitter {
     fps: number
   }[]
 
-  protected readonly inputUrl: string
+  protected readonly inputLocalUrl: string
+  protected readonly inputPublicUrl: string
+
   protected readonly fps: number
   protected readonly bitrate: number
   protected readonly ratio: number
@@ -76,7 +80,9 @@ abstract class AbstractTranscodingWrapper extends EventEmitter {
     this.videoUUID = options.videoLive.Video.uuid
     this.streamingPlaylist = options.streamingPlaylist
 
-    this.inputUrl = options.inputUrl
+    this.inputLocalUrl = options.inputLocalUrl
+    this.inputPublicUrl = options.inputPublicUrl
+
     this.fps = options.fps
     this.toTranscode = options.toTranscode
 
diff --git a/server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts b/server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts
index 1f4c12bd4..c82970b88 100644
--- a/server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts
+++ b/server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts
@@ -15,7 +15,7 @@ export class FFmpegTranscodingWrapper extends AbstractTranscodingWrapper {
   async run () {
     this.ffmpegCommand = CONFIG.LIVE.TRANSCODING.ENABLED
       ? await this.buildFFmpegLive().getLiveTranscodingCommand({
-        inputUrl: this.inputUrl,
+        inputUrl: this.inputLocalUrl,
 
         outPath: this.outDirectory,
         masterPlaylistName: this.streamingPlaylist.playlistFilename,
@@ -31,7 +31,7 @@ export class FFmpegTranscodingWrapper extends AbstractTranscodingWrapper {
         hasAudio: this.hasAudio
       })
       : this.buildFFmpegLive().getLiveMuxingCommand({
-        inputUrl: this.inputUrl,
+        inputUrl: this.inputLocalUrl,
         outPath: this.outDirectory,
 
         masterPlaylistName: this.streamingPlaylist.playlistFilename,
diff --git a/server/lib/live/shared/transcoding-wrapper/remote-transcoding-wrapper.ts b/server/lib/live/shared/transcoding-wrapper/remote-transcoding-wrapper.ts
index 345eaf442..6770a5e6f 100644
--- a/server/lib/live/shared/transcoding-wrapper/remote-transcoding-wrapper.ts
+++ b/server/lib/live/shared/transcoding-wrapper/remote-transcoding-wrapper.ts
@@ -4,7 +4,7 @@ import { AbstractTranscodingWrapper } from './abstract-transcoding-wrapper'
 export class RemoteTranscodingWrapper extends AbstractTranscodingWrapper {
   async run () {
     await new LiveRTMPHLSTranscodingJobHandler().create({
-      rtmpUrl: this.inputUrl,
+      rtmpUrl: this.inputPublicUrl,
       toTranscode: this.toTranscode,
       video: this.videoLive.Video,
       outputDirectory: this.outDirectory,