nystudio107 / craft-transcoder

src/config.php

Indentation +27 added lines, -27 removed lines

@@ -32,27 +32,27 @@ 
     'ffprobePath' => '/usr/bin/ffprobe',
 
     // The options to use for ffprobe
-	'ffprobeOptions' => '-v quiet -print_format json -show_format -show_streams',
+    'ffprobeOptions' => '-v quiet -print_format json -show_format -show_streams',
 
     // The path where the transcoded videos are stored; must have a trailing /
     // Yii2 aliases are supported here    
-	'transcoderPaths' => [
-		'default' 	=> '@webroot/transcoder/',
-		'video' 	=> '@webroot/transcoder/video/',
-		'audio' 	=> '@webroot/transcoder/audio/',
-		'thumbnail' => '@webroot/transcoder/thumbnail/',
-		'gif'		=> '@webroot/transcoder/gif/'
-	],
+    'transcoderPaths' => [
+        'default' 	=> '@webroot/transcoder/',
+        'video' 	=> '@webroot/transcoder/video/',
+        'audio' 	=> '@webroot/transcoder/audio/',
+        'thumbnail' => '@webroot/transcoder/thumbnail/',
+        'gif'		=> '@webroot/transcoder/gif/'
+    ],
 	
     // The URL where the transcoded videos are stored; must have a trailing /
     // Yii2 aliases are supported here
-	'transcoderUrls' => [
-		'default' 	=> '@web/transcoder/',
-		'video' 	=> '@web/transcoder/video/',
-		'audio' 	=> '@web/transcoder/audio/',
-		'thumbnail' => '@web/transcoder/thumbnail/',
-		'gif'		=> '@web/transcoder/gif/'
-	],
+    'transcoderUrls' => [
+        'default' 	=> '@web/transcoder/',
+        'video' 	=> '@web/transcoder/video/',
+        'audio' 	=> '@web/transcoder/audio/',
+        'thumbnail' => '@web/transcoder/thumbnail/',
+        'gif'		=> '@web/transcoder/gif/'
+    ],
 	
     // Use a md5 hash for the filenames instead of parameterized naming
     'useHashedNames' => false,
@@ -76,10 +76,10 @@ 
             'audioCodecOptions' => '-async 1000',
         ],
         'gif' => [
-	        'fileSuffix' => '.mp4',
-	        'fileFormat' => 'mp4',
-	        'videoCodec' => 'libx264',
-	        'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
+            'fileSuffix' => '.mp4',
+            'fileFormat' => 'mp4',
+            'videoCodec' => 'libx264',
+            'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
         ]        
     ],
 
@@ -145,12 +145,12 @@ 
         'audioChannels' => '2',
     ],
 
-	// Default options for Gif encoding
-	'defaultGifOptions' => [
-		'videoEncoder'    	=> 'gif',
-		'fileSuffix'        => '.mp4',
-		'fileFormat'        => 'gif',
-		'videoCodec'        => 'libx264',
-		'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
-	],
+    // Default options for Gif encoding
+    'defaultGifOptions' => [
+        'videoEncoder'    	=> 'gif',
+        'fileSuffix'        => '.mp4',
+        'fileFormat'        => 'gif',
+        'videoCodec'        => 'libx264',
+        'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
+    ],
 ];

src/services/Transcode.php

Indentation +5 added lines, -5 removed lines

@@ -186,7 +186,7 @@ 
             } else {
 
                 // Kick off the transcoding
-				$pid = $this->executeShellCommand($ffmpegCmd);
+                $pid = $this->executeShellCommand($ffmpegCmd);
                 Craft::info($ffmpegCmd . "\nffmpeg PID: " . $pid, __METHOD__);
 
                 // Create a lockfile in tmp
@@ -755,7 +755,7 @@ 
 
         if (!empty($filePath)) {
 
-			// Dest path
+            // Dest path
             $destVideoPath = Craft::getAlias($settings['transcoderPaths']['gif']);
                         
             // Options
@@ -768,13 +768,13 @@ 
 
             // Build the basic command for ffmpeg
             $ffmpegCmd = $settings['ffmpegPath']
-            	. ' -f gif' 
+                . ' -f gif' 
                 . ' -i ' . escapeshellarg($filePath)
                 . ' -vcodec ' . $thisEncoder['videoCodec']
                 . ' ' . $thisEncoder['videoCodecOptions'];
 
 
-             // Create the directory if it isn't there already
+                // Create the directory if it isn't there already
             if (!file_exists($destVideoPath)) {
                 mkdir($destVideoPath);
             }
@@ -809,7 +809,7 @@ 
             } else {
 
                 // Kick off the transcoding
-				$pid = $this->executeShellCommand($ffmpegCmd);
+                $pid = $this->executeShellCommand($ffmpegCmd);
                 Craft::info($ffmpegCmd . "\nffmpeg PID: " . $pid, __METHOD__);
 
                 // Create a lockfile in tmp

src/models/Settings.php

Indentation +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
      *
      * @var string
      */
-	 public $transcoderPaths = [];
+        public $transcoderPaths = [];
 	 
     /**
      * The URL where the transcoded videos are stored; must have a trailing /
@@ -91,10 +91,10 @@ 
             'audioCodecOptions' => '-async 1000',
         ],
         'gif' => [
-	        'fileSuffix' => '.mp4',
-	        'fileFormat' => 'mp4',
-	        'videoCodec' => 'libx264',
-	        'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
+            'fileSuffix' => '.mp4',
+            'fileFormat' => 'mp4',
+            'videoCodec' => 'libx264',
+            'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
         ]           
     ];
 
@@ -182,7 +182,7 @@ 
      * @var array
      */
     public $defaultGifOptions = [
-		'videoEncoder'    	=> 'gif',
+        'videoEncoder'    	=> 'gif',
         'fileSuffix'        => '',
         'fileFormat'        => '',
         'videoCodec'        => '',