Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert changes for transcode pull request 

causes errors atm and don't have time to check it out.
This commit is contained in:
angelblue05 2017-12-17 21:45:45 -06:00
parent 5aeb22aa91
commit e2a183a08b
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.emby"
name="Emby"
version="2.3.60"
version="2.3.61"
provider-name="Emby.media">
<requires>
<import addon="xbmc.python" version="2.19.0"/>

2
resources/lib/connect/credentials.py
View File

@ -27,7 +27,7 @@ class Credentials(object):
def setPath(self, path):
# Path to save persistant data.txt
self.path = path.encode('utf-8')
self.path = path
def _ensure(self):

18
resources/lib/playutils.py
View File

@ -139,13 +139,12 @@ class PlayUtils():
log.info("Can't direct play, play from HTTP enabled.")
return False
vid = self.getVideoStreamID()
videotrack = self.item['MediaStreams'][vid]['DisplayTitle']
videotrack = self.item['MediaSources'][0]['Name']
transcodeH265 = settings('transcodeH265')
videoprofile = self.item['MediaStreams'][vid]['Profile']
videoprofiles = [x['Profile'] for x in self.item['MediaSources'][0]['MediaStreams'] if 'Profile' in x]
transcodeHi10P = settings('transcodeHi10P')
if transcodeHi10P == "true" and ("Main 10" in videoprofile or "High 10" in videoprofile) and ("H264" in videotrack or "H265" in videotrack or "HEVC" in videotrack):
if transcodeHi10P == "true" and "H264" in videotrack and "High 10" in videoprofiles:
return False
if transcodeH265 in ("1", "2", "3") and ("HEVC" in videotrack or "H265" in videotrack):
@ -243,13 +242,12 @@ class PlayUtils():
def isDirectStream(self):
vid = self.getVideoStreamID()
videotrack = self.item['MediaStreams'][vid]['DisplayTitle']
videotrack = self.item['MediaSources'][0]['Name']
transcodeH265 = settings('transcodeH265')
videoprofile = self.item['MediaStreams'][vid]['Profile']
videoprofiles = [x['Profile'] for x in self.item['MediaSources'][0]['MediaStreams'] if 'Profile' in x]
transcodeHi10P = settings('transcodeHi10P')
if transcodeHi10P == "true" and ("Main 10" in videoprofile or "High 10" in videoprofile) and ("H264" in videotrack or "H265" in videotrack or "HEVC" in videotrack):
if transcodeHi10P == "true" and "H264" in videotrack and "High 10" in videoprofiles:
return False
if transcodeH265 in ("1", "2", "3") and ("HEVC" in videotrack or "H265" in videotrack):
@ -707,7 +705,3 @@ class PlayUtils():
log.debug(self.item)
return False
def getVideoStreamID(self):
# Sometimes video stream is not 0, this locates it.
videx = [x['Index'] for x in self.item['MediaSources'][0]['MediaStreams'] if 'Video' in x['Type']]
return videx[0]