diff options
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | 2 | ||||
-rw-r--r-- | config/default.yaml | 4 | ||||
-rw-r--r-- | config/production.yaml.example | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 7f0323601..d694b222d 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | |||
@@ -176,6 +176,8 @@ Check this checkbox, save the configuration and test with a video URL of your in | |||
176 | 176 | ||
177 | <label for="transcodingEnabled"></label> | 177 | <label for="transcodingEnabled"></label> |
178 | <label i18n for="transcodingEnabled">Transcoding enabled</label> | 178 | <label i18n for="transcodingEnabled">Transcoding enabled</label> |
179 | |||
180 | <my-help helpType="custom" i18n-customHtml customHtml="If you disable transcoding, many videos from your users will not work!"></my-help> | ||
179 | </div> | 181 | </div> |
180 | 182 | ||
181 | <ng-template [ngIf]="isTranscodingEnabled()"> | 183 | <ng-template [ngIf]="isTranscodingEnabled()"> |
diff --git a/config/default.yaml b/config/default.yaml index 5868ba002..88a2f2aab 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -74,11 +74,11 @@ user: | |||
74 | 74 | ||
75 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag | 75 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag |
76 | # In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions. | 76 | # In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions. |
77 | # Uses a lot of CPU and increases storage! | 77 | # Please, do not disable transcoding since many uploaded videos will not work |
78 | transcoding: | 78 | transcoding: |
79 | enabled: true | 79 | enabled: true |
80 | threads: 1 | 80 | threads: 1 |
81 | resolutions: # Only created if the original video has a higher resolution | 81 | resolutions: # Only created if the original video has a higher resolution, uses more storage! |
82 | 240p: false | 82 | 240p: false |
83 | 360p: false | 83 | 360p: false |
84 | 480p: false | 84 | 480p: false |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 8012134cc..ac5e2a739 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -87,11 +87,12 @@ user: | |||
87 | video_quota: -1 | 87 | video_quota: -1 |
88 | 88 | ||
89 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag | 89 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag |
90 | # Uses a lot of CPU! | 90 | # In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions. |
91 | # Please, do not disable transcoding since many uploaded videos will not work | ||
91 | transcoding: | 92 | transcoding: |
92 | enabled: true | 93 | enabled: true |
93 | threads: 1 | 94 | threads: 1 |
94 | resolutions: # Only created if the original video has a higher resolution | 95 | resolutions: # Only created if the original video has a higher resolution, uses more storage! |
95 | 240p: false | 96 | 240p: false |
96 | 360p: false | 97 | 360p: false |
97 | 480p: false | 98 | 480p: false |