|
@@ -396,7 +396,7 @@ discard block |
|
|
block discarded – undo |
|
396
|
396
|
.' -y '.escapeshellarg($destAudioPath); |
|
397
|
397
|
|
|
398
|
398
|
if (!$audioOptions['synchronous']) { |
|
399
|
|
- $ffmpegCmd .=' 1> '.$progressFile.' 2>&1 & echo $!'; |
|
|
399
|
+ $ffmpegCmd .= ' 1> '.$progressFile.' 2>&1 & echo $!'; |
|
400
|
400
|
// Make sure there isn't a lockfile for this audio file already |
|
401
|
401
|
$lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destAudioFile.'.lock'; |
|
402
|
402
|
$oldPid = @file_get_contents($lockFile); |
|
@@ -421,7 +421,7 @@ discard block |
|
|
block discarded – undo |
|
421
|
421
|
|
|
422
|
422
|
if ($audioOptions['synchronous']) { |
|
423
|
423
|
Craft::info($ffmpegCmd, __METHOD__); |
|
424
|
|
- $url = $settings['transcoderUrls']['audio'] . $subfolder ?? $settings['transcoderUrls']['default']; |
|
|
424
|
+ $url = $settings['transcoderUrls']['audio'].$subfolder ?? $settings['transcoderUrls']['default']; |
|
425
|
425
|
$result = Craft::getAlias($url).$destAudioFile; |
|
426
|
426
|
} else { |
|
427
|
427
|
Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__); |
|
@@ -496,7 +496,7 @@ discard block |
|
|
block discarded – undo |
|
496
|
496
|
&& (strpos($summaryResult['videoFrameRate'], '/') !== false) |
|
497
|
497
|
) { |
|
498
|
498
|
$parts = explode('/', $summaryResult['videoFrameRate']); |
|
499
|
|
- $summaryResult['videoFrameRate'] = (float)$parts[0] / (float)$parts[1]; |
|
|
499
|
+ $summaryResult['videoFrameRate'] = (float) $parts[0] / (float) $parts[1]; |
|
500
|
500
|
} |
|
501
|
501
|
$result = $summaryResult; |
|
502
|
502
|
} |
Please login to merge, or discard this patch.