Merge pull request #16 from Rias500/v1

Allow setting threads in config

Author: khalwat

src/config.php

@@ -66,6 +66,7 @@
             'videoCodecOptions' => '-vprofile high -preset slow -crf 22',
             'audioCodec' => 'libfdk_aac',
             'audioCodecOptions' => '-async 1000',
+            'threads' => '0',
         ],
         'webm' => [
             'fileSuffix' => '.webm',
@@ -74,12 +75,14 @@
             'videoCodecOptions' => '-quality good -cpu-used 0',
             'audioCodec' => 'libvorbis',
             'audioCodecOptions' => '-async 1000',
+            'threads' => '0',
         ],
         '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\' ',
+            'threads' => '0',
         ],
     ],
 
@@ -90,19 +93,22 @@
             'fileFormat' => 'mp3',
             'audioCodec' => 'libmp3lame',
             'audioCodecOptions' => '',
+            'threads' => '0',
         ],
         'aac' => [
             'fileSuffix' => '.m4a',
             'fileFormat' => 'aac',
             'audioCodec' => 'libfdk_aac',
             'audioCodecOptions' => '',
+            'threads' => '0',
 
         ],
         'ogg' => [
             'fileSuffix' => '.ogg',
             'fileFormat' => 'ogg',
             'audioCodec' => 'libvorbis',
             'audioCodecOptions' => '',
+            'threads' => '0',
         ],
     ],
 

src/models/Settings.php

@@ -118,6 +118,7 @@ public function __construct(array $config = [])
             'videoCodecOptions' => '-vprofile high -preset slow -crf 22',
             'audioCodec' => 'libfdk_aac',
             'audioCodecOptions' => '-async 1000',
+            'threads' => '0',
         ],
         'webm' => [
             'fileSuffix' => '.webm',
@@ -126,12 +127,14 @@ public function __construct(array $config = [])
             'videoCodecOptions' => '-quality good -cpu-used 0',
             'audioCodec' => 'libvorbis',
             'audioCodecOptions' => '-async 1000',
+            'threads' => '0',
         ],
         '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\' ',
+            'threads' => '0',
         ],
     ];
 
@@ -146,19 +149,22 @@ public function __construct(array $config = [])
             'fileFormat' => 'mp3',
             'audioCodec' => 'libmp3lame',
             'audioCodecOptions' => '',
+            'threads' => '0',
         ],
         'aac' => [
             'fileSuffix' => '.m4a',
             'fileFormat' => 'aac',
             'audioCodec' => 'libfdk_aac',
             'audioCodecOptions' => '',
+            'threads' => '0',
 
         ],
         'ogg' => [
             'fileSuffix' => '.ogg',
             'fileFormat' => 'ogg',
             'audioCodec' => 'libvorbis',
             'audioCodecOptions' => '',
+            'threads' => '0',
         ],
     ];
 

src/services/Transcode.php

@@ -112,7 +112,7 @@ public function getVideoUrl($filePath, $videoOptions): string
                 .' -vcodec '.$thisEncoder['videoCodec']
                 .' '.$thisEncoder['videoCodecOptions']
                 .' -bufsize 1000k'
-                .' -threads 0';
+                .' -threads '.$thisEncoder['threads'];
 
             // Set the framerate if desired
             if (!empty($videoOptions['videoFrameRate'])) {
@@ -319,7 +319,7 @@ public function getAudioUrl($filePath, $audioOptions): string
                 .' -acodec '.$thisEncoder['audioCodec']
                 .' '.$thisEncoder['audioCodecOptions']
                 .' -bufsize 1000k'
-                .' -threads 0';
+                .' -threads '.$thisEncoder['threads'];
 
             // Set the bitrate if desired
             if (!empty($audioOptions['audioBitRate'])) {