Revert "Add HEVC transcode setting"

This reverts commit 86f4039b89.
This commit is contained in:
angelblue05 2016-01-09 21:11:11 -06:00
parent 86f4039b89
commit b465fe5c08
2 changed files with 0 additions and 11 deletions

View File

@ -96,11 +96,6 @@ class PlayUtils():
# Avoid H265 1080p # Avoid H265 1080p
self.logMsg("Option to transcode 1080P/H265 enabled.", 1) self.logMsg("Option to transcode 1080P/H265 enabled.", 1)
return False 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'] canDirectPlay = item['MediaSources'][0]['SupportsDirectPlay']
# Make sure direct play is supported by the server # Make sure direct play is supported by the server
@ -201,11 +196,6 @@ class PlayUtils():
# Avoid H265 1080p # Avoid H265 1080p
self.logMsg("Option to transcode 1080P/H265 enabled.", 1) self.logMsg("Option to transcode 1080P/H265 enabled.", 1)
return False 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 # Requirement: BitRate, supported encoding
canDirectStream = item['MediaSources'][0]['SupportsDirectStream'] canDirectStream = item['MediaSources'][0]['SupportsDirectStream']

View File

@ -48,7 +48,6 @@
<setting id="playFromStream" type="bool" label="30002" default="false" /> <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="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="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="markPlayed" type="number" visible="false" default="90" />
<setting id="failedCount" type="number" visible="false" default="0" /> <setting id="failedCount" type="number" visible="false" default="0" />
<setting id="networkCreds" type="text" visible="false" default="" /> <setting id="networkCreds" type="text" visible="false" default="" />