OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
3e536152 1 parent 04a1d307

1.重构合成脚本。

Inline Side-by-side
Showing 1 changed file with 9 additions and 5 deletions
...@@ -149,7 +149,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -149,7 +149,7 @@ class UserMakeImmerse implements ShouldQueue
149 ' -filter_complex "amix=inputs=2:duration=first[a]" -map [a]' . 149 ' -filter_complex "amix=inputs=2:duration=first[a]" -map [a]' .
150 ' -ar 48000 -ab 64k' . escapeshellarg($audio); 150 ' -ar 48000 -ab 64k' . escapeshellarg($audio);
151 151
152 - if (!$this->execmd($cmd)) return 0; 152 + if (!$this->execmd($cmd)) return ;
153 } 153 }
154 } 154 }
155 155
...@@ -510,7 +510,8 @@ class UserMakeImmerse implements ShouldQueue ...@@ -510,7 +510,8 @@ class UserMakeImmerse implements ShouldQueue
510 'fontcolor=' . $text_color . '@1.0:' . 510 'fontcolor=' . $text_color . '@1.0:' .
511 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 511 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
512 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 512 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
513 - 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . 513 +// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
514 + 'box=1:' .
514 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 515 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
515 516
516 break; 517 break;
...@@ -529,7 +530,8 @@ class UserMakeImmerse implements ShouldQueue ...@@ -529,7 +530,8 @@ class UserMakeImmerse implements ShouldQueue
529 'fontcolor=' . $text_color . '@1.0:' . 530 'fontcolor=' . $text_color . '@1.0:' .
530 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 531 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
531 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 532 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
532 - 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . 533 +// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
534 + 'box=1:' .
533 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 535 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
534 536
535 break; 537 break;
...@@ -546,7 +548,8 @@ class UserMakeImmerse implements ShouldQueue ...@@ -546,7 +548,8 @@ class UserMakeImmerse implements ShouldQueue
546 'fontcolor=' . $text_color . '@1.0:' . 548 'fontcolor=' . $text_color . '@1.0:' .
547 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 549 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
548 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 550 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
549 - 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . 551 +// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
552 + 'box=1:' .
550 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 553 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
551 break; 554 break;
552 case 'feel': 555 case 'feel':
...@@ -562,7 +565,8 @@ class UserMakeImmerse implements ShouldQueue ...@@ -562,7 +565,8 @@ class UserMakeImmerse implements ShouldQueue
562 'fontcolor=' . $text_color . '@1.0:' . 565 'fontcolor=' . $text_color . '@1.0:' .
563 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 566 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
564 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 567 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
565 - 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . 568 +// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
569 + 'box=1:' .
566 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 570 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
567 break; 571 break;
568 } 572 }
......