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
' -filter_complex "amix=inputs=2:duration=first[a]" -map [a]' .
' -ar 48000 -ab 64k' . escapeshellarg($audio);
if (!$this->execmd($cmd)) return 0;
if (!$this->execmd($cmd)) return ;
}
}
......@@ -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;
}
......