aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-10-11 16:00:39 +0200
committerChocobozzz <me@florianbigard.com>2021-10-11 16:00:39 +0200
commitbadacdbb4a3e4a1aae4d324abc496be8e261b2ef (patch)
treef583a77e978138e72ec77e065856872e44e41682 /server
parente5d9877f0640e72653f6d88c743ee331dba6dc5b (diff)
parent41085b1583ade5ea1bb1d69965a62b98cf012209 (diff)
downloadPeerTube-badacdbb4a3e4a1aae4d324abc496be8e261b2ef.tar.gz
PeerTube-badacdbb4a3e4a1aae4d324abc496be8e261b2ef.tar.zst
PeerTube-badacdbb4a3e4a1aae4d324abc496be8e261b2ef.zip
Merge branch 'release/3.4.0' into develop
Diffstat (limited to 'server')
-rw-r--r--server/lib/live/shared/muxing-session.ts2
-rw-r--r--server/lib/transcoding/video-transcoding-profiles.ts5
2 files changed, 5 insertions, 2 deletions
diff --git a/server/lib/live/shared/muxing-session.ts b/server/lib/live/shared/muxing-session.ts
index a6907142d..b52363af7 100644
--- a/server/lib/live/shared/muxing-session.ts
+++ b/server/lib/live/shared/muxing-session.ts
@@ -101,7 +101,7 @@ class MuxingSession extends EventEmitter {
101 this.fps = options.fps 101 this.fps = options.fps
102 102
103 this.bitrate = options.bitrate 103 this.bitrate = options.bitrate
104 this.ratio = options.bitrate 104 this.ratio = options.ratio
105 105
106 this.allResolutions = options.allResolutions 106 this.allResolutions = options.allResolutions
107 107
diff --git a/server/lib/transcoding/video-transcoding-profiles.ts b/server/lib/transcoding/video-transcoding-profiles.ts
index bf1b8769b..92971210c 100644
--- a/server/lib/transcoding/video-transcoding-profiles.ts
+++ b/server/lib/transcoding/video-transcoding-profiles.ts
@@ -237,5 +237,8 @@ export {
237function capBitrate (inputBitrate: number, targetBitrate: number) { 237function capBitrate (inputBitrate: number, targetBitrate: number) {
238 if (!inputBitrate) return targetBitrate 238 if (!inputBitrate) return targetBitrate
239 239
240 return Math.min(targetBitrate, inputBitrate) 240 // Add 30% margin to input bitrate
241 const inputBitrateWithMargin = inputBitrate + (inputBitrate * 0.3)
242
243 return Math.min(targetBitrate, inputBitrateWithMargin)
241} 244}