changes after code review

main changes: 1) name refectory from lowLatencySettings to segmentDuration 2) replace segmentDuration type from enum to int
coralburg12 · Jan 22, 2017 · 64660d9 · 64660d9
1 parent ff19422
commit 64660d9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 44 deletions.
diff --git a/alpha/lib/enums/KalturaLowLatencyChunkDurationValue.php b/alpha/lib/enums/KalturaLowLatencyChunkDurationValue.php
diff --git a/alpha/lib/enums/LowLatencyChunkDurationValue.php b/alpha/lib/enums/LowLatencyChunkDurationValue.php
diff --git a/alpha/lib/enums/PermissionName.php b/alpha/lib/enums/PermissionName.php
@@ -68,7 +68,7 @@ interface PermissionName extends BaseEnum
 	const FEATURE_BLOCK_FLVCLIPPER_ACTION = 'FEATURE_BLOCK_FLVCLIPPER_ACTION';
 
 	const FEATURE_DISABLE_NEW_USER_EMAIL = 'FEATURE_DISABLE_NEW_USER_EMAIL';
-	const FEATURE_LIVE_STREAM_ENABLE_LOW_LATENCY = 'FEATURE_LIVE_STREAM_ENABLE_LOW_LATENCY';
+	const FEATURE_LIVE_STREAM_ENABLE_SEGMENT_DURATION_UPDATE = 'FEATURE_LIVE_STREAM_ENABLE_SEGMENT_DURATION_UPDATE';
 
     // base system permissions
 

diff --git a/alpha/lib/model/LiveEntry.php b/alpha/lib/model/LiveEntry.php
@@ -16,6 +16,7 @@ abstract class LiveEntry extends entry
 	const CUSTOM_DATA_NAMESPACE_MEDIA_SERVERS = 'mediaServers';
 	const CUSTOM_DATA_RECORD_STATUS = 'record_status';
 	const CUSTOM_DATA_RECORD_OPTIONS = 'recording_options';
+	const DEFAULT_SEGMENT_DURATION_SECONDS = 10;
 	static $kalturaLiveSourceTypes = array(EntrySourceType::LIVE_STREAM, EntrySourceType::LIVE_CHANNEL, EntrySourceType::LIVE_STREAM_ONTEXTDATA_CAPTIONS);
 
 	protected $decidingLiveProfile = false;
@@ -747,8 +748,8 @@ public function setPublishConfigurations ($v)
 		$this->putInCustomData('push_publish_configurations', $v);
 	}
 
-	public function setLowLatencySettings ( $v )	{	$this->putInCustomData ( "$lowLatencySettings" , $v );	}
-	public function getLowLatencySettings (  )	{	return $this->getFromCustomData( "$lowLatencySettings", null, KalturaLowLatencyChunkDurationValue::TEN_SECONDS_CHUNK_DURATION);	}
+	public function setSegmentDuration ( $v )	{	$this->putInCustomData ( "segmentDuration" , $v );	}
+	public function getSegmentDuration (  )	{	return $this->getFromCustomData( "segmentDuration", null, LiveEntry::DEFAULT_SEGMENT_DURATION_SECONDS);	}
 
 	/**
 	 * @return boolean

diff --git a/api_v3/lib/types/entry/KalturaLiveStreamEntry.php b/api_v3/lib/types/entry/KalturaLiveStreamEntry.php
@@ -114,11 +114,11 @@ class KalturaLiveStreamEntry extends KalturaLiveEntry
 	public $primaryServerNodeId;
 
 	/**
-	 * The low latency flag
+	 * The chunk duration value in seconds
 	 * @requiresPermission all
-	 * @var KalturaLowLatencyChunkDurationValue
+	 * @var int
 	 */
-	public $lowLatencySettings;
+	public $segmentDuration;
 
 	private static $map_between_objects = array
 	(
@@ -137,7 +137,7 @@ class KalturaLiveStreamEntry extends KalturaLiveEntry
 		"streamUsername",
 		"bitrates" => "streamBitrates",
 		"primaryServerNodeId",
-		"lowLatencySettings",
+		"segmentDuration",
 	);
 
 	public function __construct()

diff --git a/configurations/admin.template.ini b/configurations/admin.template.ini
@@ -147,13 +147,13 @@ moduls.kalturaLiveStreamTranscode.basePermissionType = 2
 moduls.kalturaLiveStreamTranscode.basePermissionName = FEATURE_KALTURA_LIVE_STREAM
 moduls.kalturaLiveStreamTranscode.group = GROUP_ENABLE_DISABLE_FEATURES
 
-moduls.liveStreamLowLatencySettings.enabled = true
-moduls.liveStreamLowLatencySettings.permissionType = 2
-moduls.liveStreamLowLatencySettings.label = Enable Low Latency
-moduls.liveStreamLowLatencySettings.permissionName = FEATURE_LIVE_STREAM_ENABLE_LOW_LATENCY
-moduls.liveStreamLowLatencySettings.basePermissionType = 2
-moduls.liveStreamLowLatencySettings.basePermissionName = FEATURE_LIVE_STREAM
-moduls.liveStreamLowLatencySettings.group = GROUP_ENABLE_DISABLE_FEATURES
+moduls.liveStreamSegmentDuration.enabled = true
+moduls.liveStreamSegmentDuration.permissionType = 2
+moduls.liveStreamSegmentDuration.label = Enable Segment Duration Update
+moduls.liveStreamSegmentDuration.permissionName = FEATURE_LIVE_STREAM_ENABLE_SEGMENT_DURATION_UPDATE
+moduls.liveStreamSegmentDuration.basePermissionType = 2
+moduls.liveStreamSegmentDuration.basePermissionName = FEATURE_LIVE_STREAM
+moduls.liveStreamSegmentDuration.group = GROUP_ENABLE_DISABLE_FEATURES
 
 moduls.liveChannel.enabled = true
 moduls.liveChannel.permissionType = 2

diff --git a/doc/media-server-config.md b/doc/media-server-config.md
@@ -12,7 +12,7 @@
  - FEATURE_LIVE_STREAM_RECORD
  - FEATURE_KALTURA_LIVE_STREAM
  - FEATURE_KALTURA_LIVE_STREAM_TRANSCODE
- - FEATURE_LIVE_STREAM_ENABLE_LOW_LATENCY
+ - FEATURE_LIVE_STREAM_ENABLE_SEGMENT_DURATION_UPDATE