Merge pull request kaltura#1286 from kaltura/IX-9.17.0-url-managers

1. Added some default delivery profiles.
jessport1 · Jun 9, 2014 · cdaf403 · cdaf403
2 parents 94b85d6 + e843b41
commit cdaf403
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 1 deletion.
diff --git a/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php b/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php
@@ -689,6 +689,9 @@ private function serveVodEntry()
 		} else if($this->deliveryAttributes->getFormat() == PlaybackProtocol::RTMP) {
 			if(strpos($this->deliveryAttributes->getMediaProtocol(), "rtmp") !== 0)
 				$this->deliveryAttributes->setMediaProtocol("rtmp");
+		} else if($this->deliveryAttributes->getFormat() == PlaybackProtocol::HTTP) {
+			if(strpos($this->deliveryAttributes->getMediaProtocol(), "http") !== 0)
+				$this->deliveryAttributes->setMediaProtocol("http");
 		}
 
 		// <-- 

diff --git a/alpha/lib/model/DeliveryProfile.php b/alpha/lib/model/DeliveryProfile.php
@@ -222,7 +222,7 @@ protected function getFlavorAssetInfo($url, $urlPrefix = '', $flavor = null)
 			$ext = pathinfo($urlPath, PATHINFO_EXTENSION);
 		}
 
-		$bitrate = ($flavor ? $flavor->getBitrate() : 0);
+		$bitrate = ($flavor ? $flavor->getVideoBitrate() : 0);
 		$width =   ($flavor ? $flavor->getWidth()   : 0);
 		$height =  ($flavor ? $flavor->getHeight()  : 0);
 

diff --git a/deployment/base/scripts/init_data/07.DeliveryProfileAkamaiAppleHttp.template.ini b/deployment/base/scripts/init_data/07.DeliveryProfileAkamaiAppleHttp.template.ini
@@ -0,0 +1,11 @@
+[DefaultVodAppleHttp]
+id=501
+partnerId=0
+name="Default HTTP Delivery Profile"
+type=10
+systemName="Default Akamai HLS direct"
+description="Default Akamai HLS direct"
+streamerType=applehttp
+isDefault=1
+parentId=0
+url="http://@HOST_NAME@"
diff --git a/...nit_data/07.DeliveryProfileAkamaiHttp.ini → ...07.DeliveryProfileAkamaiHttp.template.ini b/...nit_data/07.DeliveryProfileAkamaiHttp.ini → ...07.DeliveryProfileAkamaiHttp.template.ini
diff --git a/deployment/updates/scripts/2014_05_27_create_delivery_profiles.php b/deployment/updates/scripts/2014_05_27_create_delivery_profiles.php
@@ -7,7 +7,10 @@
  *
  * No need to re-run after server code deploy
  */
+require_once (__DIR__ . '/../../bootstrap.php');
+
 $script = realpath(dirname(__FILE__) . '/../../') . '/base/scripts/insertDefaults.php';
+$cdnApiHost = kConf::get("cdn_api_host");
 
 $config = realpath(dirname(__FILE__) . '/../../') . '/base/scripts/init_data/07.DeliveryProfileLiveAppleHttp.ini';
 passthru("php $script $config");
@@ -19,5 +22,20 @@
 passthru("php $script $config");
 
 
+$configTemplate = realpath(dirname(__FILE__) . '/../../') . '/base/scripts/init_data/07.DeliveryProfileAkamaiHttp.template.ini';
 $config = realpath(dirname(__FILE__) . '/../../') . '/base/scripts/init_data/07.DeliveryProfileAkamaiHttp.ini';
+$content = file_get_contents($configTemplate);
+$content = str_replace("@HOST_NAME@", $cdnApiHost, $content);
+file_put_contents($config, $content);
 passthru("php $script $config");
+unlink($config);
+
+
+$configTemplate = realpath(dirname(__FILE__) . '/../../') . '/base/scripts/init_data/07.DeliveryProfileAkamaiAppleHttp.template.ini';
+$config = realpath(dirname(__FILE__) . '/../../') . '/base/scripts/init_data/07.DeliveryProfileAkamaiAppleHttp.ini';
+$content = file_get_contents($configTemplate);
+$content = str_replace("@HOST_NAME@", $cdnApiHost, $content);
+file_put_contents($config, $content);
+passthru("php $script $config");
+unlink($config);
+