From b465fe5c08c277ec7b7a116131fffb270b221010 Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Sat, 9 Jan 2016 21:11:11 -0600
Subject: [PATCH] Revert "Add HEVC transcode setting"
This reverts commit 86f4039b892d490ccd92761a4c0b435dda654c66.
---
resources/lib/playutils.py | 10 ----------
resources/settings.xml | 1 -
2 files changed, 11 deletions(-)
diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py
index 979616a6..b1b2fc5f 100644
--- a/resources/lib/playutils.py
+++ b/resources/lib/playutils.py
@@ -96,11 +96,6 @@ class PlayUtils():
# Avoid H265 1080p
self.logMsg("Option to transcode 1080P/H265 enabled.", 1)
return False
- elif (utils.settings('transcodeHEVC') == "true" and
- item['MediaSources'][0]['Name'].startswith("1080P/HEVC")):
- # Avoid H265 1080p
- self.logMsg("Option to transcode 1080P/HEVC enabled.", 1)
- return False
canDirectPlay = item['MediaSources'][0]['SupportsDirectPlay']
# Make sure direct play is supported by the server
@@ -201,11 +196,6 @@ class PlayUtils():
# Avoid H265 1080p
self.logMsg("Option to transcode 1080P/H265 enabled.", 1)
return False
- elif (utils.settings('transcodeHEVC') == "true" and
- item['MediaSources'][0]['Name'].startswith("1080P/HEVC")):
- # Avoid H265 1080p
- self.logMsg("Option to transcode 1080P/HEVC enabled.", 1)
- return False
# Requirement: BitRate, supported encoding
canDirectStream = item['MediaSources'][0]['SupportsDirectStream']
diff --git a/resources/settings.xml b/resources/settings.xml
index 2c8170ea..53063d1a 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -48,7 +48,6 @@
<setting id="playFromStream" type="bool" label="30002" default="false" />
<setting id="videoBitrate" type="enum" label="30160" values="664 Kbps SD|996 Kbps HD|1.3 Mbps HD|2.0 Mbps HD|3.2 Mbps HD|4.7 Mbps HD|6.2 Mbps HD|7.7 Mbps HD|9.2 Mbps HD|10.7 Mbps HD|12.2 Mbps HD|13.7 Mbps HD|15.2 Mbps HD|16.7 Mbps HD|18.2 Mbps HD|20.0 Mbps HD|40.0 Mbps HD|100.0 Mbps HD [default]|1000.0 Mbps HD" visible="eq(-1,true)" default="17" />
<setting id="transcodeH265" type="bool" label="Force transcode 1080p/H265" default="false" />
- <setting id="transcodeHEVC" type="bool" label="Force transcode 1080p/HEVC" default="false" />
<setting id="markPlayed" type="number" visible="false" default="90" />
<setting id="failedCount" type="number" visible="false" default="0" />
<setting id="networkCreds" type="text" visible="false" default="" />