github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 15:56:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve display of dynamic range on activity cards

Browse source 
* Ref #1654. Thanks @herby2212.
This commit is contained in:
JonnyWong16 2022-04-09 17:52:17 -07:00
parent 4862aee9a1
commit a2fac2b11c
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
5 changed files with 49 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
data/interfaces/default/current_activity_instance.html
View file

@ -231,11 +231,14 @@ DOCUMENTATION :: END
<div class="sub-value" id="video_decision-${sk}">
% if data['media_type'] in ('movie', 'episode', 'clip') and data['stream_video_decision']:
<%
if data['video_dynamic_range'] == 'HDR':
if data['video_dynamic_range'] != 'SDR':
video_dynamic_range = ' ' + data['video_dynamic_range']
else:
video_dynamic_range = ''
if data['stream_video_dynamic_range'] != 'SDR' or video_dynamic_range:
stream_video_dynamic_range = ' ' + data['stream_video_dynamic_range']
else:
video_dynamic_range = stream_video_dynamic_range = ''
stream_video_dynamic_range = ''
%>
% if data['stream_video_decision'] == 'transcode':
<%

4
data/interfaces/default/index.html
View file

@ -483,8 +483,8 @@
var video_decision = '';
if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.stream_video_decision) {
var v_bd = (s.video_dynamic_range === 'HDR') ? ' ' + s.video_dynamic_range : '';
var sv_bd = (s.video_dynamic_range === 'HDR') ? ' ' + s.stream_video_dynamic_range : '';
var v_bd = (s.video_dynamic_range !== 'SDR') ? ' ' + s.video_dynamic_range : '';
var sv_bd = (s.stream_video_dynamic_range !== 'SDR' || v_bd) ? ' ' + s.stream_video_dynamic_range : '';
var v_res= '';
switch (s.video_resolution.toLowerCase()) {
case 'sd':

2
plexpy/helpers.py
View file

@ -1545,7 +1545,7 @@ def is_hdr(bit_depth, color_space):
def version_to_tuple(version):
return tuple(cast_to_int(v) for v in version.strip('v').split('.'))
return tuple(cast_to_int(v) for v in version.strip('v').replace('-', '.').split('.'))
# https://stackoverflow.com/a/1855118

57
plexpy/pmsconnect.py
View file

@ -1401,6 +1401,7 @@ class PmsConnect(object):
'video_color_range': helpers.get_xml_attr(stream, 'colorRange'),
'video_color_space': helpers.get_xml_attr(stream, 'colorSpace'),
'video_color_trc': helpers.get_xml_attr(stream, 'colorTrc'),
'video_dynamic_range': self.get_dynamic_range(stream),
'video_frame_rate': helpers.get_xml_attr(stream, 'frameRate'),
'video_ref_frames': helpers.get_xml_attr(stream, 'refFrames'),
'video_height': helpers.get_xml_attr(stream, 'height'),
@ -1857,6 +1858,7 @@ class PmsConnect(object):
'stream_video_color_space': helpers.get_xml_attr(video_stream_info, 'colorSpace'),
'stream_video_color_trc': helpers.get_xml_attr(video_stream_info, 'colorTrc'),
'stream_video_codec_level': helpers.get_xml_attr(video_stream_info, 'level'),
'stream_video_dynamic_range': self.get_dynamic_range(video_stream_info),
'stream_video_ref_frames': helpers.get_xml_attr(video_stream_info, 'refFrames'),
'stream_video_language': helpers.get_xml_attr(video_stream_info, 'language'),
'stream_video_language_code': helpers.get_xml_attr(video_stream_info, 'languageCode'),
@ -1872,6 +1874,7 @@ class PmsConnect(object):
'stream_video_color_space': '',
'stream_video_color_trc': '',
'stream_video_codec_level': '',
'stream_video_dynamic_range': '',
'stream_video_ref_frames': '',
'stream_video_language': '',
'stream_video_language_code': '',
@ -2064,6 +2067,7 @@ class PmsConnect(object):
'video_color_range': '',
'video_color_space': '',
'video_color_trc': '',
'video_dynamic_range': '',
'video_frame_rate': '',
'video_ref_frames': '',
'video_height': '',
@ -2152,23 +2156,6 @@ class PmsConnect(object):
stream_details['stream_video_resolution'],
stream_details['stream_video_resolution'] + (video_details['stream_video_scan_type'][:1] or 'p'))
if helpers.cast_to_int(source_video_details.get('video_bit_depth')) > 8 \
and source_video_details.get('video_color_space') == 'bt2020nc':
stream_details['video_dynamic_range'] = 'HDR'
else:
stream_details['video_dynamic_range'] = 'SDR'
if stream_details['video_dynamic_range'] == 'HDR' \
and video_details['stream_video_decision'] != 'transcode' \
or helpers.cast_to_int(video_details['stream_video_bit_depth']) > 8 \
and video_details['stream_video_color_space'] == 'bt2020nc':
stream_details['stream_video_dynamic_range'] = 'HDR'
else:
stream_details['stream_video_dynamic_range'] = 'SDR'
else:
stream_details['video_dynamic_range'] = ''
stream_details['stream_video_dynamic_range'] = ''
# Get the quality profile
if media_type in ('movie', 'episode', 'clip') and 'stream_bitrate' in stream_details:
if sync_id:
@ -3182,3 +3169,39 @@ class PmsConnect(object):
return 'public'
return plexpy.CONFIG.PMS_UPDATE_CHANNEL
@staticmethod
def get_dynamic_range(stream):
extended_display_title = helpers.get_xml_attr(stream, 'extendedDisplayTitle')
bit_depth = helpers.cast_to_int(helpers.get_xml_attr(stream, 'bitDepth'))
color_space = helpers.get_xml_attr(stream, 'colorSpace')
DOVI_profile = helpers.get_xml_attr(stream, 'DOVIProfile')
HDR = bool(bit_depth > 8 and 'bt2020' in color_space)
DV = bool(DOVI_profile)
if not HDR and not DV:
return 'SDR'
video_dynamic_range = []
# HDR details got introduced with PMS version 1.25.6.5545
if helpers.version_to_tuple(plexpy.CONFIG.PMS_VERSION) >= helpers.version_to_tuple('1.25.6.5545'):
if 'Dolby Vision' in extended_display_title:
video_dynamic_range.append('Dolby Vision')
if 'HLG' in extended_display_title:
video_dynamic_range.append('HLG')
if 'HDR10' in extended_display_title:
video_dynamic_range.append('HDR10')
elif 'HDR' in extended_display_title:
video_dynamic_range.append('HDR')
else:
if DV:
video_dynamic_range.append('Dolby Vision')
elif HDR:
# Exact HDR version needs PMS version 1.25.6.5545 or newer
video_dynamic_range.append('HDR')
if not video_dynamic_range:
return 'SDR'
return '/'.join(video_dynamic_range)

1
plexpy/webserve.py
View file

@ -5349,6 +5349,7 @@ class WebInterface(object):
"video_color_range": "tv",
"video_color_space": "bt709",
"video_color_trc": "",
"video_dynamic_range": "SDR",
"video_frame_rate": "23.976",
"video_height": "1078",
"video_language": "",