OnePoem / OnePoem-Server

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

1.继续调试ffmpeg命令

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
...@@ -60,8 +60,10 @@ class MakeVideo implements ShouldQueue ...@@ -60,8 +60,10 @@ 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->content . PHP_EOL; 63 + $content = '`'.$adminMakeVideo->poem->title . "\t" . ' -- ' . $adminMakeVideo->poem->author . PHP_EOL .
64 + $adminMakeVideo->poem->content . PHP_EOL .'`';
64 $content_position = $adminMakeVideo->getContentPosition(); 65 $content_position = $adminMakeVideo->getContentPosition();
66 +
65 // 转换logo大小 67 // 转换logo大小
66 // $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg')); 68 // $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg'));
67 $watermark = Storage::disk('public')->path('ffmpeg') . "/LOGO_eng.png"; 69 $watermark = Storage::disk('public')->path('ffmpeg') . "/LOGO_eng.png";
......