From 1125c40a32cfd6066a5da5aa4da6d709577b5601 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 26 Feb 2018 10:00:44 +0100
Subject: [PATCH] Change transcoding default conf options

---
 config/default.yaml            | 12 ++++++------
 config/production.yaml.example | 12 ++++++------
 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:
 # 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!
 transcoding:
-  enabled: false
+  enabled: true
   threads: 2
   resolutions: # Only created if the original video has a higher resolution
-    240p: true
-    360p: true
-    480p: true
-    720p: true
-    1080p: true
+    240p: false
+    360p: false
+    480p: false
+    720p: false
+    1080p: false
 
 instance:
   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:
 # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
 # Uses a lot of CPU!
 transcoding:
-  enabled: false
+  enabled: true
   threads: 2
   resolutions: # Only created if the original video has a higher resolution
-    240p: true
-    360p: true
-    480p: true
-    720p: true
-    1080p: true
+    240p: false
+    360p: false
+    480p: false
+    720p: false
+    1080p: false
 
 instance:
   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:
 transcoding:
   enabled: true
   threads: 2
+  resolutions:
+    240p: true
+    360p: true
+    480p: true
+    720p: true
+    1080p: true