A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: hardware detection only checks compiled support
aminnausinbd889e19c8fb
diff --git a/app/Jobs/Metadata/GenerateStoryboard.php b/app/Jobs/Metadata/GenerateStoryboard.phpindex a6ff1a41..fbdcb1f2 100644--- a/app/Jobs/Metadata/GenerateStoryboard.php+++ b/app/Jobs/Metadata/GenerateStoryboard.php@@ -16,6 +16,7 @@ use Illuminate\Support\Carbon;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;+use Symfony\Component\Process\Exception\ProcessFailedException;use Symfony\Component\Process\Process;class GenerateStoryboard extends ManagedSubTask {@@ -110,10 +111,10 @@ class GenerateStoryboard extends ManagedSubTask {$process = new Process($command);$process->setTimeout(600);$command = str_replace('"^%"', '%', str_replace('\\', '/', $process->getCommandLine()));- Log::info($command);+try {$process->mustRun();- } catch (\Throwable $th) {+ } catch (ProcessFailedException $th) {Log::error('Storyboard command failed', ['uuid' => $this->uuid,'file' => basename($this->filePath),diff --git a/app/Services/Hardware/HardwareDetectionService.php b/app/Services/Hardware/HardwareDetectionService.phpindex f40d4df9..3c51c219 100644--- a/app/Services/Hardware/HardwareDetectionService.php+++ b/app/Services/Hardware/HardwareDetectionService.php@@ -16,13 +16,13 @@ class HardwareDetectionService {$encoders = $this->getEncoders();return $this->cached = new HardwareProfile(- qsv: in_array('qsv', $hwaccels) && in_array('mjpeg_qsv', $encoders),- cuda: in_array('cuda', $hwaccels),- vaapi: in_array('vaapi', $hwaccels),+ cuda: in_array('cuda', $hwaccels) && $this->validateCuda(),+ qsv: in_array('qsv', $hwaccels) && in_array('mjpeg_qsv', $encoders) && $this->validateQsv(),+ vaapi: in_array('vaapi', $hwaccels) && $this->validateVaapi(),);}- private function getHwaccels(): array {+ public function getHwaccels(): array {$process = new Process(['ffmpeg', '-hwaccels', '-hide_banner']);$process->run();$output = $process->getOutput();@@ -32,11 +32,85 @@ class HardwareDetectionService {return array_values(array_filter(array_map('trim', $lines)));}- private function getEncoders(): array {+ public function getEncoders(): array {$process = new Process(['ffmpeg', '-encoders', '-hide_banner']);$process->run();preg_match_all('/\s(\w+)\s/', $process->getOutput(), $matches);return $matches[1] ?? [];}++ public function validateCuda(): bool {+ $process = new Process([+ 'ffmpeg',+ '-hide_banner',+ '-loglevel',+ 'error',+ '-hwaccel',+ 'cuda',+ '-hwaccel_output_format',+ 'cuda',+ '-f',+ 'lavfi',+ '-i',+ 'nullsrc=s=16x16',+ '-frames:v',+ '1',+ '-f',+ 'null',+ '-',+ ]);+ $process->run();++ return $process->isSuccessful();+ }++ public function validateVaapi(): bool {+ $process = new Process([+ 'ffmpeg',+ '-hide_banner',+ '-loglevel',+ 'error',+ '-hwaccel',+ 'vaapi',+ '-hwaccel_device',+ '/dev/dri/renderD128',+ '-f',+ 'lavfi',+ '-i',+ 'nullsrc=s=16x16',+ '-frames:v',+ '1',+ '-f',+ 'null',+ '-',+ ]);+ $process->run();++ return $process->isSuccessful();+ }++ private function validateQsv(): bool {+ $process = new Process([+ 'ffmpeg',+ '-hide_banner',+ '-loglevel',+ 'error',+ '-hwaccel',+ 'qsv',+ '-f',+ 'lavfi',+ '-i',+ 'color=c=black:s=16x16:r=1',+ '-frames:v',+ '1',+ '-f',+ 'null',+ '-',+ ]);+ $process->setTimeout(10);+ $process->run();++ return $process->isSuccessful();+ }}