Merge pull request kaltura#5385 from kaltura/Lynx-12.14.0-PlayerAware…

…ness PLAT-7142:ad stitching player awareness patches
guoyu07 · Apr 5, 2017 · ece3a75 · ece3a75
2 parents f7b7d27 + dc50e69
commit ece3a75
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php b/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php
@@ -1071,6 +1071,8 @@ private function setParamsForPlayServer($usePlayServer)
 			$this->deliveryAttributes->setUiConfId($this->getRequestParameter("uiConfId"));
 			if(!$this->deliveryAttributes->getUiConfId())
 				$this->deliveryAttributes->setUiConfId($this->getRequestParameter("uiconf"));
+			if($this->getRequestParameter("sessionId"))
+				$this->deliveryAttributes->setSessionId($this->getRequestParameter("sessionId"));
 		}
 	}
 

diff --git a/alpha/lib/model/DeliveryProfileDynamicAttributes.php b/alpha/lib/model/DeliveryProfileDynamicAttributes.php
@@ -143,6 +143,11 @@ class DeliveryProfileDynamicAttributes {
 	 */
 	protected $serveLiveAsVodEntryId;
 
+	/**
+	 * @var string
+	 */
+	protected $sessionId;
+
 	/**
 	 * request a specific delivery profile id
 	 * @var int
@@ -531,7 +536,21 @@ public function getServeLiveAsVodEntryId()
 	{
 		return $this->serveLiveAsVodEntryId;
 	}
-
+
+	/**
+	 * @return the $sessionId
+	 */
+	public function getSessionId() {
+		return $this->sessionId;
+	}
+
+	/**
+	 * @param $sessionId
+	 */
+	public function setSessionId($sessionId) {
+		$this->sessionId = $sessionId;
+	}
+
 	/**
 	 * @param array<asset|assetParams> $flavors
 	 * @return array
@@ -606,6 +625,7 @@ public function cloneAttributes(DeliveryProfileDynamicAttributes $newObj) {
 		$this->serveLiveAsVodEntryId = $newObj->getServeLiveAsVodEntryId();
 		$this->urlParams = $newObj->getUrlParams();
 		$this->deliveryProfileId = $newObj->getDeliveryProfileId();
+		$this->sessionId = $newObj->getSessionId();
 	}
 }
 
diff --git a/alpha/lib/model/DeliveryProfileVod.php b/alpha/lib/model/DeliveryProfileVod.php
@@ -24,8 +24,11 @@ protected  function generatePlayServerUrl()
 		$prefix = '';
 		if($this->getDynamicAttributes()->getUiConfId())
 			$prefix .= '/uiConfId/'.$this->getDynamicAttributes()->getUiConfId();
-
-		$prefix .= '/sessionId/{sessionId}';
+		$sessionId = $this->getDynamicAttributes()->getSessionId();
+		if($sessionId)
+			$prefix .= '/sessionId/'.$sessionId;
+		else
+			$prefix .= '/sessionId/{sessionId}';
 
 		return $prefix;
 	}