OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
967777fa 1 parent b00b3356

1.继续调试ffmpeg命令

Inline Side-by-side
Showing 1 changed file with 2 additions and 3 deletions
...@@ -60,8 +60,7 @@ class MakeVideo implements ShouldQueue ...@@ -60,8 +60,7 @@ class MakeVideo implements ShouldQueue
60 $signature = "一言"; 60 $signature = "一言";
61 $signature_x = 0; 61 $signature_x = 0;
62 $signature_y = -20; 62 $signature_y = -20;
63 - $content = $adminMakeVideo->poem->title . $adminMakeVideo->poem->author . PHP_EOL . 63 + $content = $adminMakeVideo->poem->content . PHP_EOL;
64 - $adminMakeVideo->poem->content . PHP_EOL;
65 $content_position = $adminMakeVideo->getContentPosition(); 64 $content_position = $adminMakeVideo->getContentPosition();
66 // 转换logo大小 65 // 转换logo大小
67 // $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg')); 66 // $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg'));
...@@ -87,7 +86,7 @@ class MakeVideo implements ShouldQueue ...@@ -87,7 +86,7 @@ class MakeVideo implements ShouldQueue
87 ' -filter_complex "[0:0] ' . 86 ' -filter_complex "[0:0] ' .
88 'drawtext="' . 87 'drawtext="' .
89 'fontfile=' . escapeshellarg($font) . ':' . 88 'fontfile=' . escapeshellarg($font) . ':' .
90 - 'text=' . escapeshellarg($content) . ':' . 89 + 'text=' . escapeshellcmd($content) . ':' .
91 'fontsize=43:' . 90 'fontsize=43:' .
92 'fontcolor=white@1.0:' . 91 'fontcolor=white@1.0:' .
93 'x=' . $content_position[0] . ':' . 92 'x=' . $content_position[0] . ':' .
......