Merge pull request #8866 from kaltura/Orion-15.10.0-SUP-18799-addDefa…

…ultRecordingConversionProfile SUP-18799: add default recording conversion profile per partner
kaltura · Nov 11, 2019 · 6bedddd · 6bedddd
2 parents 2ac62ec + c72856a
commit 6bedddd
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 2 deletions.
diff --git a/admin_console/forms/PartnerConfiguration.php b/admin_console/forms/PartnerConfiguration.php
@@ -456,6 +456,11 @@ public function init()
 				'filters'		=> array('StringTrim'),
 		));
 
+        $this->addElement('text', 'default_recording_conversion_profile', array(
+            'label'			=> 'Default Recording Conversion Profile:',
+            'filters'		=> array('StringTrim'),
+        ));
+
 
 		//--------------- Host white list ----------------------------
 
@@ -1000,7 +1005,7 @@ public function addAllDisplayGroups($permissionNames)
 
 		$this->addDisplayGroup(
 			array_merge(
-				array('default_live_stream_entry_source_type', 'live_stream_provision_params', 'default_live_stream_segment_duration'),
+				array('default_live_stream_entry_source_type', 'live_stream_provision_params', 'default_live_stream_segment_duration', 'default_recording_conversion_profile'),
 				array('crossLine')),
 			'liveStreamConfig',
 			array('legend' => 'Live Stream Config')

diff --git a/alpha/lib/model/LiveEntry.php b/alpha/lib/model/LiveEntry.php
@@ -1009,5 +1009,15 @@ public function isPlayable()
 		return $this->getViewMode() == ViewMode::ALLOW_ALL && in_array($this->getLiveStatus(), array(EntryServerNodeStatus::PLAYABLE, EntryServerNodeStatus::BROADCASTING, EntryServerNodeStatus::AUTHENTICATED));
 	}
 
+	public function getRecordedEntryConversionProfile()
+    {
+        $conversionProfileId = $this->getPartner()->getDefaultRecordingConversionProfile();
+        if (!$conversionProfileId)
+        {
+            $conversionProfileId = $this->conversion_profile_id;
+        }
+	    return $conversionProfileId;
+    }
+
 
 }
diff --git a/alpha/lib/model/Partner.php b/alpha/lib/model/Partner.php
@@ -1953,6 +1953,16 @@ public function setDefaultLiveStreamSegmentDuration($v)
 		$this->putInCustomData( "default_live_stream_segment_duration", $v );
 	}
 
+    public function getDefaultRecordingConversionProfile()
+    {
+        return $this->getFromCustomData("default_recording_conversion_profile" );
+    }
+
+    public function setDefaultRecordingConversionProfile($v)
+    {
+        $this->putInCustomData( "default_recording_conversion_profile", $v );
+    }
+
 	/**
 	 * @param      string $name
 	 * @param      string $namespace

diff --git a/alpha/lib/model/conversionProfile2Peer.php b/alpha/lib/model/conversionProfile2Peer.php
@@ -65,5 +65,13 @@ public static function retrieveByPartnerIdAndSystemName ($partnerId, $systemName
 
 		return conversionProfile2Peer::doSelectOne($c);
 	}
+
+	public static function retrieveByPKAndPartnerId($id, $partnerId)
+    {
+        $c = new Criteria();
+        $c->addAnd(conversionProfile2Peer::ID, $id);
+        $c->addAnd(conversionProfile2Peer::PARTNER_ID, $partnerId);
+        return conversionProfile2Peer::doSelectOne($c);
+    }
 
 }
diff --git a/api_v3/lib/KalturaLiveEntryService.php b/api_v3/lib/KalturaLiveEntryService.php
@@ -290,7 +290,8 @@ private function createRecordedEntry(LiveEntry $dbEntry, $mediaServerIndex)
 			$recordedEntry->setIsRecordedEntry(true);
 			$recordedEntry->setTags($dbEntry->getTags());
 			$recordedEntry->setStatus(entryStatus::NO_CONTENT);
-			$recordedEntry->setConversionProfileId($dbEntry->getConversionProfileId());
+
+			$recordedEntry->setConversionProfileId($dbEntry->getRecordedEntryConversionProfile());
 
 			// make the recorded entry to be "hidden" in search so it won't return in entry list action
 			if ($dbEntry->getRecordingOptions() && $dbEntry->getRecordingOptions()->getShouldMakeHidden())

diff --git a/plugins/admin_console/system_partner/lib/SystemPartnerErrors.php b/plugins/admin_console/system_partner/lib/SystemPartnerErrors.php
@@ -17,6 +17,8 @@ class SystemPartnerErrors extends KalturaErrors
 
 	const DOMAINS_NOT_ALLOWED = "DOMAINS_NOT_ALLOWED;DOMAINS;Some domains are not allowing Kaltura: @DOMAINS@ ";
 
+    const PARTNER_RECORDING_CONVERSION_PROFILE_ID_ERROR = "PARTNER_RECORDING_CONVERSION_PROFILE_ID_ERROR;ID;Wrong conversion profile id - @ID@ -  for recording entries";
+
 	/**
 	 * codes
 	 */

diff --git a/plugins/admin_console/system_partner/lib/api/KalturaSystemPartnerConfiguration.php b/plugins/admin_console/system_partner/lib/api/KalturaSystemPartnerConfiguration.php
@@ -360,6 +360,11 @@ class KalturaSystemPartnerConfiguration extends KalturaObject
  */
 	public $defaultLiveStreamSegmentDuration;
 
+    /**
+     * @var int
+     */
+    public $defaultRecordingConversionProfile;
+
 	/**
 	 * @var string
 	 */
@@ -479,6 +484,7 @@ class KalturaSystemPartnerConfiguration extends KalturaObject
 		"htmlPurifierBehaviour",
 		"htmlPurifierBaseListUsage",
 		"defaultLiveStreamSegmentDuration",
+		"defaultRecordingConversionProfile",
 		"eSearchLanguages",
 		"publisherEnvironmentType",
 		"ovpEnvironmentUrl",
@@ -565,6 +571,16 @@ public function validateForUpdate($sourceObject, $propertiesToSkip = array())
 			$this->validatePropertyNumeric('defaultLiveStreamSegmentDuration');
 			$this->validatePropertyMinMaxValue('defaultLiveStreamSegmentDuration', KalturaLiveEntry::MIN_ALLOWED_SEGMENT_DURATION_MILLISECONDS, KalturaLiveEntry::MAX_ALLOWED_SEGMENT_DURATION_MILLISECONDS);
 		}
+
+		if (!$this->isNull('defaultRecordingConversionProfile'))
+        {
+            $this->validatePropertyNumeric('defaultRecordingConversionProfile');
+            $conversionProfile = conversionProfile2Peer::retrieveByPKAndPartnerId($this->defaultRecordingConversionProfile, $sourceObject->getId());
+            if (!$conversionProfile) {
+                throw new KalturaAPIException(SystemPartnerErrors::PARTNER_RECORDING_CONVERSION_PROFILE_ID_ERROR, $this->defaultRecordingConversionProfile);
+            }
+        }
+
 		$this->validateAllowedFromEmailWhiteList();
 		return parent::validateForUpdate($sourceObject,$propertiesToSkip);
 	}