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-08 18:01:50 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
731b6fa9e02d8e98031ae91243764426794d5b39
731b6fa9
1 parent
1b7f8a88
1.ffmpeg命令微调
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
app/Admin/Controllers/AdminMakeVideoController.php
app/Jobs/MakeVideo.php
app/Admin/Controllers/AdminMakeVideoController.php
View file @
731b6fa
...
...
@@ -32,7 +32,7 @@ class AdminMakeVideoController extends AdminController
$grid
->
column
(
'title'
,
'标题'
);
$grid
->
column
(
'content'
,
'有感'
);
$grid
->
column
(
'url'
)
->
display
(
function
(
$url
){
return
"<a target='_blank' href='"
.
Storage
::
disk
(
'public'
)
->
url
(
Str
::
before
(
$url
,
'/public'
))
.
"'>查看</a>"
;
return
"<a target='_blank' href='"
.
Storage
::
disk
(
'public'
)
->
url
(
Str
::
after
(
$url
,
'/public'
))
.
"'>查看</a>"
;
});
$grid
->
column
(
'type'
,
'类型'
)
->
using
([
1
=>
'音频'
,
2
=>
'视频'
]);
$grid
->
column
(
'duration'
);
...
...
app/Jobs/MakeVideo.php
View file @
731b6fa
...
...
@@ -138,7 +138,7 @@ class MakeVideo implements ShouldQueue
$signature_y
=
-
20
;
$animate
=
$this
->
makeAnimate
(
$last_frame_video
,
$end_wallpaper
,
''
,
$signature_x
,
$signature_y
,
$font
);
$font_size
=
ceil
(
$width
/
1
4
);
$font_size
=
ceil
(
$width
/
1
6
);
$content
=
$adminMakeVideo
->
poem
->
content
.
PHP_EOL
;
$content_position
=
$adminMakeVideo
->
getContentPosition
();
$watermark
=
Storage
::
disk
(
'public'
)
->
path
(
'ffmpeg/LOGO_eng.png'
);
...
...
Please
register
or
login
to post a comment