diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index 727f4019..61624c4e 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -1,9 +1,9 @@  - Primary Server Address - Auto enter single folder items: - Play from HTTP instead of SMB: - Log Level: + + Primary Server Address + Play from HTTP instead of SMB + Log level Username: Password: Network Username: @@ -17,11 +17,10 @@ Device Name Advanced - Username: - Password: + Username Use SIMPLEJSON instead of JSON - Port Number: + Port Number Number of recent Movies to show: Number of recent TV episodes to show: Number of recent Music Albums to show: @@ -97,9 +96,9 @@ Include Stream Info Include People Include Overview - Offer delete after playback - For Episodes - For Movies + Offer delete after playback + For Episodes + For Movies Background Art Refresh Rate (seconds) Add Resume Percent Add Episode Number @@ -143,10 +142,10 @@ - Show Unplayed Count Indicator - Show Played Percentage Indicator Sort NextUp by Show Title - Enable Enhanced Images (eg CoverArt) + Enable Enhanced Images (eg CoverArt) Metadata Artwork - Video Quality + Video Quality Enable Suggested Loader (Requires Restart) Add Season Number @@ -224,23 +223,22 @@ Random Items Recommended Items - Extras + Extras Sync Theme Music Sync Extra Fanart Sync Movie BoxSets - Reset Local Kodi DB + Reset local Kodi database Enable watched/resume status sync DB Sync Indication: Play Count Sync Indication: - Enable HTTPS + Enable HTTPS Force Transcoding Codecs Enable Netflix style next up notification - The number of seconds before the end to show the notification Show Emby Info dialog on play/select action - Enable server connection message on start-up - Use local paths instead of addon redirect for playback + Enable server connection message on startup Recently added Home Videos Recently added Photos @@ -278,6 +276,40 @@ Emby addon settings Delete item from the server + + Verify Host SSL Certificate + Client SSL certificate + Use alternate address + Alternate Server Address + Use altername device Name + [COLOR yellow]Retry login[/COLOR] + Sync Options + Show syncing progress + Sync empty TV Shows + Enable Music Library + Direct stream music library + Playback Mode + Force artwork caching + Limit artwork cache threads + Enable fast startup (requires server plugin) + Maximum items to request from the server at once + Playback + Network credentials + Enable Emby cinema mode + Ask to play trailers + Skip delete confirmation + Jump back on resume (in seconds) + Force transcode H265 + Music metadata options (not compatible with direct stream) + Import music song rating directly from files + Convert music song rating to Emby rating + Allow rating in song files to be updated + Ignore specials in next episodes + Permanent users to add to the session + Startup delay (in seconds) + Enable server restart message + Enable new content notification + Welcome Error connecting diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py index 6751ec45..4504bc4a 100644 --- a/resources/lib/playutils.py +++ b/resources/lib/playutils.py @@ -97,17 +97,22 @@ class PlayUtils(): self.logMsg("Can't direct play, play from HTTP enabled.", 1) return False - if (utils.settings('transcodeH265') == "true" and - item['MediaSources'][0]['Name'].startswith(("1080P/HEVC","1080P/H265"))): - # Avoid H265 1080p - self.logMsg("Option to transcode 1080P/H265 enabled.", 1) - return False + videotrack = item['MediaSources'][0]['Name'] + transcodeH265 = utils.settings('transcodeH265') - elif (utils.settings('transcode720H265') == "true" and - item['MediaSources'][0]['Name'].startswith(("720P/HEVC","720P/H265"))): - # Avoid H265 720p - self.logMsg("Option to transcode 720P/H265 enabled.", 1) - return False + if transcodeH265 != "0" and ("HEVC" in videotrack or "H265" in videotrack): + # Avoid H265/HEVC depending on the resolution + resolution = int(videotrack.split("P", 1)[0]) + res = { + + '1': 480, + '2': 720, + '3': 1080 + } + self.logMsg("Resolution is: %sP, transcode for resolution: %sP+" + % (resolution, res[transcodeH265]), 1) + if res[transcodeH265] <= resolution: + return False canDirectPlay = item['MediaSources'][0]['SupportsDirectPlay'] # Make sure direct play is supported by the server @@ -203,17 +208,22 @@ class PlayUtils(): item = self.item - if (utils.settings('transcodeH265') == "true" and - item['MediaSources'][0]['Name'].startswith(("1080P/HEVC","1080P/H265"))): - # Avoid H265 1080p - self.logMsg("Option to transcode 1080P/H265 enabled.", 1) - return False + videotrack = item['MediaSources'][0]['Name'] + transcodeH265 = utils.settings('transcodeH265') - elif (utils.settings('transcode720H265') == "true" and - item['MediaSources'][0]['Name'].startswith(("720P/HEVC","720P/H265"))): - # Avoid H265 720p - self.logMsg("Option to transcode 720P/H265 enabled.", 1) - return False + if transcodeH265 != "0" and ("HEVC" in videotrack or "H265" in videotrack): + # Avoid H265/HEVC depending on the resolution + resolution = int(videotrack.split("P", 1)[0]) + res = { + + '1': 480, + '2': 720, + '3': 1080 + } + self.logMsg("Resolution is: %sP, transcode for resolution: %sP+" + % (resolution, res[transcodeH265]), 1) + if res[transcodeH265] <= resolution: + return False # Requirement: BitRate, supported encoding canDirectStream = item['MediaSources'][0]['SupportsDirectStream'] diff --git a/resources/settings.xml b/resources/settings.xml index 4a9ba88f..a2ee222e 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -5,72 +5,74 @@ - - + + - - - - - - + + + + + + - + - + - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - + + - - + + + - - + - + - - - - - - - + + + + + + - - - - - + + +