Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-25 10:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert taking transcode url from server

Browse source 
To allow for audio/subtitles selection customization
This commit is contained in:
angelblue05 2018-03-30 04:50:36 -05:00
parent fbf6609501
commit 97bd3e653d
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
resources/lib/playutils.py
View file

@ -247,6 +247,7 @@ class PlayUtils():
break break
url = self.get_transcode_url(source) if transcode else self.get_direct_url(source) url = self.get_transcode_url(source) if transcode else self.get_direct_url(source)
url = self._append_http_url(source, url)
return url return url
@ -263,31 +264,24 @@ class PlayUtils():
if settings('enableExternalSubs') == "true": if settings('enableExternalSubs') == "true":
self.set_external_subs(source, url) self.set_external_subs(source, url)
url = self._append_http_url(source, url)
return url return url
def get_transcode_url(self, source): def get_transcode_url(self, source):
self.method = "Transcode" self.method = "Transcode"
if source.get('TranscodingUrl'): item_id = self.item['Id']
url = "%s/emby%s" % (self.server, source['TranscodingUrl']) url = urllib_path("%s/emby/Videos/%s/master.m3u8" % (self.server, item_id), {
url = url.replace('stream.ts', 'master.m3u8')
else:
item_id = self.item['Id']
url = urllib_path("%s/emby/Videos/%s/master.m3u8" % (self.server, item_id), {
'VideoCodec': "h264", 'VideoCodec': "h264",
'AudioCodec': "ac3", 'AudioCodec': "ac3",
'MaxAudioChannels': 6, 'MaxAudioChannels': 6,
'DeviceId': self.clientInfo.get_device_id(), 'DeviceId': self.clientInfo.get_device_id(),
'VideoBitrate': self.get_bitrate() * 1000 'VideoBitrate': self.get_bitrate() * 1000
}) })
# Select audio and subtitles # Select audio and subtitles
url += self.get_audio_subs(source) url += self.get_audio_subs(source)
url = self._append_http_url(source, url)
# Limit to 8 bit if user selected transcode Hi10P # Limit to 8 bit if user selected transcode Hi10P
if settings('transcodeHi10P') == "true": if settings('transcodeHi10P') == "true":