Revert "more optimizations to new playback code"

This reverts commit dcb7fd42fa.

resources/lib/playutils.py

@@ -37,39 +37,32 @@ class PlayUtils():
         '''
             New style to retrieve the best playback method based on sending the profile to the server
             Based on capabilities the correct path is returned, including livestreams that need to be opened by the server
+            TODO: Close livestream if needed (RequiresClosing in livestream source)
         '''
         playurl = None
         pbinfo = self.getPlaybackInfo()
         if pbinfo:
-            xbmc.log("getPlayUrl pbinfo: %s" %(pbinfo))#debug
+            xbmc.log("getPlayUrl pbinfo: %s" %(pbinfo))
             
-            if pbinfo["SupportsDirectPlay"]:
+            if pbinfo["Protocol"] == "SupportsDirectPlay":
                 playmethod = "DirectPlay"
-                playurl = pbinfo["Path"]
-                
-            elif pbinfo["SupportsDirectStream"]:
+            elif pbinfo["Protocol"] == "SupportsDirectStream":
                 playmethod = "DirectStream"
-                playurl = self.directStream()
-
+            elif pbinfo.get('LiveStreamId'):
+                playmethod = "LiveStream"
             else:
                 playmethod = "Transcode"
-                if pbinfo.get("TranscodingUrl"):
-                    playurl = self.server + pbinfo["TranscodingUrl"]
-                else:
-                    playurl = self.transcoding()
 
-            xbmc.log("getPlayUrl playmethod: %s - playurl: %s" %(playmethod, playurl))#debug
+            playurl = pbinfo["Path"]
+            xbmc.log("getPlayUrl playmethod: %s - playurl: %s" %(playmethod, playurl))
             window('emby_%s.playmethod' % playurl, value=playmethod)
             if pbinfo["RequiresClosing"] and pbinfo.get('LiveStreamId'):
                 window('emby_%s.livestreamid' % playurl, value=pbinfo["LiveStreamId"])
 
         return playurl
 
-    def getPlayUrl(self):
 
-        #TEMP !
-        if settings('experimentalPlayback') == "true":
-            return self.getPlayUrlNew()
+    def getPlayUrl(self):
 
         playurl = None
         
@@ -462,51 +455,37 @@ class PlayUtils():
                 "LiveStreamId": None 
                 }
         pbinfo = self.doUtils(url, postBody=body, action_type="POST")
-        xbmc.log("getPlaybackInfo: %s" %pbinfo)#debug
+        xbmc.log("getPlaybackInfo: %s" %pbinfo)
         mediaSource = self.getOptimalMediaSource(pbinfo["MediaSources"])
         if mediaSource and mediaSource["RequiresOpening"]:
             mediaSource = self.getLiveStream(pbinfo["PlaySessionId"], mediaSource)
         
-        
         return mediaSource
 
     def getOptimalMediaSource(self, mediasources):
         '''
         Select the best possible mediasource for playback
-        We select the best stream based on a score
-        TODO: Incorporate user preferences for best stream selection
+        Because we posted our deviceprofile to the server, 
+        only streams will be returned that can actually be played by this client so no need to check bitrates etc.
         '''
+        preferredStreamOrder = ["SupportsDirectPlay","SupportsDirectStream","SupportsTranscoding"]
         bestSource = {}
-        lastScore = 0
-        for mediasource in mediasources:
-            score = 0
-            #transform filepath to kodi compliant
-            if mediasource["Protocol"] == "File":
-                mediasource["Path"] = self.transformFilePath(mediasource["Path"])
-            
-            #The bitrate and video dimension is an important quality argument so also base our score on that
-            score += mediasource.get("Bitrate",0)
-            for stream in mediasource["MediaStreams"]:
-                if stream["Type"] == "Video" and stream.get("Width"):
-                    #some streams report high bitrate but have no video width so stream with video width has highest score
-                    #this is especially true for videos in channels, like trailers
-                    score += stream["Width"] * 10000 
-            
-            #directplay has the highest score
-            if mediasource["SupportsDirectPlay"] and self.supportsDirectPlay(mediasource):
-                score += 100000000
-            
-            #directstream also scores well, the transcode option has no points as its a last resort
-            if mediasource["SupportsDirectStream"]:
-                score += 5000000
-            
-            #TODO: If our user has any specific preferences we can alter the score
-            # For now we just select the highest quality as our prefered score
-            if score >= lastScore:
-                lastScore = score
-                bestSource = mediasource
-                
-        xbmc.log("getOptimalMediaSource: %s" %bestSource)#debug
+        for prefstream in preferredStreamOrder:
+            for source in mediasources:
+                if source[prefstream] == True:
+                    if prefstream == "SupportsDirectPlay":
+                        #always prefer direct play
+                        alt_playurl = self.checkDirectPlayPath(source["Path"])
+                        if alt_playurl:
+                            bestSource = source
+                            source["Path"] = alt_playurl
+                    elif bestSource.get("BitRate",0) < source.get("Bitrate",0):
+                        #prefer stream with highest bitrate for http sources
+                        bestSource = source
+                    elif not source.get("Bitrate") and source.get("RequiresOpening"):
+                        #livestream
+                        bestSource = source
+        xbmc.log("getOptimalMediaSource: %s" %bestSource)
         return bestSource
         
     def getLiveStream(self, playSessionId, mediaSource):
@@ -522,12 +501,11 @@ class PlayUtils():
                 "SubtitleStreamIndex": None #TODO
                 }
         streaminfo = self.doUtils(url, postBody=body, action_type="POST")
-        xbmc.log("getLiveStream: %s" %streaminfo)#debug
-        streaminfo["MediaSource"]["SupportsDirectPlay"] = self.supportsDirectPlay(streaminfo["MediaSource"])
+        xbmc.log("getLiveStream: %s" %streaminfo)
         return streaminfo["MediaSource"]
             
-    def transformFilePath(self, playurl):
-        #Transform filepath to Kodi compatible path
+    def checkDirectPlayPath(self, playurl):
+
         if self.item.get('VideoType'):
             # Specific format modification
             if self.item['VideoType'] == "Dvd":
@@ -540,11 +518,10 @@ class PlayUtils():
             playurl = playurl.replace("\\\\", "smb://")
             playurl = playurl.replace("\\", "/")
             
-        return playurl
-    
-    def supportsDirectPlay(self, mediasource):
-        #Figure out if the path can be directly played as the bool returned from the server response is not 100% reliable
-        return xbmcvfs.exists(mediasource["Path"])
+        if xbmcvfs.exists(playurl):
+            return playurl
+        else:
+            return None
     
     def getDeviceProfile(self):
         return {

resources/settings.xml

@@ -81,6 +81,5 @@
 		<setting label="30535" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=deviceid)" />
 		<setting label="33093" type="folder" id="backupPath" option="writeable" />
 		<setting label="33092" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=backup)" visible="!eq(-1,)" option="close" />
-        <setting id="experimentalPlayback" type="bool" label="Enable new experimental playback" default="false" />
 	</category>
 </settings>