From 9129b7694d577322327ee79e9b9aa64deee92765 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 8 Feb 2021 10:51:10 +0100 Subject: Allow to specify transcoding and import jobs concurrency --- config/default.yaml | 6 ++++++ config/production.yaml.example | 6 ++++++ config/test.yaml | 2 ++ 3 files changed, 14 insertions(+) (limited to 'config') diff --git a/config/default.yaml b/config/default.yaml index 95df2e06c..3bbb3e5c4 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -233,7 +233,10 @@ transcoding: # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file allow_audio_files: true + # Amount of threads used by ffmpeg for 1 transcoding job threads: 1 + # Amount of transcoding jobs to execute in parallel + concurrency: 1 # Choose the transcoding profile # New profiles can be added by plugins @@ -312,6 +315,9 @@ live: import: # Add ability for your users to import remote videos (from YouTube, torrent...) videos: + # Amount of import jobs to execute in parallel + concurrency: 1 + http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html enabled: false diff --git a/config/production.yaml.example b/config/production.yaml.example index 13a646918..d75e30276 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -244,7 +244,10 @@ transcoding: # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file allow_audio_files: true + # Amount of threads used by ffmpeg for 1 transcoding job threads: 1 + # Amount of transcoding jobs to execute in parallel + concurrency: 1 # Choose the transcoding profile # New profiles can be added by plugins @@ -323,6 +326,9 @@ live: import: # Add ability for your users to import remote videos (from YouTube, torrent...) videos: + # Amount of import jobs to execute in parallel + concurrency: 1 + http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html enabled: false diff --git a/config/test.yaml b/config/test.yaml index 6fedb1dc3..ae8011ba5 100644 --- a/config/test.yaml +++ b/config/test.yaml @@ -71,6 +71,7 @@ transcoding: allow_additional_extensions: false allow_audio_files: false threads: 2 + concurrency: 2 resolutions: 0p: false 240p: true @@ -106,6 +107,7 @@ live: import: videos: + concurrency: 2 http: enabled: true proxy: -- cgit v1.2.3