[PictureInPicture]

* Change in PiP handling due to fixing stream relay service pipzap

Cherry pick -> OpenViX/enigma2@441f4d7

Author: jbleyel

lib/python/Screens/PictureInPicture.py

@@ -3,6 +3,7 @@
 from enigma import ePoint, eSize, eRect, eServiceCenter, getBestPlayableServiceReference, eServiceReference, eTimer
 from Components.SystemInfo import BoxInfo
 from Components.VideoWindow import VideoWindow
+from Components.Sources.StreamService import StreamServiceList
 from Components.config import config, ConfigPosition, ConfigSelection
 from Tools import Notifications
 from Screens.MessageBox import MessageBox
@@ -61,6 +62,9 @@ def __init__(self, session):
 		self.currentService = None
 		self.currentServiceReference = None
 		self.noSkinReload = True
+		self.isCurrentStreamRelay = False
+		self.pipservice = None
+		session.nav.pnav.clearPiPService()
 
 		self.choicelist = [("standard", _("Standard"))]
 		if BoxInfo.getItem("VideoDestinationConfigurable"):
@@ -79,7 +83,8 @@ def __init__(self, session):
 		self.onLayoutFinish.append(self.LayoutFinished)
 
 	def __del__(self):
-		del self.pipservice
+		if self.pipservice:
+			del self.pipservice
 		self.setExternalPiP(False)
 		self.setSizePosMainWindow()
 		if hasattr(self, "dishpipActive") and self.dishpipActive is not None:
@@ -180,31 +185,48 @@ def getModeName(self):
 
 	def playService(self, service):
 		if service is None:
-			return False
+			self.session.nav.pnav.clearPiPService()
+			return 0
 		from Screens.InfoBarGenerics import streamrelay
-		ref, isStreamRelay = streamrelay.streamrelayChecker(self.resolveAlternatePipService(service))
+		ref = streamrelay.streamrelayChecker(self.resolveAlternatePipService(service))[0]
 		if ref:
-			if self.isPlayableForPipService(ref):
-				print("playing pip service", ref and ref.toString())
-			else:
+			if BoxInfo.getItem("CanNotDoSimultaneousTranscodeAndPIP") and StreamServiceList:
+				self.pipservice = None
+				self.currentService = None
+				self.currentServiceReference = None
 				if not config.usage.hide_zap_errors.value:
+					Notifications.AddPopup(text="PiP...\n" + _("Connected transcoding, limit - no PiP!"), type=MessageBox.TYPE_ERROR, timeout=5, id="ZapPipError")
+				return 0
+			if ref.toString().startswith("4097"):  # Change to service type 1 and try to play a stream as type 1
+				ref = eServiceReference("1" + ref.toString()[4:])
+			self.session.nav.pnav.setPiPService(ref)
+			if not self.isPlayableForPipService(ref):
+				is_sr = self.isCurrentStreamRelay
+				if is_sr:
+					if self.pipservice:
+						self.pipservice.stop()
+					self.isCurrentStreamRelay = False
+				if not config.usage.hide_zap_errors.value and not is_sr:
 					Notifications.AddPopup(text=_("No free tuner!"), type=MessageBox.TYPE_ERROR, timeout=5, id="ZapPipError")
-				return False
+				return 0 if not is_sr else 2
+			print("[PictureInPicture] playing pip service", ref and ref.toString())
 			self.pipservice = eServiceCenter.getInstance().play(ref)
 			if self.pipservice and not self.pipservice.setTarget(1, True):
 				if hasattr(self, "dishpipActive") and self.dishpipActive is not None:
 					self.dishpipActive.startPiPService(ref)
 				self.pipservice.start()
 				self.currentService = service
 				self.currentServiceReference = ref
-				return True
+				if ref and ref.getIsStreamRelay():
+					self.isCurrentStreamRelay = True
+				return 1
 			else:
 				self.pipservice = None
 				self.currentService = None
 				self.currentServiceReference = None
 				if not config.usage.hide_zap_errors.value:
 					Notifications.AddPopup(text=_("Incorrect type service for PiP!"), type=MessageBox.TYPE_ERROR, timeout=5, id="ZapPipError")
-		return False
+		return 0
 
 	def getCurrentService(self):
 		return self.currentService
@@ -217,7 +239,7 @@ def isPlayableForPipService(self, service):
 		if playingref is None or service == playingref:
 			return True
 		info = eServiceCenter.getInstance().info(service)
-		oldref = self.currentServiceReference or eServiceReference()
+		oldref = self.currentService or eServiceReference()
 		if info and info.isPlayable(service, oldref):
 			return True
 		return False