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
李帅
2023-02-06 14:54:01 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
a8ce10c8ba307ab07af14f1fa2bcb8298620e6dd
a8ce10c8
1 parent
a7a1634f
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/AdminMakeImmerse.php
app/Admin/Controllers/AdminMakeVideoController.php
View file @
a8ce10c
...
...
@@ -139,7 +139,7 @@ class AdminMakeVideoController extends AdminController
})
->
default
(
2
);
$form
->
text
(
'location'
,
'此地'
)
->
placeholder
(
'暂时先手动输入此地'
);
$form
->
text
(
'location'
,
'此地'
)
->
default
(
"/"
)
->
placeholder
(
'暂时先手动输入此地'
);
$form
->
display
(
'created_at'
);
$form
->
display
(
'updated_at'
);
...
...
app/Jobs/AdminMakeImmerse.php
View file @
a8ce10c
...
...
@@ -141,7 +141,7 @@ class AdminMakeImmerse implements ShouldQueue
' -i '
.
escapeshellarg
(
$file
)
.
' -i '
.
escapeshellarg
(
$watermark
)
.
$audio_input
.
' -filter_complex "[0:
0
]scale='
.
$this
->
output_width
.
':'
.
$this
->
output_height
.
','
.
$drawtext
.
' -filter_complex "[0:
v
]scale='
.
$this
->
output_width
.
':'
.
$this
->
output_height
.
','
.
$drawtext
.
' [text];[text]'
.
' [1:v]overlay=20:20[v]" '
.
' -map [v] -map '
.
$audio_filter
.
...
...
Please
register
or
login
to post a comment