Merge pull request #395 from Electry/master

Add more transcoding options

jellyfin_kodi/helper/playutils.py

@@ -241,15 +241,22 @@ class PlayUtils(object):
 
         if self.item['MediaType'] == 'Video':
             base, params = source['TranscodingUrl'].split('?')
+            url_parsed = params.split('&')
+            manual_tracks = ''
+
+            # manual bitrate
+            url_parsed = [p for p in url_parsed if 'AudioBitrate' not in p and 'VideoBitrate' not in p]
 
             if settings('skipDialogTranscode') != "3" and source.get('MediaStreams'):
-                url_parsed = params.split('&')
+                # manual tracks
+                url_parsed = [p for p in url_parsed if 'AudioStreamIndex' not in p and 'SubtitleStreamIndex' not in p]
+                manual_tracks = self.get_audio_subs(source, audio, subtitle)
 
-                for i in url_parsed:
+            audio_bitrate = self.get_transcoding_audio_bitrate()
-                    if 'AudioStreamIndex' in i or 'AudioBitrate' in i or 'SubtitleStreamIndex' in i:  # handle manually
+            video_bitrate = self.get_max_bitrate() - audio_bitrate
-                        url_parsed.remove(i)
 
-                params = "%s%s" % ('&'.join(url_parsed), self.get_audio_subs(source, audio, subtitle))
+            params = "%s%s" % ('&'.join(url_parsed), manual_tracks)
+            params += "&VideoBitrate=%s&AudioBitrate=%s" % (video_bitrate, audio_bitrate)
 
             video_type = 'live' if source['Protocol'] == 'LiveTV' else 'master'
             base = base.replace('stream' if 'stream' in base else 'master', video_type, 1)
@@ -289,49 +296,94 @@ class PlayUtils(object):
 
         return self.info['Path']
 
-    def get_bitrate(self):
+    def get_max_bitrate(self):
 
         ''' Get the video quality based on add-on settings.
             Max bit rate supported by server: 2147483 (max signed 32bit integer)
         '''
-        bitrate = [664, 996, 1320, 2000, 3200,
+        bitrate = [500, 1000, 1500, 2000, 2500, 3000, 4000, 5000, 6000,
-                   4700, 6200, 7700, 9200, 10700,
+                   7000, 8000, 9000, 10000, 12000, 14000, 16000, 18000,
-                   12200, 13700, 15200, 16700, 18200,
+                   20000, 25000, 30000, 35000, 40000, 100000, 1000000, 2147483]
-                   20000, 25000, 30000, 35000, 40000,
+        return bitrate[int(settings('maxBitrate') or 24)] * 1000
-                   100000, 1000000, 2147483]
-        return bitrate[int(settings('videoBitrate') or 22)]
 
     def get_resolution(self):
         return int(xbmc.getInfoLabel('System.ScreenWidth')), int(xbmc.getInfoLabel('System.ScreenHeight'))
 
+    def get_directplay_video_codec(self):
+        codecs = ['h264', 'hevc', 'h265', 'mpeg4', 'mpeg2video', 'vc1']
+
+        if settings('transcode_h265.bool'):
+            codecs.remove('hevc')
+            codecs.remove('h265')
+
+        if settings('transcode_mpeg2.bool'):
+            codecs.remove('mpeg2video')
+
+        if settings('transcode_vc1.bool'):
+            codecs.remove('vc1')
+
+        return ','.join(codecs)
+
+    def get_transcoding_video_codec(self):
+        codecs = ['h264', 'hevc', 'h265', 'mpeg4', 'mpeg2video', 'vc1']
+
+        if settings('transcode_h265.bool'):
+            codecs.remove('hevc')
+            codecs.remove('h265')
+        else:
+            if settings('videoPreferredCodec') == 'H265/HEVC':
+                codecs.insert(2, codecs.pop(codecs.index('h264')))
+
+        if settings('transcode_mpeg2.bool'):
+            codecs.remove('mpeg2video')
+
+        if settings('transcode_vc1.bool'):
+            codecs.remove('vc1')
+
+        return ','.join(codecs)
+
+    def get_transcoding_audio_codec(self):
+        codecs = ['aac', 'mp3', 'ac3', 'opus', 'flac', 'vorbis']
+
+        preferred = settings('audioPreferredCodec').lower()
+        if preferred in codecs:
+            codecs.insert(0, codecs.pop(codecs.index(preferred)))
+
+        return ','.join(codecs)
+
+    def get_transcoding_audio_bitrate(self):
+        bitrate = [96, 128, 160, 192, 256, 320, 384]
+        return bitrate[int(settings('audioBitrate') or 6)] * 1000
+
     def get_device_profile(self):
 
         ''' Get device profile based on the add-on settings.
         '''
         profile = {
             "Name": "Kodi",
-            "MaxStreamingBitrate": self.get_bitrate() * 1000,
+            "MaxStreamingBitrate": self.get_max_bitrate(),
             "MusicStreamingTranscodingBitrate": 1280000,
             "TimelineOffsetSeconds": 5,
             "TranscodingProfiles": [
+                {
+                    "Type": "Video",
+                    "Container": "m3u8",
+                    "AudioCodec": self.get_transcoding_audio_codec(),
+                    "VideoCodec": self.get_transcoding_video_codec(),
+                    "MaxAudioChannels": settings('audioMaxChannels')
+                },
                 {
                     "Type": "Audio"
                 },
                 {
-                    "Container": "m3u8",
+                    "Type": "Photo",
-                    "Type": "Video",
+                    "Container": "jpeg"
-                    "AudioCodec": "aac,mp3,ac3,opus,flac,vorbis",
-                    "VideoCodec": "h264,mpeg4,mpeg2video",
-                    "MaxAudioChannels": "6"
-                },
-                {
-                    "Container": "jpeg",
-                    "Type": "Photo"
                 }
             ],
             "DirectPlayProfiles": [
                 {
-                    "Type": "Video"
+                    "Type": "Video",
+                    "VideoCodec": self.get_directplay_video_codec()
                 },
                 {
                     "Type": "Audio"
@@ -410,16 +462,6 @@ class PlayUtils(object):
                 }
             ]
         }
-        if settings('transcode_h265.bool'):
-            profile['DirectPlayProfiles'][0]['VideoCodec'] = "h264,mpeg4,mpeg2video"
-        else:
-            profile['TranscodingProfiles'].insert(0, {
-                "Container": "m3u8",
-                "Type": "Video",
-                "AudioCodec": "aac,mp3,ac3,opus,flac,vorbis",
-                "VideoCodec": "h264,h265,hevc,mpeg4,mpeg2video",
-                "MaxAudioChannels": "6"
-            })
 
         if settings('transcodeHi10P.bool'):
             profile['CodecProfiles'].append(
@@ -521,6 +563,23 @@ class PlayUtils(object):
 
         return path
 
+    def get_commercial_codec_name(self, codec, profile):
+        NAMES = {
+            'ac3': 'Dolby Digital',
+            'eac3': 'Dolby Digital+',
+            'truehd': 'Dolby TrueHD',
+            'dts': 'DTS'
+        }
+
+        if profile == 'DTS-HD MA':
+            return 'DTS-HD Master Audio'
+        if profile == 'DTS-HD HRA':
+            return 'DTS-HD High Resolution Audio'
+        if codec in NAMES:
+            return NAMES[codec]
+
+        return codec.upper()
+
     def get_audio_subs(self, source, audio=None, subtitle=None):
 
         ''' For transcoding only
@@ -534,6 +593,8 @@ class PlayUtils(object):
         subs_streams = collections.OrderedDict()
         streams = source['MediaStreams']
 
+        allow_burned_subs = settings('allowBurnedSubs.bool')
+
         for stream in streams:
 
             index = stream['Index']
@@ -541,22 +602,28 @@ class PlayUtils(object):
 
             if stream_type == 'Audio':
 
-                codec = stream['Codec']
+                profile = stream['Profile'] if 'Profile' in stream else None
-                channel = stream.get('ChannelLayout', "")
+                codec = self.get_commercial_codec_name(stream['Codec'], profile)
+                channel = stream.get('ChannelLayout', "").capitalize()
 
                 if 'Language' in stream:
-                    track = "%s - %s - %s %s" % (index, stream['Language'], codec, channel)
+                    track = "%s - %s %s" % (stream['Language'].capitalize(), codec, channel)
                 else:
-                    track = "%s - %s %s" % (index, codec, channel)
+                    track = "%s %s" % (codec, channel)
 
                 audio_streams[track] = index
 
             elif stream_type == 'Subtitle':
+                downloadable = stream['IsTextSubtitleStream'] and stream['IsExternal'] and stream['SupportsExternalStream']
+                if not downloadable and not allow_burned_subs:
+                    continue
+
+                codec = self.get_commercial_codec_name(stream['Codec'], None)
 
                 if 'Language' in stream:
-                    track = "%s - %s" % (index, stream['Language'])
+                    track = "%s - %s" % (stream['Language'].capitalize(), codec)
                 else:
-                    track = "%s - %s" % (index, stream['Codec'])
+                    track = "%s" % codec
 
                 if stream['IsDefault']:
                     track = "%s - Default" % track
@@ -584,7 +651,6 @@ class PlayUtils(object):
 
         self.info['AudioStreamIndex'] = audio_selected
         prefs += "&AudioStreamIndex=%s" % audio_selected
-        prefs += "&AudioBitrate=384000" if streams[audio_selected].get('Channels', 0) > 2 else "&AudioBitrate=192000"
 
         if subtitle:
 
@@ -594,10 +660,10 @@ class PlayUtils(object):
 
             if server_settings['EnableSubtitleExtraction'] and stream['SupportsExternalStream']:
                 self.info['SubtitleUrl'] = self.get_subtitles(source, stream, index)
-            else:
+                self.info['SubtitleStreamIndex'] = index
+            elif allow_burned_subs:
                 prefs += "&SubtitleStreamIndex=%s" % index
-
+                self.info['SubtitleStreamIndex'] = index
-            self.info['SubtitleStreamIndex'] = index
 
         elif skip_dialog in (0, 2) and len(subs_streams):
 
@@ -614,10 +680,10 @@ class PlayUtils(object):
 
                     if server_settings['EnableSubtitleExtraction'] and stream['SupportsExternalStream']:
                         self.info['SubtitleUrl'] = self.get_subtitles(source, stream, index)
-                    else:
+                        self.info['SubtitleStreamIndex'] = index
+                    elif allow_burned_subs:
                         prefs += "&SubtitleStreamIndex=%s" % index
-
+                        self.info['SubtitleStreamIndex'] = index
-                self.info['SubtitleStreamIndex'] = index
 
         return prefs
 

resources/language/resource.language.en_gb/strings.po

@@ -74,8 +74,28 @@ msgid "Enable enhanced artwork (i.e. cover art)"
 msgstr "Enable enhanced artwork (i.e. cover art)"
 
 msgctxt "#30160"
-msgid "Video quality"
+msgid "Max stream bitrate"
-msgstr "Video quality"
+msgstr "Max stream bitrate"
+
+msgctxt "#30161"
+msgid "Preferred video codec"
+msgstr "Preferred video codec"
+
+msgctxt "#30162"
+msgid "Preferred audio codec"
+msgstr "Preferred audio codec"
+
+msgctxt "#30163"
+msgid "Audio bitrate"
+msgstr "Audio bitrate"
+
+msgctxt "#30164"
+msgid "Audio max channels"
+msgstr "Audio max channels"
+
+msgctxt "#30165"
+msgid "Allow burned subtitles"
+msgstr "Allow burned subtitles"
 
 msgctxt "#30170"
 msgid "Recently Added TV Shows"
@@ -277,6 +297,14 @@ msgctxt "#30522"
 msgid "Transcode H265/HEVC"
 msgstr "Transcode H265/HEVC"
 
+msgctxt "#30523"
+msgid "Transcode MPEG2"
+msgstr "Transcode MPEG2"
+
+msgctxt "#30524"
+msgid "Transcode VC-1"
+msgstr "Transcode VC-1"
+
 msgctxt "#30527"
 msgid "Ignore specials in next episodes"
 msgstr "Ignore specials in next episodes"
@@ -613,8 +641,8 @@ msgid "Enable external subtitles"
 msgstr "Enable external subtitles"
 
 msgctxt "#33115"
-msgid "Adjust for remote connection"
+msgid "Transcode options"
-msgstr "Adjust for remote connection"
+msgstr "Transcode options"
 
 msgctxt "#33116"
 msgid "Compress artwork (reduces quality)"

resources/settings.xml

@@ -39,12 +39,21 @@
 		<setting label="30519" id="askCinema" type="bool" default="false" visible="eq(-1,true)" subsetting="true" />
 		<setting label="30002" id="playFromStream" type="bool" default="true" />
 		<setting label="33179" id="playFromTranscode" type="bool" default="false" visible="eq(-1,true)" subsetting="true" />
-	    <setting label="30522" id="transcode_h265" type="bool" default="false" visible="eq(-1,false)" />
+	    <setting label="30160" id="maxBitrate" type="enum" values="0.5 Mbps|1 Mbps|1.5 Mbps|2.0 Mbps|2.5 Mbps|3.0 Mbps|4.0 Mbps|5.0 Mbps|6.0 Mbps|7.0 Mbps|8.0 Mbps|9.0 Mbps|10.0 Mbps|12.0 Mbps|14.0 Mbps|16.0 Mbps|18.0 Mbps|20.0 Mbps|25.0 Mbps|30.0 Mbps|35.0 Mbps|40.0 Mbps|100.0 Mbps [default]|1000.0 Mbps" visible="true" default="22" />
-	    <setting label="30537" id="transcodeHi10P" type="bool" default="false" visible="eq(-2,false)" />
 	    <setting label="33114" id="enableExternalSubs" type="bool" default="true" />
+
+		<setting type="sep" />
+		<setting label="33115" type="lsep" />
+	    <setting label="30537" id="transcodeHi10P" type="bool" default="false" visible="true" />
+	    <setting label="30522" id="transcode_h265" type="bool" default="false" visible="true" />
+	    <setting label="30523" id="transcode_mpeg2" type="bool" default="false" visible="true" />
+	    <setting label="30524" id="transcode_vc1" type="bool" default="false" visible="true" />
+	    <setting label="30161" id="videoPreferredCodec" type="select" values="H264/AVC|H265/HEVC" visible="eq(-2,false)" default="H264/AVC" />
+	    <setting label="30162" id="audioPreferredCodec" type="select" values="AAC|AC3|MP3|Opus|FLAC|Vorbis" visible="true" default="AAC" />
+	    <setting label="30163" id="audioBitrate" type="enum" values="96|128|160|192|256|320|384" visible="true" default="4" />
+	    <setting label="30164" id="audioMaxChannels" type="slider" range="2,1,6" option="int" visible="true" default="6" />
 	    <setting label="33159" id="skipDialogTranscode" type="enum" lvalues="305|33157|33158|13106" visible="true" default="3" />
-	    <setting label="33115" type="lsep" />
+	    <setting label="30165" id="allowBurnedSubs" type="bool" visible="true" enable="true" default="true" />
-	    <setting label="30160" id="videoBitrate" type="enum" values="664 Kbps SD|996 Kbps HD|1.3 Mbps HD|2.0 Mbps HD|3.2 Mbps HD|4.7 Mbps HD|6.2 Mbps HD|7.7 Mbps HD|9.2 Mbps HD|10.7 Mbps HD|12.2 Mbps HD|13.7 Mbps HD|15.2 Mbps HD|16.7 Mbps HD|18.2 Mbps HD|20.0 Mbps HD|25.0 Mbps HD|30.0 Mbps HD|35.0 Mbps HD|40.0 Mbps HD|100.0 Mbps HD [default]|1000.0 Mbps HD" visible="true" default="20" />
 
 		<setting type="sep" />
 		<setting label="33112" type="lsep" />