diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-05-02 22:02:27 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-05-04 21:12:32 +0200 |
commit | 227d02feadbc9b1fc916a12528ccc0623fb3069e (patch) | |
tree | 0b6bcc8c2c081591588714bc040ac6e810e333de /config | |
parent | 15d4ee04a94230e1ea83c2959a1981105699ba22 (diff) | |
download | PeerTube-227d02feadbc9b1fc916a12528ccc0623fb3069e.tar.gz PeerTube-227d02feadbc9b1fc916a12528ccc0623fb3069e.tar.zst PeerTube-227d02feadbc9b1fc916a12528ccc0623fb3069e.zip |
Server: add job scheduler to transcode video files
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 6 | ||||
-rw-r--r-- | config/production.yaml.example | 6 | ||||
-rw-r--r-- | config/test-6.yaml | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index a5ac15794..27eb2a533 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -28,3 +28,9 @@ admin: | |||
28 | 28 | ||
29 | signup: | 29 | signup: |
30 | enabled: false | 30 | enabled: false |
31 | |||
32 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag | ||
33 | # Uses a lot of CPU! | ||
34 | transcoding: | ||
35 | enabled: true | ||
36 | threads: 2 | ||
diff --git a/config/production.yaml.example b/config/production.yaml.example index 8e9d4b32d..c18457df6 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -29,3 +29,9 @@ admin: | |||
29 | 29 | ||
30 | signup: | 30 | signup: |
31 | enabled: false | 31 | enabled: false |
32 | |||
33 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag | ||
34 | # Uses a lot of CPU! | ||
35 | transcoding: | ||
36 | enabled: false | ||
37 | threads: 2 | ||
diff --git a/config/test-6.yaml b/config/test-6.yaml index d74d3b052..169af973a 100644 --- a/config/test-6.yaml +++ b/config/test-6.yaml | |||
@@ -18,3 +18,6 @@ storage: | |||
18 | 18 | ||
19 | admin: | 19 | admin: |
20 | email: 'admin6@example.com' | 20 | email: 'admin6@example.com' |
21 | |||
22 | transcoding: | ||
23 | enabled: true | ||