Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge conflicts playutils.py

Browse source
This commit is contained in:
tomkat83 2016-09-01 20:02:00 +02:00
parent daf40873c0
commit 97d09af020
1 changed files with 55 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
resources/lib/playutils.py
View file

@ -2,21 +2,23 @@
############################################################################### ###############################################################################
import logging
from urllib import urlencode from urllib import urlencode
import xbmcgui import xbmcgui
import xbmcvfs import xbmcvfs
import clientinfo from utils import window, settings, tryEncode, language as lang
import utils
import PlexAPI import PlexAPI
###############################################################################
log = logging.getLogger("PLEX."+__name__)
############################################################################### ###############################################################################
@utils.logging
class PlayUtils(): class PlayUtils():
def __init__(self, item): def __init__(self, item):
@ -24,11 +26,9 @@ class PlayUtils():
self.item = item self.item = item
self.API = PlexAPI.API(item) self.API = PlexAPI.API(item)
self.clientInfo = clientinfo.ClientInfo() self.userid = window('currUserId')
self.server = window('pms_server')
self.userid = utils.window('currUserId') self.machineIdentifier = window('plex_machineIdentifier')
self.server = utils.window('pms_server')
self.machineIdentifier = utils.window('plex_machineIdentifier')
def getPlayUrl(self, partNumber=None): def getPlayUrl(self, partNumber=None):
""" """
@ -41,21 +41,21 @@ class PlayUtils():
playurl = self.isDirectPlay() playurl = self.isDirectPlay()
if playurl is not None: if playurl is not None:
self.logMsg("File is direct playing.", 1) log.info("File is direct playing.")
playurl = utils.tryEncode(playurl) playurl = tryEncode(playurl)
# Set playmethod property # Set playmethod property
utils.window('emby_%s.playmethod' % playurl, "DirectPlay") window('emby_%s.playmethod' % playurl, "DirectPlay")
elif self.isDirectStream(): elif self.isDirectStream():
self.logMsg("File is direct streaming.", 1) log.info("File is direct streaming.")
playurl = utils.tryEncode( playurl = tryEncode(
self.API.getTranscodeVideoPath('DirectStream')) self.API.getTranscodeVideoPath('DirectStream'))
# Set playmethod property # Set playmethod property
utils.window('emby_%s.playmethod' % playurl, "DirectStream") window('emby_%s.playmethod' % playurl, "DirectStream")
else: else:
self.logMsg("File is transcoding.", 1) log.info("File is transcoding.")
playurl = utils.tryEncode(self.API.getTranscodeVideoPath( playurl = tryEncode(self.API.getTranscodeVideoPath(
'Transcode', 'Transcode',
quality={ quality={
'maxVideoBitrate': self.getBitrate(), 'maxVideoBitrate': self.getBitrate(),
@ -63,9 +63,9 @@ class PlayUtils():
'videoQuality': '100' 'videoQuality': '100'
})) }))
# Set playmethod property # Set playmethod property
utils.window('emby_%s.playmethod' % playurl, value="Transcode") window('emby_%s.playmethod' % playurl, value="Transcode")
self.logMsg("The playurl is: %s" % playurl, 1) log.info("The playurl is: %s" % playurl)
return playurl return playurl
def httpPlay(self): def httpPlay(self):
@ -87,13 +87,13 @@ class PlayUtils():
""" """
# True for e.g. plex.tv watch later # True for e.g. plex.tv watch later
if self.API.shouldStream() is True: if self.API.shouldStream() is True:
self.logMsg("Plex item optimized for direct streaming", 1) log.info("Plex item optimized for direct streaming")
return return
# set to either 'Direct Stream=1' or 'Transcode=2' # set to either 'Direct Stream=1' or 'Transcode=2'
# and NOT to 'Direct Play=0' # and NOT to 'Direct Play=0'
if utils.settings('playType') != "0": if settings('playType') != "0":
# User forcing to play via HTTP # User forcing to play via HTTP
self.logMsg("User chose to not direct play", 1) log.info("User chose to not direct play")
return return
if self.mustTranscode(): if self.mustTranscode():
return return
@ -134,18 +134,18 @@ class PlayUtils():
# Convert path to direct play # Convert path to direct play
path = self.directPlay() path = self.directPlay()
self.logMsg("Verifying path: %s" % path, 1) log.info("Verifying path: %s" % path)
if xbmcvfs.exists(path): if xbmcvfs.exists(path):
self.logMsg("Path exists.", 1) log.info("Path exists.")
return True return True
elif ":" not in path: elif ":" not in path:
self.logMsg("Can't verify path, assumed linux. Still try to direct play.", 1) log.info("Can't verify path, assumed linux. Still try to direct play.")
return True return True
else: else:
self.logMsg("Failed to find file.", 1) log.info("Failed to find file.")
return False return False
def mustTranscode(self): def mustTranscode(self):
@ -157,29 +157,29 @@ class PlayUtils():
if the corresponding file settings are set to 'true' if the corresponding file settings are set to 'true'
""" """
videoCodec = self.API.getVideoCodec() videoCodec = self.API.getVideoCodec()
self.logMsg("videoCodec: %s" % videoCodec, 2) log.info("videoCodec: %s" % videoCodec)
if (utils.settings('transcodeHi10P') == 'true' and if (settings('transcodeHi10P') == 'true' and
videoCodec['bitDepth'] == '10'): videoCodec['bitDepth'] == '10'):
self.logMsg('Option to transcode 10bit video content enabled.', 1) log.info('Option to transcode 10bit video content enabled.')
return True return True
codec = videoCodec['videocodec'] codec = videoCodec['videocodec']
if (utils.settings('transcodeHEVC') == 'true' and codec == 'hevc'): if (settings('transcodeHEVC') == 'true' and codec == 'hevc'):
self.logMsg('Option to transcode HEVC video codec enabled.', 1) log.info('Option to transcode HEVC video codec enabled.')
return True return True
if codec is None: if codec is None:
# e.g. trailers. Avoids TypeError with "'h265' in codec" # e.g. trailers. Avoids TypeError with "'h265' in codec"
self.logMsg('No codec from PMS, not transcoding.', 1) log.info('No codec from PMS, not transcoding.')
return False return False
try: try:
resolution = int(videoCodec['resolution']) resolution = int(videoCodec['resolution'])
except (TypeError, ValueError): except (TypeError, ValueError):
self.logMsg('No video resolution from PMS, not transcoding.', 1) log.info('No video resolution from PMS, not transcoding.')
return False return False
if 'h265' in codec: if 'h265' in codec:
if resolution >= self.getH265(): if resolution >= self.getH265():
self.logMsg("Option to transcode h265 enabled. Resolution of " log.info("Option to transcode h265 enabled. Resolution of "
"the media: %s, transcoding limit resolution: %s" "the media: %s, transcoding limit resolution: %s"
% (str(resolution), str(self.getH265())), 1) % (str(resolution), str(self.getH265())))
return True return True
return False return False
@ -188,16 +188,16 @@ class PlayUtils():
if self.API.getType() == 'track': if self.API.getType() == 'track':
return True return True
# set to 'Transcode=2' # set to 'Transcode=2'
if utils.settings('playType') == "2": if settings('playType') == "2":
# User forcing to play via HTTP # User forcing to play via HTTP
self.logMsg("User chose to transcode", 1) log.info("User chose to transcode")
return False return False
if self.mustTranscode(): if self.mustTranscode():
return False return False
# Verify the bitrate # Verify the bitrate
if not self.isNetworkSufficient(): if not self.isNetworkSufficient():
self.logMsg("The network speed is insufficient to direct stream " log.info("The network speed is insufficient to direct stream "
"file. Transcoding", 1) "file. Transcoding")
return False return False
return True return True
@ -208,19 +208,19 @@ class PlayUtils():
try: try:
sourceBitrate = int(self.API.getDataFromPartOrMedia('bitrate')) sourceBitrate = int(self.API.getDataFromPartOrMedia('bitrate'))
except: except:
self.logMsg('Could not detect source bitrate. It is assumed to be' log.info('Could not detect source bitrate. It is assumed to be'
'sufficient', 1) 'sufficient')
return True return True
settings = self.getBitrate() settings = self.getBitrate()
self.logMsg("The add-on settings bitrate is: %s, the video bitrate" log.info("The add-on settings bitrate is: %s, the video bitrate"
"required is: %s" % (settings, sourceBitrate), 1) "required is: %s" % (settings, sourceBitrate))
if settings < sourceBitrate: if settings < sourceBitrate:
return False return False
return True return True
def getBitrate(self): def getBitrate(self):
# get the addon video quality # get the addon video quality
videoQuality = utils.settings('transcoderVideoQualities') videoQuality = settings('transcoderVideoQualities')
bitrate = { bitrate = {
'0': 320, '0': 320,
'1': 720, '1': 720,
@ -250,10 +250,10 @@ class PlayUtils():
'2': 720, '2': 720,
'3': 1080 '3': 1080
} }
return H265[utils.settings('transcodeH265')] return H265[settings('transcodeH265')]
def getResolution(self): def getResolution(self):
chosen = utils.settings('transcoderVideoQualities') chosen = settings('transcoderVideoQualities')
res = { res = {
'0': '420x420', '0': '420x420',
'1': '576x320', '1': '576x320',
@ -270,7 +270,6 @@ class PlayUtils():
return res[chosen] return res[chosen]
def audioSubsPref(self, listitem, url, part=None): def audioSubsPref(self, listitem, url, part=None):
lang = utils.language
dialog = xbmcgui.Dialog() dialog = xbmcgui.Dialog()
# For transcoding only # For transcoding only
# Present the list of audio to select from # Present the list of audio to select from
@ -297,7 +296,8 @@ class PlayUtils():
# Remember 'no subtitles' # Remember 'no subtitles'
subNum = 1 subNum = 1
for stream in mediastreams: for stream in mediastreams:
# Since Emby returns all possible tracks together, have to sort them. # Since Plex returns all possible tracks together, have to sort
# them.
index = stream.attrib.get('id') index = stream.attrib.get('id')
type = stream.attrib.get('streamType') type = stream.attrib.get('streamType')
@ -310,10 +310,8 @@ class PlayUtils():
track = "%s %s - %s %s" % (audioNum+1, stream.attrib['language'], codec, channelLayout) track = "%s %s - %s %s" % (audioNum+1, stream.attrib['language'], codec, channelLayout)
except: except:
track = "%s 'unknown' - %s %s" % (audioNum+1, codec, channelLayout) track = "%s 'unknown' - %s %s" % (audioNum+1, codec, channelLayout)
#audioStreamsChannelsList[audioNum] = stream.attrib['channels']
audioStreamsList.append(index) audioStreamsList.append(index)
audioStreams.append(utils.tryEncode(track)) audioStreams.append(tryEncode(track))
audioNum += 1 audioNum += 1
# Subtitles # Subtitles
@ -337,7 +335,7 @@ class PlayUtils():
downloadableStreams.append(index) downloadableStreams.append(index)
subtitleStreamsList.append(index) subtitleStreamsList.append(index)
subtitleStreams.append(utils.tryEncode(track)) subtitleStreams.append(tryEncode(track))
subNum += 1 subNum += 1
if audioNum > 1: if audioNum > 1:
@ -351,7 +349,7 @@ class PlayUtils():
playurlprefs['audioStreamID'] = audioStreamsList[0] playurlprefs['audioStreamID'] = audioStreamsList[0]
# Add audio boost # Add audio boost
playurlprefs['audioBoost'] = utils.settings('audioBoost') playurlprefs['audioBoost'] = settings('audioBoost')
if subNum > 1: if subNum > 1:
resp = dialog.select(lang(33014), subtitleStreams) resp = dialog.select(lang(33014), subtitleStreams)
@ -368,12 +366,12 @@ class PlayUtils():
url = "%s/library/streams/%s" \ url = "%s/library/streams/%s" \
% (self.server, selectSubsIndex) % (self.server, selectSubsIndex)
url = self.API.addPlexHeadersToUrl(url) url = self.API.addPlexHeadersToUrl(url)
self.logMsg("Downloadable sub: %s: %s" % (selectSubsIndex, url), 1) log.info("Downloadable sub: %s: %s" % (selectSubsIndex, url))
listitem.setSubtitles([utils.tryEncode(url)]) listitem.setSubtitles([tryEncode(url)])
else: else:
self.logMsg('Need to burn in subtitle %s' % selectSubsIndex, 1) log.info('Need to burn in subtitle %s' % selectSubsIndex)
playurlprefs["subtitleStreamID"] = selectSubsIndex playurlprefs["subtitleStreamID"] = selectSubsIndex
playurlprefs["subtitleSize"] = utils.settings('subtitleSize') playurlprefs["subtitleSize"] = settings('subtitleSize')
else: # User backed out of selection else: # User backed out of selection
pass pass