diff options
-rw-r--r-- | config/default.yaml | 12 | ||||
-rw-r--r-- | config/production.yaml.example | 12 | ||||
-rw-r--r-- | config/test.yaml | 6 |
3 files changed, 18 insertions, 12 deletions
diff --git a/config/default.yaml b/config/default.yaml index 0d0e788dd..3243d016d 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -61,14 +61,14 @@ user: | |||
61 | # In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions. | 61 | # In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions. |
62 | # Uses a lot of CPU and increases storage! | 62 | # Uses a lot of CPU and increases storage! |
63 | transcoding: | 63 | transcoding: |
64 | enabled: false | 64 | enabled: true |
65 | threads: 2 | 65 | threads: 2 |
66 | resolutions: # Only created if the original video has a higher resolution | 66 | resolutions: # Only created if the original video has a higher resolution |
67 | 240p: true | 67 | 240p: false |
68 | 360p: true | 68 | 360p: false |
69 | 480p: true | 69 | 480p: false |
70 | 720p: true | 70 | 720p: false |
71 | 1080p: true | 71 | 1080p: false |
72 | 72 | ||
73 | instance: | 73 | instance: |
74 | name: 'PeerTube' | 74 | name: 'PeerTube' |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 0b15c7b96..b43d778e1 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -61,14 +61,14 @@ user: | |||
61 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag | 61 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag |
62 | # Uses a lot of CPU! | 62 | # Uses a lot of CPU! |
63 | transcoding: | 63 | transcoding: |
64 | enabled: false | 64 | enabled: true |
65 | threads: 2 | 65 | threads: 2 |
66 | resolutions: # Only created if the original video has a higher resolution | 66 | resolutions: # Only created if the original video has a higher resolution |
67 | 240p: true | 67 | 240p: false |
68 | 360p: true | 68 | 360p: false |
69 | 480p: true | 69 | 480p: false |
70 | 720p: true | 70 | 720p: false |
71 | 1080p: true | 71 | 1080p: false |
72 | 72 | ||
73 | instance: | 73 | instance: |
74 | name: 'PeerTube' | 74 | name: 'PeerTube' |
diff --git a/config/test.yaml b/config/test.yaml index efca85aff..b830a42e7 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
@@ -25,3 +25,9 @@ signup: | |||
25 | transcoding: | 25 | transcoding: |
26 | enabled: true | 26 | enabled: true |
27 | threads: 2 | 27 | threads: 2 |
28 | resolutions: | ||
29 | 240p: true | ||
30 | 360p: true | ||
31 | 480p: true | ||
32 | 720p: true | ||
33 | 1080p: true | ||