OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
7f25444c 1 parent 3e536152

1.重构合成脚本。

Expand all
Inline Side-by-side
Showing 3 changed files with 5 additions and 9 deletions
This diff is collapsed. Click to expand it.
...@@ -251,7 +251,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -251,7 +251,7 @@ class UserMakeImmerse implements ShouldQueue
251 $video_info = $this->mediainfo($video); 251 $video_info = $this->mediainfo($video);
252 252
253 $this->immerse->url = Str::of($video)->replace(Storage::disk('public')->path(''), ''); 253 $this->immerse->url = Str::of($video)->replace(Storage::disk('public')->path(''), '');
254 - $this->immerse->thumbnail = $thumbnail; 254 + $this->immerse->thumbnail = Str::of($thumbnail)->replace(Storage::disk('public')->path(''), '');
255 $this->immerse->state = 1; 255 $this->immerse->state = 1;
256 $this->immerse->duration = $video_info['format']['duration'] ?? 0; 256 $this->immerse->duration = $video_info['format']['duration'] ?? 0;
257 $this->immerse->size = $video_info['format']['size']; 257 $this->immerse->size = $video_info['format']['size'];
...@@ -510,8 +510,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -510,8 +510,7 @@ 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) . ':' . //todo 10号机不支持此选项 513 + 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
514 - 'box=1:' .
515 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 514 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
516 515
517 break; 516 break;
...@@ -530,8 +529,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -530,8 +529,7 @@ class UserMakeImmerse implements ShouldQueue
530 'fontcolor=' . $text_color . '@1.0:' . 529 'fontcolor=' . $text_color . '@1.0:' .
531 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 530 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
532 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 531 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
533 -// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项 532 + 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
534 - 'box=1:' .
535 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 533 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
536 534
537 break; 535 break;
...@@ -548,8 +546,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -548,8 +546,7 @@ class UserMakeImmerse implements ShouldQueue
548 'fontcolor=' . $text_color . '@1.0:' . 546 'fontcolor=' . $text_color . '@1.0:' .
549 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 547 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
550 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 548 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
551 -// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项 549 + 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
552 - 'box=1:' .
553 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 550 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
554 break; 551 break;
555 case 'feel': 552 case 'feel':
...@@ -565,8 +562,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -565,8 +562,7 @@ class UserMakeImmerse implements ShouldQueue
565 'fontcolor=' . $text_color . '@1.0:' . 562 'fontcolor=' . $text_color . '@1.0:' .
566 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 563 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
567 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 564 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
568 -// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项 565 + 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
569 - 'box=1:' .
570 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 566 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
571 break; 567 break;
572 } 568 }
......
This diff is collapsed. Click to expand it.