github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-14 09:12:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add session throttled key for backwards compatibility

Browse source 
* And fix check for optimized version
This commit is contained in:
JonnyWong16 2017-03-02 18:01:59 -08:00
parent c4fc831968
commit 82b42f92a9
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plexpy/pmsconnect.py
View file

@ -1035,7 +1035,7 @@ class PmsConnect(object):
'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'), 'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'),
'audio_codec': helpers.get_xml_attr(media, 'audioCodec'), 'audio_codec': helpers.get_xml_attr(media, 'audioCodec'),
'audio_channels': helpers.get_xml_attr(media, 'audioChannels'), 'audio_channels': helpers.get_xml_attr(media, 'audioChannels'),
'optimized_version': 1 if helpers.get_xml_attr(media, 'optimizedForStreaming') else 0, 'optimized_version': 1 if helpers.get_xml_attr(media, 'proxyType') == '42' else 0,
'parts': parts 'parts': parts
}) })
@ -1272,7 +1272,8 @@ class PmsConnect(object):
'transcode_hardware': transcode_hardware, 'transcode_hardware': transcode_hardware,
'audio_decision': helpers.get_xml_attr(transcode_info, 'audioDecision'), 'audio_decision': helpers.get_xml_attr(transcode_info, 'audioDecision'),
'video_decision': helpers.get_xml_attr(transcode_info, 'videoDecision'), 'video_decision': helpers.get_xml_attr(transcode_info, 'videoDecision'),
'subtitle_decision': helpers.get_xml_attr(transcode_info, 'subtitleDecision') 'subtitle_decision': helpers.get_xml_attr(transcode_info, 'subtitleDecision'),
'throttled': str(transcode_throttled) # Keep for backwards compatibility
} }
else: else:
transcode_details = {'transcode_key': '', transcode_details = {'transcode_key': '',
@ -1289,7 +1290,8 @@ class PmsConnect(object):
'transcode_hardware': 0, 'transcode_hardware': 0,
'audio_decision': 'direct play', 'audio_decision': 'direct play',
'video_decision': 'direct play', 'video_decision': 'direct play',
'subtitle_decision': '' 'subtitle_decision': '',
'throttled': '0' # Keep for backwards compatibility
} }
# Figure out which version is being played # Figure out which version is being played
@ -1370,7 +1372,6 @@ class PmsConnect(object):
else: else:
quality_profile = '' quality_profile = ''
# Check if it is an optimized version
stream_details = {'stream_container': helpers.get_xml_attr(stream_media_info, 'container'), stream_details = {'stream_container': helpers.get_xml_attr(stream_media_info, 'container'),
'stream_bitrate': helpers.get_xml_attr(stream_media_info, 'bitrate'), 'stream_bitrate': helpers.get_xml_attr(stream_media_info, 'bitrate'),
'stream_aspect_ratio': helpers.get_xml_attr(stream_media_info, 'aspectRatio'), 'stream_aspect_ratio': helpers.get_xml_attr(stream_media_info, 'aspectRatio'),
@ -1383,7 +1384,7 @@ class PmsConnect(object):
'stream_video_width': helpers.get_xml_attr(stream_media_info, 'width'), 'stream_video_width': helpers.get_xml_attr(stream_media_info, 'width'),
'stream_duration': helpers.get_xml_attr(stream_media_info, 'duration'), 'stream_duration': helpers.get_xml_attr(stream_media_info, 'duration'),
'transcode_decision': helpers.get_xml_attr(stream_media_parts_info, 'decision').replace('directplay', 'direct play'), 'transcode_decision': helpers.get_xml_attr(stream_media_parts_info, 'decision').replace('directplay', 'direct play'),
'optimized_version': 1 if helpers.get_xml_attr(stream_media_info, 'optimizedForStreaming') else 0, 'optimized_version': 1 if helpers.get_xml_attr(stream_media_info, 'proxyType') == '42' else 0,
'optimized_version_profile': helpers.get_xml_attr(stream_media_info, 'title'), 'optimized_version_profile': helpers.get_xml_attr(stream_media_info, 'title'),
'quality_profile': quality_profile, 'quality_profile': quality_profile,
'indexes': 1 if indexes == 'sd' else 0, 'indexes': 1 if indexes == 'sd' else 0,