From fea6fc4cf1fb3006cd100f5f8d8a572b644394bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Chv=C3=ADla?= <miso.chvila@gmail.com>
Date: Tue, 15 Sep 2020 01:09:02 +0200
Subject: [PATCH] playutils: Always honor manual transcoding bitrates

* Override VideoBitrate option in transcoding url (previously calced in backend)
* Use manual AudioBitrate when user has track selection dialog disabled
* Fix bad loop-and-remove
---
 jellyfin_kodi/helper/playutils.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/jellyfin_kodi/helper/playutils.py b/jellyfin_kodi/helper/playutils.py
index 1279270b..e64448f6 100644
--- a/jellyfin_kodi/helper/playutils.py
+++ b/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:
-                    if 'AudioStreamIndex' in i or 'AudioBitrate' in i or 'SubtitleStreamIndex' in i:  # handle manually
-                        url_parsed.remove(i)
+            audio_bitrate = self.get_transcoding_audio_bitrate()
+            video_bitrate = self.get_max_bitrate() - audio_bitrate
 
-                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)
@@ -643,7 +650,6 @@ class PlayUtils(object):
 
         self.info['AudioStreamIndex'] = audio_selected
         prefs += "&AudioStreamIndex=%s" % audio_selected
-        prefs += "&AudioBitrate=%d" % self.get_transcoding_audio_bitrate()
 
         if subtitle: