OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release/3.4.0' into develop

pull/4461/head
Chocobozzz 2021-10-11 16:00:39 +02:00
parent e5d9877f06 41085b1583
commit badacdbb4a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/lib/live/shared/muxing-session.ts
View File

@ -101,7 +101,7 @@ class MuxingSession extends EventEmitter {
this.fps = options.fps
this.bitrate = options.bitrate
this.ratio = options.bitrate
this.ratio = options.ratio
this.allResolutions = options.allResolutions

5
server/lib/transcoding/video-transcoding-profiles.ts
View File

@ -237,5 +237,8 @@ export {
function capBitrate (inputBitrate: number, targetBitrate: number) {
if (!inputBitrate) return targetBitrate
return Math.min(targetBitrate, inputBitrate)
// Add 30% margin to input bitrate
const inputBitrateWithMargin = inputBitrate + (inputBitrate * 0.3)
return Math.min(targetBitrate, inputBitrateWithMargin)
}