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
$video_info = $this->mediainfo($video);
$this->immerse->url = Str::of($video)->replace(Storage::disk('public')->path(''), '');
$this->immerse->thumbnail = $thumbnail;
$this->immerse->thumbnail = Str::of($thumbnail)->replace(Storage::disk('public')->path(''), '');
$this->immerse->state = 1;
$this->immerse->duration = $video_info['format']['duration'] ?? 0;
$this->immerse->size = $video_info['format']['size'];
......@@ -510,8 +510,7 @@ class UserMakeImmerse implements ShouldQueue
'fontcolor=' . $text_color . '@1.0:' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
......@@ -530,8 +529,7 @@ class UserMakeImmerse implements ShouldQueue
'fontcolor=' . $text_color . '@1.0:' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
......@@ -548,8 +546,7 @@ class UserMakeImmerse implements ShouldQueue
'fontcolor=' . $text_color . '@1.0:' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
case 'feel':
......@@ -565,8 +562,7 @@ class UserMakeImmerse implements ShouldQueue
'fontcolor=' . $text_color . '@1.0:' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
}
......
This diff is collapsed. Click to expand it.