From 8438cc088c05f52b4deb141982a8d90e834e255d Mon Sep 17 00:00:00 2001 From: tomkat83 Date: Sat, 17 Dec 2016 18:01:51 +0100 Subject: [PATCH] Combine h265 und HEVC into one setting - Fixes #163 --- resources/language/English/strings.xml | 3 +-- resources/language/German/strings.xml | 3 +-- resources/lib/playutils.py | 9 +++------ resources/settings.xml | 3 +-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index 4a9ae773..4cf19292 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -296,7 +296,7 @@ Ask to play trailers Skip Plex delete confirmation for the context menu (use at your own risk) Jump back on resume (in seconds) - Force transcode H265 + Force transcode h265/HEVC Music metadata options (not compatible with direct stream) Import music song rating directly from files Convert music song rating to Emby rating @@ -425,7 +425,6 @@ Sync when screensaver is deactivated Force Transcode Hi10P Recently Added: Also show already watched episodes - Force Transcode HEVC Recently Added: Also show already watched movies (Refresh Plex playlist/nodes!) Your current Plex Media Server: [COLOR yellow]Manually enter Plex Media Server address[/COLOR] diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml index 1ec86c3f..bdd2f012 100644 --- a/resources/language/German/strings.xml +++ b/resources/language/German/strings.xml @@ -18,7 +18,7 @@ Plex Musik-Bibliotheken aktivieren Plex Trailer aktivieren (Plexpass benötigt) Nachfragen, ob Trailer gespielt werden sollen - H265 Codec Transkodierung erzwingen + h265/HEVC Codec Transkodierung erzwingen Netzwerk Credentials eingeben PlexKodiConnect Start Verzögerung (in Sekunden) Extras ignorieren, wenn Nächste Episode gespielt wird @@ -374,7 +374,6 @@ Sync wenn Bildschirmschoner deaktiviert wird Hi10p Codec Transkodierung erzwingen "Zuletzt hinzugefügt": gesehene Folgen anzeigen - HEVC Codec Transkodierung erzwingen "Zuletzt hinzugefügt": gesehene Filme anzeigen (Plex Playlisten und Nodes zurücksetzen!) Aktueller Plex Media Server: [COLOR yellow]Plex Media Server Adresse manuell eingeben[/COLOR] diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py index f625c967..254c33a1 100644 --- a/resources/lib/playutils.py +++ b/resources/lib/playutils.py @@ -173,9 +173,6 @@ class PlayUtils(): log.info('Option to transcode 10bit video content enabled.') return True codec = videoCodec['videocodec'] - if (settings('transcodeHEVC') == 'true' and codec == 'hevc'): - log.info('Option to transcode HEVC video codec enabled.') - return True if codec is None: # e.g. trailers. Avoids TypeError with "'h265' in codec" log.info('No codec from PMS, not transcoding.') @@ -195,10 +192,10 @@ class PlayUtils(): except (TypeError, ValueError): log.info('No video resolution from PMS, not transcoding.') return False - if 'h265' in codec: + if 'h265' in codec or 'hevc' in codec: if resolution >= self.getH265(): - log.info("Option to transcode h265 enabled. Resolution of " - "the media: %s, transcoding limit resolution: %s" + log.info("Option to transcode h265/HEVC enabled. Resolution " + "of the media: %s, transcoding limit resolution: %s" % (str(resolution), str(self.getH265()))) return True return False diff --git a/resources/settings.xml b/resources/settings.xml index 42a8d5d5..5f1d2456 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -100,9 +100,8 @@ - + -