Improve target bitrate calculation

2 files changed, 16 insertions, 6 deletions

diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts
index b19ecef6f..2a429fb33 100644
--- a/server/lib/live/live-manager.ts
+++ b/server/lib/live/live-manager.ts
@@ -202,7 +202,7 @@ class LiveManager {
     const now = Date.now()
     const probe = await ffprobePromise(rtmpUrl)
 
-    const [ { videoFileResolution }, fps, bitrate ] = await Promise.all([
+    const [ { resolution, ratio }, fps, bitrate ] = await Promise.all([
       getVideoFileResolution(rtmpUrl, probe),
       getVideoFileFPS(rtmpUrl, probe),
       getVideoFileBitrate(rtmpUrl, probe)
@@ -210,13 +210,13 @@ class LiveManager {
 
     logger.info(
       '%s probing took %d ms (bitrate: %d, fps: %d, resolution: %d)',
-      rtmpUrl, Date.now() - now, bitrate, fps, videoFileResolution, lTags(sessionId, video.uuid)
+      rtmpUrl, Date.now() - now, bitrate, fps, resolution, lTags(sessionId, video.uuid)
     )
 
-    const allResolutions = this.buildAllResolutionsToTranscode(videoFileResolution)
+    const allResolutions = this.buildAllResolutionsToTranscode(resolution)
 
     logger.info(
-      'Will mux/transcode live video of original resolution %d.', videoFileResolution,
+      'Will mux/transcode live video of original resolution %d.', resolution,
       { allResolutions, ...lTags(sessionId, video.uuid) }
     )
 
@@ -229,6 +229,7 @@ class LiveManager {
       rtmpUrl,
       fps,
       bitrate,
+      ratio,
       allResolutions
     })
   }
@@ -240,9 +241,10 @@ class LiveManager {
     rtmpUrl: string
     fps: number
     bitrate: number
+    ratio: number
     allResolutions: number[]
   }) {
-    const { sessionId, videoLive, streamingPlaylist, allResolutions, fps, bitrate, rtmpUrl } = options
+    const { sessionId, videoLive, streamingPlaylist, allResolutions, fps, bitrate, ratio, rtmpUrl } = options
     const videoUUID = videoLive.Video.uuid
     const localLTags = lTags(sessionId, videoUUID)
 
@@ -257,6 +259,7 @@ class LiveManager {
       streamingPlaylist,
       rtmpUrl,
       bitrate,
+      ratio,
       fps,
       allResolutions
     })
diff --git a/server/lib/live/shared/muxing-session.ts b/server/lib/live/shared/muxing-session.ts
index 62708b14b..a80abc843 100644
--- a/server/lib/live/shared/muxing-session.ts
+++ b/server/lib/live/shared/muxing-session.ts
@@ -54,9 +54,11 @@ class MuxingSession extends EventEmitter {
   private readonly streamingPlaylist: MStreamingPlaylistVideo
   private readonly rtmpUrl: string
   private readonly fps: number
-  private readonly bitrate: number
   private readonly allResolutions: number[]
 
+  private readonly bitrate: number
+  private readonly ratio: number
+
   private readonly videoId: number
   private readonly videoUUID: string
   private readonly saveReplay: boolean
@@ -85,6 +87,7 @@ class MuxingSession extends EventEmitter {
     rtmpUrl: string
     fps: number
     bitrate: number
+    ratio: number
     allResolutions: number[]
   }) {
     super()
@@ -96,7 +99,10 @@ class MuxingSession extends EventEmitter {
     this.streamingPlaylist = options.streamingPlaylist
     this.rtmpUrl = options.rtmpUrl
     this.fps = options.fps
+
     this.bitrate = options.bitrate
+    this.ratio = options.bitrate
+
     this.allResolutions = options.allResolutions
 
     this.videoId = this.videoLive.Video.id
@@ -122,6 +128,7 @@ class MuxingSession extends EventEmitter {
         resolutions: this.allResolutions,
         fps: this.fps,
         bitrate: this.bitrate,
+        ratio: this.ratio,
 
         availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(),
         profile: CONFIG.LIVE.TRANSCODING.PROFILE