sportarchive / CloudTranscode

src/activities/transcoders/VideoTranscoder.php

Spacing +24 added lines, -24 removed lines

@@ -7,7 +7,7 @@ 
  * We use ffprobe, ffmpeg and convert to analyse, transcode and manipulate videos and images (watermark)
  */
 
-require_once __DIR__ . '/BasicTranscoder.php';
+require_once __DIR__.'/BasicTranscoder.php';
 
 use SA\CpeSdk;
 
@@ -105,7 +105,7 @@ 
             $this->cpeLogger->log_out(
                 "INFO", 
                 basename(__FILE__), 
-                "Input Video metadata: " . print_r($metadata, true),
+                "Input Video metadata: ".print_r($metadata, true),
                 $this->activityLogKey
             );
         
@@ -142,7 +142,7 @@ 
             $this->cpeLogger->log_out(
                 "ERROR", 
                 basename(__FILE__), 
-                "Execution of command '".$ffmpegCmd."' failed: " . print_r($metadata, true). ". ".$e->getMessage(),
+                "Execution of command '".$ffmpegCmd."' failed: ".print_r($metadata, true).". ".$e->getMessage(),
                 $this->activityLogKey
             );
             return false;
@@ -185,7 +185,7 @@ 
         }
         
         // Append output filename to path
-        $pathToOutputFiles .= "/" . $outputWanted->{'output_file_info'}['basename'];
+        $pathToOutputFiles .= "/".$outputWanted->{'output_file_info'}['basename'];
         // Replace ${output_file} by output filename and path to local disk
         $ffmpegCmd = preg_replace('/\$\{output_file\}/', $pathToOutputFiles, $ffmpegCmd);
 
@@ -245,7 +245,7 @@ 
         }
         
         // Create FFMpeg arguments
-        $ffmpegArgs =  " -i $pathToInputFile -y -threads 0";
+        $ffmpegArgs = " -i $pathToInputFile -y -threads 0";
         $ffmpegArgs .= " -s $size";
         $ffmpegArgs .= " -vcodec $videoCodec";
         $ffmpegArgs .= " -acodec $audioCodec";
@@ -256,9 +256,9 @@ 
         $ffmpegArgs .= " $watermarkOptions";
         
         // Append output filename to path
-        $pathToOutputFiles .= "/" . $outputWanted->{'output_file_info'}['basename'];
+        $pathToOutputFiles .= "/".$outputWanted->{'output_file_info'}['basename'];
         // Final command
-        $ffmpegCmd  = "ffmpeg $ffmpegArgs $pathToOutputFiles";
+        $ffmpegCmd = "ffmpeg $ffmpegArgs $pathToOutputFiles";
             
         return ($ffmpegCmd);
     }
@@ -285,8 +285,8 @@ 
                 $snapshot_sec = $outputWanted->{'snapshot_sec'};
             }
                 
-            $time = gmdate("H:i:s", $snapshot_sec) . ".000";
-            $pathToOutputFiles .= "/" . $outputFileInfo['basename'];
+            $time = gmdate("H:i:s", $snapshot_sec).".000";
+            $pathToOutputFiles .= "/".$outputFileInfo['basename'];
             $frameOptions = " -ss $time -vframes 1";
         }
         else if ($outputWanted->{'mode'} == 'intervals')
@@ -297,14 +297,14 @@ 
                 $intervals = $outputWanted->{'intervals'};
             }
             
-            $pathToOutputFiles .= "/" . $outputFileInfo['filename'] . "%06d." 
+            $pathToOutputFiles .= "/".$outputFileInfo['filename']."%06d." 
                 . $outputFileInfo['extension'];
             $frameOptions = " -vf fps=fps=1/$intervals";
         }
 
         // Create FFMpeg arguments
-        $ffmpegArgs  =  " -i $pathToInputFile -y -threads 0";
-        $ffmpegArgs .= " -vf scale=" . $outputWanted->{'size'};
+        $ffmpegArgs  = " -i $pathToInputFile -y -threads 0";
+        $ffmpegArgs .= " -vf scale=".$outputWanted->{'size'};
         $ffmpegArgs .= " $frameOptions -f image2 -q:v 8";
 
         // Final command
@@ -335,7 +335,7 @@ 
             $this->activityLogKey);
 
         // Transform watermark for opacity
-        $convertCmd = "convert $watermarkPath -alpha on -channel A -evaluate Multiply " . $watermarkOptions->{'opacity'} . " +channel $newWatermarkPath";
+        $convertCmd = "convert $watermarkPath -alpha on -channel A -evaluate Multiply ".$watermarkOptions->{'opacity'}." +channel $newWatermarkPath";
 
         try {
             $out = $this->executer->execute($convertCmd, 1, 
@@ -364,7 +364,7 @@ 
         // Format options for FFMpeg
         $size      = $watermarkOptions->{'size'};
         $positions = $this->get_watermark_position($watermarkOptions);
-        $formattedOptions = "-vf \"movie=$newWatermarkPath, scale=$size [wm]; [in][wm] overlay=" . $positions['x'] . ':' . $positions['y'] . " [out]\"";
+        $formattedOptions = "-vf \"movie=$newWatermarkPath, scale=$size [wm]; [in][wm] overlay=".$positions['x'].':'.$positions['y']." [out]\"";
         
         return ($formattedOptions);
     }
@@ -381,10 +381,10 @@ 
             $positions['y'] = $watermarkOptions->{'y'};
         }
         if ($watermarkOptions->{'x'} < 0) {
-            $positions['x'] = 'main_w-overlay_w' . $watermarkOptions->{'x'};
+            $positions['x'] = 'main_w-overlay_w'.$watermarkOptions->{'x'};
         }
         if ($watermarkOptions->{'y'} < 0) {
-            $positions['y'] = 'main_h-overlay_h' . $watermarkOptions->{'y'};
+            $positions['y'] = 'main_h-overlay_h'.$watermarkOptions->{'y'};
         }
 
         return ($positions);
@@ -493,7 +493,7 @@ 
         // # finally, progress is easy
         $progress = 0;
         if ($done) {
-            $progress = round(($done/$duration)*100);
+            $progress = round(($done / $duration) * 100);
         }
         
         $this->cpeLogger->log_out(
@@ -528,7 +528,7 @@ 
         }
         
         $preset     = $output_wanted->{"preset"};
-        $presetPath = __DIR__ . '/../../../presets/';
+        $presetPath = __DIR__.'/../../../presets/';
 
         if (!($presetContent = file_get_contents($presetPath.$preset.".json"))) {
             throw new CpeSdk\CpeException("Can't open preset file !",
@@ -552,7 +552,7 @@ 
         }
 
         $preset     = $output->{"preset"};
-        $presetPath = __DIR__ . '/../../../presets/';
+        $presetPath = __DIR__.'/../../../presets/';
         
         if (!($files = scandir($presetPath))) {
             throw new CpeSdk\CpeException("Unable to open preset directory '$presetPath' !",
@@ -608,22 +608,22 @@ 
         }
 
         $analyse = [
-            'duration' => isset($metadata->format->duration) ? (float)$metadata->format->duration : 0,
+            'duration' => isset($metadata->format->duration) ? (float) $metadata->format->duration : 0,
             'video' => empty($videoStreams) ? null : [
                 'codec' => $videoStreams->codec_name,
                 'color' => $videoStreams->color_space,
-                'resolution' => $videoStreams->width . 'x' . $videoStreams->height,
+                'resolution' => $videoStreams->width.'x'.$videoStreams->height,
                 'sar' => $videoStreams->sample_aspect_ratio,
                 'dar' => $videoStreams->display_aspect_ratio,
                 'framerate' => $videoStreams->r_frame_rate,
-                'bitrate' => isset($videoStreams->bit_rate) ? (int)$videoStreams->bit_rate : null
+                'bitrate' => isset($videoStreams->bit_rate) ? (int) $videoStreams->bit_rate : null
             ],
             'audio' => empty($audioStreams) ? null : [
                 'codec' => $audioStreams->codec_name,
                 'frequency' => $audioStreams->sample_rate,
-                'channels' => (int)$audioStreams->channels,
+                'channels' => (int) $audioStreams->channels,
                 'depth' => $audioStreams->bits_per_sample,
-                'bitrate' => (int)$audioStreams->bit_rate
+                'bitrate' => (int) $audioStreams->bit_rate
             ]
         ];
 

Braces +11 added lines, -14 removed lines

@@ -49,11 +49,12 @@ 
         $metadata = null, 
         $outputWanted)
     {
-        if (!$metadata)
-            throw new CpeSdk\CpeException(
+        if (!$metadata) {
+                    throw new CpeSdk\CpeException(
                 "NO Input Video metadata! We can't transcode an asset without probing it first. Use ValidateAsset activity to probe it and pass a 'metadata' field containing the input metadata to this TranscodeAsset activity.",
                 self::TRANSCODE_FAIL
             );
+        }
         // Extract an sanitize metadata
         $metadata = $this->_extractFileInfo($metadata);
 
@@ -101,13 +102,14 @@ 
             $this->activityLogKey
         );
         
-        if ($metadata)
-            $this->cpeLogger->log_out(
+        if ($metadata) {
+                    $this->cpeLogger->log_out(
                 "INFO", 
                 basename(__FILE__), 
                 "Input Video metadata: " . print_r($metadata, true),
                 $this->activityLogKey
             );
+        }
         
         try {
             // Use executer to start FFMpeg command
@@ -137,8 +139,7 @@ 
             // FFProbe the output file and return its information
             $output_info =
                 $this->get_asset_info($pathToOutputFiles."/".$outputWanted->{'output_file_info'}['basename']);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->log_out(
                 "ERROR", 
                 basename(__FILE__), 
@@ -288,8 +289,7 @@ 
             $time = gmdate("H:i:s", $snapshot_sec) . ".000";
             $pathToOutputFiles .= "/" . $outputFileInfo['basename'];
             $frameOptions = " -ss $time -vframes 1";
-        }
-        else if ($outputWanted->{'mode'} == 'intervals')
+        } else if ($outputWanted->{'mode'} == 'intervals')
         {
             $intervals = self::INTERVALS_DEFAULT;
             if (isset($outputWanted->{'intervals'}) &&
@@ -342,8 +342,7 @@ 
                 array(1 => array("pipe", "w"), 2 => array("pipe", "w")),
                 false, false, 
                 false, 1);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->log_out(
                 "ERROR", 
                 basename(__FILE__), 
@@ -601,8 +600,7 @@ 
         foreach ($metadata->streams as $key => $value) {
             if ($value->codec_type === 'video') {
                 $videoStreams = $value;
-            }
-            else if ($value->codec_type === 'audio') {
+            } else if ($value->codec_type === 'audio') {
                 $audioStreams = $value;
             }
         }
@@ -653,8 +651,7 @@ 
                 false, false, 
                 false, 1
             );
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->log_out(
                 "ERROR", 
                 basename(__FILE__),