From 09f35e2a6fa71d593c9b22f90109e91fc6be89a1 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 7 Jun 2018 16:44:22 +0200
Subject: [PATCH] Add warning regarding transcoding

---
 .../edit-custom-config/edit-custom-config.component.html     | 2 ++
 config/default.yaml                                          | 4 ++--
 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
 
         <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 5868ba002..88a2f2aab 100644
--- 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 8012134cc..ac5e2a739 100644
--- 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