Merge pull request #22 from peirix/v1

Added trimming to audio transcoding

Author: khalwat

src/models/Settings.php

@@ -199,6 +199,8 @@ class Settings extends Model
         'audioBitRate' => '128k',
         'audioSampleRate' => '44100',
         'audioChannels' => '2',
+        'synchronous' => false,
+        'stripMetadata' => false
     ];
     /**
      * Default options for encoded GIF

src/services/Transcode.php

@@ -366,6 +366,9 @@ public function getAudioUrl($filePath, $audioOptions): string
             }
             $ffmpegCmd .= ' '.$thisEncoder['audioCodecOptions'];
 
+            if (!empty($audioOptions['timeInSecs'])) {
+                $ffmpegCmd .= ' -t '.$audioOptions['timeInSecs'];
+            }
 
             // Create the directory if it isn't there already
             if (!is_dir($destAudioPath)) {
@@ -383,22 +386,29 @@ public function getAudioUrl($filePath, $audioOptions): string
 
             // Assemble the destination path and final ffmpeg command
             $destAudioPath .= $destAudioFile;
+            
+            if ($audioOptions['stripMetadata']) {
+                $ffmpegCmd .= ' -map_metadata -1 ';
+            }
+            
             $ffmpegCmd .= ' -f '
                 .$thisEncoder['fileFormat']
-                .' -y '.escapeshellarg($destAudioPath)
-                .' 1> '.$progressFile.' 2>&1 & echo $!';
-
-            // Make sure there isn't a lockfile for this audio file already
-            $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destAudioFile.'.lock';
-            $oldPid = @file_get_contents($lockFile);
-            if ($oldPid !== false) {
-                exec("ps $oldPid", $ProcessState);
-                if (\count($ProcessState) >= 2) {
-                    return $result;
+                .' -y '.escapeshellarg($destAudioPath);
+            
+            if (!$audioOptions['synchronous']) {
+                $ffmpegCmd .=' 1> '.$progressFile.' 2>&1 & echo $!';
+                // Make sure there isn't a lockfile for this audio file already
+                $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destAudioFile.'.lock';
+                $oldPid = @file_get_contents($lockFile);
+                if ($oldPid !== false) {
+                    exec("ps $oldPid", $ProcessState);
+                    if (\count($ProcessState) >= 2) {
+                        return $result;
+                    }
+                    // It's finished transcoding, so delete the lockfile and progress file
+                    @unlink($lockFile);
+                    @unlink($progressFile);
                 }
-                // It's finished transcoding, so delete the lockfile and progress file
-                @unlink($lockFile);
-                @unlink($progressFile);
             }
 
             // If the audio file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
@@ -407,11 +417,17 @@ public function getAudioUrl($filePath, $audioOptions): string
                 $result = Craft::getAlias($url).$destAudioFile;
             } else {
                 // Kick off the transcoding
-                $pid = $this->executeShellCommand($ffmpegCmd);
-                Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__);
-
-                // Create a lockfile in tmp
-                file_put_contents($lockFile, $pid);
+                $this->executeShellCommand($ffmpegCmd);
+                
+                if ($audioOptions['synchronous']) {
+                    Craft::info($ffmpegCmd, __METHOD__);
+                    $url = $settings['transcoderUrls']['audio'] . $subfolder ?? $settings['transcoderUrls']['default'];
+                    $result = Craft::getAlias($url).$destAudioFile;
+                } else {
+                    Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__);
+                    // Create a lockfile in tmp
+                    file_put_contents($lockFile, $pid);
+                }
             }
         }