|
@@ -405,7 +405,7 @@ discard block |
|
|
block discarded – undo |
|
405
|
405
|
$synchronous = $audioOptions['synchronous']; |
|
406
|
406
|
} |
|
407
|
407
|
if (!$synchronous) { |
|
408
|
|
- $ffmpegCmd .=' 1> '.$progressFile.' 2>&1 & echo $!'; |
|
|
408
|
+ $ffmpegCmd .= ' 1> '.$progressFile.' 2>&1 & echo $!'; |
|
409
|
409
|
// Make sure there isn't a lockfile for this audio file already |
|
410
|
410
|
$lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destAudioFile.'.lock'; |
|
411
|
411
|
$oldPid = @file_get_contents($lockFile); |
|
@@ -430,7 +430,7 @@ discard block |
|
|
block discarded – undo |
|
430
|
430
|
|
|
431
|
431
|
if ($synchronous) { |
|
432
|
432
|
Craft::info($ffmpegCmd, __METHOD__); |
|
433
|
|
- $url = $settings['transcoderUrls']['audio'] . $subfolder ?? $settings['transcoderUrls']['default']; |
|
|
433
|
+ $url = $settings['transcoderUrls']['audio'].$subfolder ?? $settings['transcoderUrls']['default']; |
|
434
|
434
|
$result = Craft::parseEnv($url).$destAudioFile; |
|
435
|
435
|
} else { |
|
436
|
436
|
Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__); |
|
@@ -508,7 +508,7 @@ discard block |
|
|
block discarded – undo |
|
508
|
508
|
&& (strpos($summaryResult['videoFrameRate'], '/') !== false) |
|
509
|
509
|
) { |
|
510
|
510
|
$parts = explode('/', $summaryResult['videoFrameRate']); |
|
511
|
|
- $summaryResult['videoFrameRate'] = (float)$parts[0] / (float)$parts[1]; |
|
|
511
|
+ $summaryResult['videoFrameRate'] = (float) $parts[0] / (float) $parts[1]; |
|
512
|
512
|
} |
|
513
|
513
|
$result = $summaryResult; |
|
514
|
514
|
} |
Please login to merge, or discard this patch.