OnePoem / OnePoem-Server

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

1.重构合成脚本。

Inline Side-by-side
Showing 1 changed file with 8 additions and 4 deletions
......@@ -510,7 +510,8 @@ 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) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
......@@ -529,7 +530,8 @@ 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) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
......@@ -546,7 +548,8 @@ 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) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
case 'feel':
......@@ -562,7 +565,8 @@ 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) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
}
......