OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
253d8c80 1 parent 4b37ebf5

1.修复一些bug

Expand all
Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
This diff is collapsed. Click to expand it.
...@@ -591,7 +591,8 @@ class UserMakeImmerse implements ShouldQueue ...@@ -591,7 +591,8 @@ class UserMakeImmerse implements ShouldQueue
591 'textfile=' . escapeshellarg($text_file) . ':' . 591 'textfile=' . escapeshellarg($text_file) . ':' .
592 'fontsize=' . $font_size . ':' . 592 'fontsize=' . $font_size . ':' .
593 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 593 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
594 - 'x=(w-text_w)/2:y=(h-text_h)/2' . ':' . 594 + 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' .
595 + 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1]) . ':' .
595 '", '; 596 '", ';
596 // 作者 597 // 作者
597 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text')); 598 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text'));
...@@ -601,7 +602,8 @@ class UserMakeImmerse implements ShouldQueue ...@@ -601,7 +602,8 @@ class UserMakeImmerse implements ShouldQueue
601 'textfile=' . escapeshellarg($text_file) . ':' . 602 'textfile=' . escapeshellarg($text_file) . ':' .
602 'fontsize=' . $font_size / 2 . ':' . 603 'fontsize=' . $font_size / 2 . ':' .
603 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 604 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
604 - 'x=(w-text_w)/2:y=(h-text_h)/2+' . $font_size . ':' . 605 + 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' .
606 + 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size) . ':' .
605 '", '; 607 '", ';
606 }elseif($content['tag'] == 'source'){ 608 }elseif($content['tag'] == 'source'){
607 $arr = explode("\n", $content['text']); 609 $arr = explode("\n", $content['text']);
...@@ -627,7 +629,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -627,7 +629,7 @@ class UserMakeImmerse implements ShouldQueue
627 'fontsize=' . $font_size / 2 . ':' . 629 'fontsize=' . $font_size / 2 . ':' .
628 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 630 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
629 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 631 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
630 - 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1] + $font_size) . ':' . 632 + 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1] . '+' . $font_size) . ':' .
631 '", '; 633 '", ';
632 }else{ 634 }else{
633 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text')); 635 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text'));
......