李帅

1.优化ffmpeg命令,适配各种类型视频

......@@ -404,6 +404,7 @@ class AdminMakeImmerse implements ShouldQueue
$round = round($this->media_info['format']['duration'] / count($contents),1);
foreach ($contents as $key => $content){
$text_color = substr($text_color,1,strlen($text_color));
$DS = $key * $round;
$DE = $DS + $round;
$text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
......@@ -413,7 +414,7 @@ class AdminMakeImmerse implements ShouldQueue
'textfile=' . escapeshellarg($text_file) . ':' .
'fontsize=' . $this->calcFontSize($component->font_size) . ':' .
// 'fontcolor=' . $text_color . '@' . $opacity . ':' .
'fontcolor_expr=' . escapeshellarg($text_color . '%{eif: clip(255*(1*between(t, ' . $DE . ' + ' . $FID . ', ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t, ' . $DS . ', ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t, ' . $DE . ' - ' . $FOD . ', ' . $DE . ')), 0, 255) : x: 2 }') . ':' .
'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DE . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
'fix_bounds='. $fix_bounds . ':' .
......