From 7bd02861dc58576372e1d1dac2cee520d9691bce Mon Sep 17 00:00:00 2001
From: croneter <croneter@users.noreply.github.com>
Date: Sun, 8 Sep 2019 11:58:09 +0200
Subject: [PATCH] Allow for 4k transcoding and direct streaming

---
 resources/lib/playback_decision.py | 4 ++++
 resources/settings.xml             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/lib/playback_decision.py b/resources/lib/playback_decision.py
index bf4bec0a..b7058558 100644
--- a/resources/lib/playback_decision.py
+++ b/resources/lib/playback_decision.py
@@ -249,6 +249,8 @@ def get_bitrate():
         '8': 12000,
         '9': 20000,
         '10': 40000,
+        '11': 35000,
+        '12': 50000
     }
     # max bit rate supported by server (max signed 32bit integer)
     return bitrate.get(videoQuality, MAX_SIGNED_INT)
@@ -271,6 +273,8 @@ def get_resolution():
         '8': '1920x1080',
         '9': '1920x1080',
         '10': '1920x1080',
+        '11': '3840x2160',
+        '12': '3840x2160'
     }
     return res[chosen]
 
diff --git a/resources/settings.xml b/resources/settings.xml
index ff43590b..a71ba967 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -112,7 +112,7 @@
         <setting id="resumeJumpBack" type="slider" label="30521" default="10" range="0,1,120" option="int" visible="false"/>
         <setting type="sep" />
         <setting id="playType" type="enum" label="30002" values="Try Direct Path|Direct Play|Direct Stream|Force Transcode" default="0" />
-        <setting id="transcoderVideoQualities" type="enum" label="30160" values="420x420, 320kbps|576x320, 720kbps|720x480, 1.5Mbps|1024x768, 2Mbps|1280x720, 3Mbps|1280x720, 4Mbps|1920x1080, 8Mbps|1920x1080, 10Mbps|1920x1080, 12Mbps|1920x1080, 20Mbps|1920x1080, 40Mbps" default="10" /><!-- Video Quality if Transcoding necessary -->
+        <setting id="transcoderVideoQualities" type="enum" label="30160" values="420x420, 320kbps|576x320, 720kbps|720x480, 1.5Mbps|1024x768, 2Mbps|720p, 3Mbps|720p, 4Mbps|1080p, 8Mbps|1080p, 10Mbps|1080p, 12Mbps|1080p, 20Mbps|1080p, 40Mbps|4K, 35Mbps|4K, 50Mbps" default="10" /><!-- Video Quality if Transcoding necessary -->
         <setting id="maxVideoQualities" type="enum" label="30143" values="320kbps|720kbps|1.5Mbps|2Mbps|3Mbps|4Mbps|8Mbps|10Mbps|12Mbps|20Mbps|40Mbps|deactivated" default="11" /><!-- Always transcode if video bitrate is above -->
         <setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled (default)|480p (and higher)|720p (and higher)|1080p" /><!-- Force transcode h265/HEVC -->
         <setting id="transcodeHi10P" type="bool" label="39063" default="false"/>