Add warning regarding transcoding

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 7f03236013d87dd15ed1552869e4c353709c3652..d694b222dfe29dd3ca9c5695f75f8b1016fe5d20 100644 (file)
--- 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
 
         <label for="transcodingEnabled"></label>
         <label i18n for="transcodingEnabled">Transcoding enabled</label>
+
+        <my-help helpType="custom" i18n-customHtml customHtml="If you disable transcoding, many videos from your users will not work!"></my-help>
       </div>
 
       <ng-template [ngIf]="isTranscodingEnabled()">

diff --git a/config/default.yaml b/config/default.yaml
index 5868ba002595198115f84faf1b940fba34c99adf..88a2f2aab38493ff83d98bffcef420a22ce4553a 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -74,11 +74,11 @@ user:
 
 # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
 # In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions.
-# Uses a lot of CPU and increases storage!
+# Please, do not disable transcoding since many uploaded videos will not work
 transcoding:
   enabled: true
   threads: 1
-  resolutions: # Only created if the original video has a higher resolution
+  resolutions: # Only created if the original video has a higher resolution, uses more storage!
     240p: false
     360p: false
     480p: false

diff --git a/config/production.yaml.example b/config/production.yaml.example
index 8012134cc0b5909b002ee8099953619a151a9feb..ac5e2a7391c531ac6c21c830ce43df8b3cfcb6ff 100644 (file)
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -87,11 +87,12 @@ user:
   video_quota: -1
 
 # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
-# Uses a lot of CPU!
+# In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions.
+# Please, do not disable transcoding since many uploaded videos will not work
 transcoding:
   enabled: true
   threads: 1
-  resolutions: # Only created if the original video has a higher resolution
+  resolutions: # Only created if the original video has a higher resolution, uses more storage!
     240p: false
     360p: false
     480p: false