mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-11-10 04:06:11 +00:00
Revert taking transcode url from server
To allow for audio/subtitles selection customization
This commit is contained in:
parent
fbf6609501
commit
97bd3e653d
1 changed files with 11 additions and 17 deletions
|
@ -247,6 +247,7 @@ class PlayUtils():
|
|||
break
|
||||
|
||||
url = self.get_transcode_url(source) if transcode else self.get_direct_url(source)
|
||||
url = self._append_http_url(source, url)
|
||||
|
||||
return url
|
||||
|
||||
|
@ -263,31 +264,24 @@ class PlayUtils():
|
|||
if settings('enableExternalSubs') == "true":
|
||||
self.set_external_subs(source, url)
|
||||
|
||||
url = self._append_http_url(source, url)
|
||||
|
||||
return url
|
||||
|
||||
def get_transcode_url(self, source):
|
||||
|
||||
self.method = "Transcode"
|
||||
|
||||
if source.get('TranscodingUrl'):
|
||||
url = "%s/emby%s" % (self.server, source['TranscodingUrl'])
|
||||
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), {
|
||||
item_id = self.item['Id']
|
||||
url = urllib_path("%s/emby/Videos/%s/master.m3u8" % (self.server, item_id), {
|
||||
|
||||
'VideoCodec': "h264",
|
||||
'AudioCodec': "ac3",
|
||||
'MaxAudioChannels': 6,
|
||||
'DeviceId': self.clientInfo.get_device_id(),
|
||||
'VideoBitrate': self.get_bitrate() * 1000
|
||||
})
|
||||
'VideoCodec': "h264",
|
||||
'AudioCodec': "ac3",
|
||||
'MaxAudioChannels': 6,
|
||||
'DeviceId': self.clientInfo.get_device_id(),
|
||||
'VideoBitrate': self.get_bitrate() * 1000
|
||||
})
|
||||
|
||||
# Select audio and subtitles
|
||||
url += self.get_audio_subs(source)
|
||||
url = self._append_http_url(source, url)
|
||||
# Select audio and subtitles
|
||||
url += self.get_audio_subs(source)
|
||||
|
||||
# Limit to 8 bit if user selected transcode Hi10P
|
||||
if settings('transcodeHi10P') == "true":
|
||||
|
|
Loading…
Reference in a new issue