Toggle navigation
Toggle navigation
This project
Loading...
Sign in
OnePoem
/
OnePoem-Server
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
李帅
2022-04-06 18:12:34 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
3d3bac838af10a9ea39188e12d069b300b171221
3d3bac83
1 parent
e23f22dc
1.继续调试ffmpeg命令
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
app/Admin/Controllers/AdminMakeVideoController.php
app/Jobs/MakeVideo.php
app/Admin/Controllers/AdminMakeVideoController.php
View file @
3d3bac8
...
...
@@ -95,7 +95,7 @@ class AdminMakeVideoController extends AdminController
->
when
(
1
,
function
(
Form
$form
){
$form
->
file
(
'video_url'
,
'上传视频'
)
// ->accept('mp4,mov')
->
chunked
()
//
->chunked()
->
autoUpload
()
->
uniqueName
()
->
maxSize
(
'128000'
)
...
...
app/Jobs/MakeVideo.php
View file @
3d3bac8
...
...
@@ -102,12 +102,12 @@ class MakeVideo implements ShouldQueue
$this
->
execmd
(
$cmd
);
//
$video = $this->getTempPath();
//
if ( $adminMakeVideo->thumbnail == 1 && $adminMakeVideo->thumbnail_url){
//
$thumbnail = Storage::disk('public')->path($adminMakeVideo->thumbnail_url);
//
}else{
//
$thumbnail = $last_frame_video;
//
}
$video
=
$this
->
getTempPath
();
if
(
$adminMakeVideo
->
thumbnail
==
1
&&
$adminMakeVideo
->
thumbnail_url
){
$thumbnail
=
Storage
::
disk
(
'public'
)
->
path
(
$adminMakeVideo
->
thumbnail_url
);
}
else
{
$thumbnail
=
$last_frame_video
;
}
// $cmd = $this->ffmpeg. ' -y'.
// ' -i ' . escapeshellarg($video_temp).
...
...
Please
register
or
login
to post a comment