OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
ee80e609 1 parent fc2dd3d6

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

Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
...@@ -323,9 +323,13 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -323,9 +323,13 @@ class AdminMakeImmerse implements ShouldQueue
323 $error = trim($error0,"\n") . ' '. trim($error1,"\n"); 323 $error = trim($error0,"\n") . ' '. trim($error1,"\n");
324 // LogUtil::write(array("cmd:{$cmd}", "errno:{$exitedcode}", "stdout:{$stdout}"), __CLASS__); 324 // LogUtil::write(array("cmd:{$cmd}", "errno:{$exitedcode}", "stdout:{$stdout}"), __CLASS__);
325 // ErrorUtil::triggerErrorMsg($error, $exitedcode); 325 // ErrorUtil::triggerErrorMsg($error, $exitedcode);
326 + Log::error("cmd:{$cmd}");
327 + Log::error($error);
328 + Log::error("stdout:{$stdout}");
326 } 329 }
327 } else { 330 } else {
328 // return ErrorUtil::triggerErrorMsg('proc_open error'); 331 // return ErrorUtil::triggerErrorMsg('proc_open error');
332 + Log::error('proc_open error');
329 } 333 }
330 } 334 }
331 335
...@@ -409,7 +413,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -409,7 +413,7 @@ class AdminMakeImmerse implements ShouldQueue
409 'textfile=' . escapeshellarg($text_file) . ':' . 413 'textfile=' . escapeshellarg($text_file) . ':' .
410 'fontsize=' . $this->calcFontSize($component->font_size) . ':' . 414 'fontsize=' . $this->calcFontSize($component->font_size) . ':' .
411 // 'fontcolor=' . $text_color . '@' . $opacity . ':' . 415 // 'fontcolor=' . $text_color . '@' . $opacity . ':' .
412 - 'fontcolor_expr=' . $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 }:' . 416 + '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 }') . ':' .
413 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 417 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
414 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 418 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
415 'fix_bounds='. $fix_bounds . ':' . 419 'fix_bounds='. $fix_bounds . ':' .
......