OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
a8ce10c8 1 parent a7a1634f

1.优化ffmpeg命令，适配各种类型视频

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
...@@ -139,7 +139,7 @@ class AdminMakeVideoController extends AdminController ...@@ -139,7 +139,7 @@ class AdminMakeVideoController extends AdminController
139 }) 139 })
140 ->default(2); 140 ->default(2);
141 141
142 - $form->text('location','此地')->placeholder('暂时先手动输入此地'); 142 + $form->text('location','此地')->default("/")->placeholder('暂时先手动输入此地');
143 143
144 $form->display('created_at'); 144 $form->display('created_at');
145 $form->display('updated_at'); 145 $form->display('updated_at');
......
...@@ -141,7 +141,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -141,7 +141,7 @@ class AdminMakeImmerse implements ShouldQueue
141 ' -i ' . escapeshellarg($file). 141 ' -i ' . escapeshellarg($file).
142 ' -i ' . escapeshellarg($watermark). 142 ' -i ' . escapeshellarg($watermark).
143 $audio_input . 143 $audio_input .
144 - ' -filter_complex "[0:0]scale=' . $this->output_width . ':' . $this->output_height . ',' . $drawtext . 144 + ' -filter_complex "[0:v]scale=' . $this->output_width . ':' . $this->output_height . ',' . $drawtext .
145 ' [text];[text]'. 145 ' [text];[text]'.
146 ' [1:v]overlay=20:20[v]" ' . 146 ' [1:v]overlay=20:20[v]" ' .
147 ' -map [v] -map '. $audio_filter . 147 ' -map [v] -map '. $audio_filter .
......