Move b frame strategy in transcoding profile

We may use a too high value for some encoders and it allows to specify
custom values/strategy

1 files changed, 19 insertions, 8 deletions

diff --git a/server/lib/transcoding/video-transcoding-profiles.ts b/server/lib/transcoding/video-transcoding-profiles.ts
index 34a364415..dcc8d4c5c 100644
--- a/server/lib/transcoding/video-transcoding-profiles.ts
+++ b/server/lib/transcoding/video-transcoding-profiles.ts
@@ -23,10 +23,9 @@ const defaultX264VODOptionsBuilder: EncoderOptionsBuilder = (options: EncoderOpt
 
   return {
     outputOptions: [
-      `-preset veryfast`,
-      `-r ${fps}`,
-      `-maxrate ${targetBitrate}`,
-      `-bufsize ${targetBitrate * 2}`
+      ...getCommonOutputOptions(targetBitrate),
+
+      `-r ${fps}`
     ]
   }
 }
@@ -38,11 +37,10 @@ const defaultX264LiveOptionsBuilder: EncoderOptionsBuilder = (options: EncoderOp
 
   return {
     outputOptions: [
-      `-preset veryfast`,
+      ...getCommonOutputOptions(targetBitrate),
+
       `${buildStreamSuffix('-r:v', streamNum)} ${fps}`,
-      `${buildStreamSuffix('-b:v', streamNum)} ${targetBitrate}`,
-      `-maxrate ${targetBitrate}`,
-      `-bufsize ${targetBitrate * 2}`
+      `${buildStreamSuffix('-b:v', streamNum)} ${targetBitrate}`
     ]
   }
 }
@@ -257,3 +255,16 @@ function capBitrate (inputBitrate: number, targetBitrate: number) {
 
   return Math.min(targetBitrate, inputBitrateWithMargin)
 }
+
+function getCommonOutputOptions (targetBitrate: number) {
+  return [
+    `-preset veryfast`,
+    `-maxrate ${targetBitrate}`,
+    `-bufsize ${targetBitrate * 2}`,
+
+    // NOTE: b-strategy 1 - heuristic algorithm, 16 is optimal B-frames for it
+    `-b_strategy 1`,
+    // NOTE: Why 16: https://github.com/Chocobozzz/PeerTube/pull/774. b-strategy 2 -> B-frames<16
+    `-bf 16`
+  ]
+}