李帅

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

...@@ -403,13 +403,14 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -403,13 +403,14 @@ class AdminMakeImmerse implements ShouldQueue
403 if ($this->media_info['format']['duration'] > 3 * count($contents)) $FID = $FOD = 1.5; 403 if ($this->media_info['format']['duration'] > 3 * count($contents)) $FID = $FOD = 1.5;
404 404
405 $round = round($this->media_info['format']['duration'] / count($contents),1); 405 $round = round($this->media_info['format']['duration'] / count($contents),1);
406 + $sub_text = '';
406 foreach ($contents as $key => $content){ 407 foreach ($contents as $key => $content){
407 $text_color = substr($text_color,1,strlen($text_color)); 408 $text_color = substr($text_color,1,strlen($text_color));
408 $DS = $key * $round; 409 $DS = $key * $round;
409 $DE = $DS + $round; 410 $DE = $DS + $round;
410 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text')); 411 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
411 file_put_contents($text_file, $content); 412 file_put_contents($text_file, $content);
412 - $drawtext .= 'drawtext="'. 413 + $sub_text .= 'drawtext="'.
413 'fontfile=' . escapeshellarg($font_file) . ':' . 414 'fontfile=' . escapeshellarg($font_file) . ':' .
414 'textfile=' . escapeshellarg($text_file) . ':' . 415 'textfile=' . escapeshellarg($text_file) . ':' .
415 'fontsize=' . $this->calcFontSize($component->font_size) . ':' . 416 'fontsize=' . $this->calcFontSize($component->font_size) . ':' .
...@@ -421,6 +422,8 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -421,6 +422,8 @@ class AdminMakeImmerse implements ShouldQueue
421 'box=1:boxborderw='. $text_bg_box . ':' . 422 'box=1:boxborderw='. $text_bg_box . ':' .
422 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 423 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
423 } 424 }
425 +
426 + $drawtext .= $sub_text;
424 } 427 }
425 break; 428 break;
426 case 'weather': 429 case 'weather':
......