diff options
| author | buoyantair <buoyantair@protonmail.com> | 2018-11-16 02:37:16 +0530 |
|---|---|---|
| committer | buoyantair <buoyantair@protonmail.com> | 2018-11-16 02:37:16 +0530 |
| commit | ae28cdf327d782e629379eee1999096ca2a5d74b (patch) | |
| tree | bfe0d4b3a232d75161fe5bba9196553a388fc02a /server/helpers/ffmpeg-utils.ts | |
| parent | d4681c0074ba51c62a3aeb9fb3f2cd071dd21e32 (diff) | |
| parent | 8cf998733496d44fa564e2e252356b871756c984 (diff) | |
| download | PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.tar.gz PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.tar.zst PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.zip | |
Merge from upstream
Diffstat (limited to 'server/helpers/ffmpeg-utils.ts')
| -rw-r--r-- | server/helpers/ffmpeg-utils.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index a108d46a0..8b9045038 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts | |||
| @@ -310,6 +310,7 @@ async function presetH264 (command: ffmpeg.FfmpegCommand, resolution: VideoResol | |||
| 310 | .outputOption('-level 3.1') // 3.1 is the minimal ressource allocation for our highest supported resolution | 310 | .outputOption('-level 3.1') // 3.1 is the minimal ressource allocation for our highest supported resolution |
| 311 | .outputOption('-b_strategy 1') // NOTE: b-strategy 1 - heuristic algorythm, 16 is optimal B-frames for it | 311 | .outputOption('-b_strategy 1') // NOTE: b-strategy 1 - heuristic algorythm, 16 is optimal B-frames for it |
| 312 | .outputOption('-bf 16') // NOTE: Why 16: https://github.com/Chocobozzz/PeerTube/pull/774. b-strategy 2 -> B-frames<16 | 312 | .outputOption('-bf 16') // NOTE: Why 16: https://github.com/Chocobozzz/PeerTube/pull/774. b-strategy 2 -> B-frames<16 |
| 313 | .outputOption('-pix_fmt yuv420p') // allows import of source material with incompatible pixel formats (e.g. MJPEG video) | ||
| 313 | .outputOption('-map_metadata -1') // strip all metadata | 314 | .outputOption('-map_metadata -1') // strip all metadata |
| 314 | .outputOption('-movflags faststart') | 315 | .outputOption('-movflags faststart') |
| 315 | 316 | ||