OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
3d3bac83 1 parent e23f22dc

1.继续调试ffmpeg命令

Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
...@@ -95,7 +95,7 @@ class AdminMakeVideoController extends AdminController ...@@ -95,7 +95,7 @@ class AdminMakeVideoController extends AdminController
95 ->when(1,function (Form $form){ 95 ->when(1,function (Form $form){
96 $form->file('video_url','上传视频') 96 $form->file('video_url','上传视频')
97 // ->accept('mp4,mov') 97 // ->accept('mp4,mov')
98 - ->chunked() 98 +// ->chunked()
99 ->autoUpload() 99 ->autoUpload()
100 ->uniqueName() 100 ->uniqueName()
101 ->maxSize('128000') 101 ->maxSize('128000')
......
...@@ -102,12 +102,12 @@ class MakeVideo implements ShouldQueue ...@@ -102,12 +102,12 @@ class MakeVideo implements ShouldQueue
102 102
103 $this->execmd($cmd); 103 $this->execmd($cmd);
104 104
105 -// $video = $this->getTempPath(); 105 + $video = $this->getTempPath();
106 -// if ( $adminMakeVideo->thumbnail == 1 && $adminMakeVideo->thumbnail_url){ 106 + if ( $adminMakeVideo->thumbnail == 1 && $adminMakeVideo->thumbnail_url){
107 -// $thumbnail = Storage::disk('public')->path($adminMakeVideo->thumbnail_url); 107 + $thumbnail = Storage::disk('public')->path($adminMakeVideo->thumbnail_url);
108 -// }else{ 108 + }else{
109 -// $thumbnail = $last_frame_video; 109 + $thumbnail = $last_frame_video;
110 -// } 110 + }
111 111
112 // $cmd = $this->ffmpeg. ' -y'. 112 // $cmd = $this->ffmpeg. ' -y'.
113 // ' -i ' . escapeshellarg($video_temp). 113 // ' -i ' . escapeshellarg($video_temp).
......