FOUN-290 - allow ffmpeg non-chunk convert to handle estimatedEffort t…

…hreshold
coralburg12 · Dec 8, 2021 · 3fd19d9 · 3fd19d9
1 parent 3013ff5
commit 3fd19d9
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 11 deletions.
diff --git a/alpha/apps/kaltura/lib/batch2/kJobsManager.php b/alpha/apps/kaltura/lib/batch2/kJobsManager.php
@@ -599,7 +599,7 @@ public static function addFlavorConvertJob(array $srcSyncKeys, flavorParamsOutpu
 
 		$dbConvertFlavorJob->setObjectId($flavorAssetId);
 		$dbConvertFlavorJob->setObjectType(BatchJobObjectType::ASSET);
-
+		$convertData->setEstimatedEffort($convertData->calculateEstimatedEffort($dbConvertFlavorJob));
 		return kJobsManager::addJob($dbConvertFlavorJob, $convertData, BatchJobType::CONVERT, $dbCurrentConversionEngine);
 	}
 

diff --git a/alpha/apps/kaltura/lib/batch2/model/kConvertJobData.php b/alpha/apps/kaltura/lib/batch2/model/kConvertJobData.php
@@ -69,6 +69,11 @@ class kConvertJobData extends kConvartableJobData
 	 * @var int
 	 */
 	private $userCpu;
+
+	/**
+	 * @var int
+	 */
+	private $estimatedEffort;
 
 	/**
 	 * @return the $destFileSyncLocalPath
@@ -387,4 +392,18 @@ public function getUserCpu() {
 	public function setUserCpu($userCpu) {
 		$this->userCpu = $userCpu;
 	}
+
+	/**
+	 * @return the $estimatedEffort
+	 */
+	public function getEstimatedEffort() {
+		return $this->estimatedEffort;
+	}
+
+	/**
+	 * @param int $estimatedEffort
+	 */
+	public function setEstimatedEffort($estimatedEffort) {
+		$this->estimatedEffort = $estimatedEffort;
+	}
 }
diff --git a/api_v3/lib/types/batch/KalturaConvertJobData.php b/api_v3/lib/types/batch/KalturaConvertJobData.php
@@ -61,6 +61,11 @@ class KalturaConvertJobData extends KalturaConvartableJobData
 	 * @var int
 	 */
 	public $userCpu;
+
+	/**
+	 * @var int
+	 */
+	public $estimatedEffort;
 
 	private static $map_between_objects = array
 	(
@@ -74,7 +79,8 @@ class KalturaConvertJobData extends KalturaConvartableJobData
 		"extraDestFileSyncs",
 		"engineMessage",
 		"destFileSyncSharedPath",
-		"userCpu"
+		"userCpu",
+		"estimatedEffort"
 	);
 
 	public function getMapBetweenObjects ( )
@@ -87,7 +93,7 @@ public function toObject($dbData = null, $props_to_skip = array())
 	{
 		if(is_null($dbData))
 			$dbData = new kConvertJobData();
-			
+
 		return parent::toObject($dbData, $props_to_skip);
 	}
 
@@ -108,4 +114,4 @@ public function fromSubType($subType)
 	{
 		return kPluginableEnumsManager::coreToApi('conversionEngineType', $subType);
 	}
-}
+}
diff --git a/batch/batches/Convert/Engines/KConversionEngine.class.php b/batch/batches/Convert/Engines/KConversionEngine.class.php
@@ -176,9 +176,10 @@ protected function getQuickStartCmdLine($add_log)
 	 * 
 	 * @param string $cmd_line
 	 * @param boolean $add_log
+	 * @param integer $estimatedeffort
 	 * @return string
 	 */
-	protected function getCmdLine ($cmd_line , $add_log )
+	protected function getCmdLine ($cmd_line , $add_log, $estimatedeffort = null )
 	{
 		// I have commented out the audio parameters so we don't decrease the quality - it stays as-is
 		$binName=$this->getCmd();

diff --git a/batch/batches/Convert/Engines/KConversionEngineChunkedFfmpeg.class.php b/batch/batches/Convert/Engines/KConversionEngineChunkedFfmpeg.class.php
@@ -283,9 +283,10 @@ private function adjust_cmdline($cmdLine)
 	 *
 	 * @param string $cmd_line
 	 * @param boolean $add_log
+	 * @param integer $estimatedeffort
 	 * @return string
 	 */
-	protected function getCmdLine ($cmd_line , $add_log )
+	protected function getCmdLine ($cmd_line , $add_log, $estimatedeffort = null )
 	{
 		// I have commented out the audio parameters so we don't decrease the quality - it stays as-is
 		$binName=$this->getCmd();

diff --git a/batch/batches/Convert/Engines/KConversionEngineFfmpeg.class.php b/batch/batches/Convert/Engines/KConversionEngineFfmpeg.class.php
@@ -584,13 +584,23 @@ public static function fetchCaptionFile($captionUrl, $captionFilePath)
 	 *
 	 * @param string $cmd_line
 	 * @param boolean $add_log
+	 * @param integer $estimatedEffort
 	 * @return string
 	 */
-	protected function getCmdLine ($cmd_line , $add_log )
+	protected function getCmdLine ($cmd_line , $add_log, $estimatedEffort = null )
 	{
 		// I have commented out the audio parameters so we don't decrease the quality - it stays as-is
 		$binName = $this->getCmd();
-		$inputFilePath = kFile::buildDirectUrl($this->inFilePath);
+		if(isset(KBatchBase::$taskConfig->estimatedEffortThreshold) && $estimatedEffort && $estimatedEffort < KBatchBase::$taskConfig->estimatedEffortThreshold)
+		{
+			KalturaLog::debug("Setting pre-signed url for convert.");
+			$inputFilePath = kFile::realPath($this->inFilePath);
+		}
+		else
+		{
+			$inputFilePath = kFile::buildDirectUrl($this->inFilePath);
+		}
+
 		kBatchUtils::addReconnectParams("http", $inputFilePath,$binName);
 
 		$exec_cmd = "$binName " .

diff --git a/batch/batches/Convert/Engines/KConversionEngineFfmpegAux.class.php b/batch/batches/Convert/Engines/KConversionEngineFfmpegAux.class.php
@@ -22,7 +22,7 @@ public function getCmd ()
 		return KBatchBase::$taskConfig->params->ffmpegAuxCmd;
 	}
 
-	protected function getCmdLine ($cmd_line , $add_log )
+	protected function getCmdLine ($cmd_line , $add_log, $estimatedeffort = null )
 	{
 		// I have commented out the audio parameters so we don't decrease the quality - it stays as-is
 		$binName = $this->getCmd();

diff --git a/batch/batches/Convert/Engines/KJobConversionEngine.class.php b/batch/batches/Convert/Engines/KJobConversionEngine.class.php
@@ -19,7 +19,6 @@ protected function getExecutionCommandAndConversionString ( KalturaConvertJobDat
 	{
 		$tempPath = dirname($data->destFileSyncLocalPath);
 		$this->logFilePath = $data->logFileSyncLocalPath;
-
 		// assume there always will be this index
 		$conv_params = $data->flavorParamsOutput;
 
@@ -63,7 +62,7 @@ protected function getExecutionCommandAndConversionString ( KalturaConvertJobDat
 				}
 				else
 				{
-					$exec_cmd = $this->getCmdLine ( $cmd , true );
+					$exec_cmd = $this->getCmdLine ( $cmd , true, $data->estimatedEffort );
 				}
 				$conversion_engine_result = new KConversioEngineResult( $exec_cmd , $cmd );
 				$conversion_engine_result_list[] = $conversion_engine_result;