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-24 17:21:20 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ee80e609d28dfe130ff67b92cf17bddf855044b4
ee80e609
1 parent
fc2dd3d6
1.优化ffmpeg命令,适配各种类型视频
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
app/Jobs/AdminMakeImmerse.php
app/Jobs/AdminMakeImmerse.php
View file @
ee80e60
...
...
@@ -323,9 +323,13 @@ class AdminMakeImmerse implements ShouldQueue
$error
=
trim
(
$error0
,
"
\n
"
)
.
' '
.
trim
(
$error1
,
"
\n
"
);
// LogUtil::write(array("cmd:{$cmd}", "errno:{$exitedcode}", "stdout:{$stdout}"), __CLASS__);
// ErrorUtil::triggerErrorMsg($error, $exitedcode);
Log
::
error
(
"cmd:
{
$cmd
}
"
);
Log
::
error
(
$error
);
Log
::
error
(
"stdout:
{
$stdout
}
"
);
}
}
else
{
// return ErrorUtil::triggerErrorMsg('proc_open error');
Log
::
error
(
'proc_open error'
);
}
}
...
...
@@ -409,7 +413,7 @@ class AdminMakeImmerse implements ShouldQueue
'textfile='
.
escapeshellarg
(
$text_file
)
.
':'
.
'fontsize='
.
$this
->
calcFontSize
(
$component
->
font_size
)
.
':'
.
// 'fontcolor=' . $text_color . '@' . $opacity . ':' .
'fontcolor_expr='
.
$text_color
.
'%{eif\\: clip\\(255*\\(1*between\\(t\\, '
.
$DE
.
' + '
.
$FID
.
'\\, '
.
$DE
.
' - '
.
$FOD
.
'\\) + \\(\\(t - '
.
$DS
.
'\\)/'
.
$FID
.
'\\)*between\\(t\\, '
.
$DS
.
'\\, '
.
$DS
.
' + '
.
$FID
.
'\\) + \\(-\\(t - '
.
$DE
.
'\\)/'
.
$FOD
.
'\\)*between\\(t\\, '
.
$DE
.
' - '
.
$FOD
.
'\\, '
.
$DE
.
'\\)\\)\\, 0\\, 255\\) \\: x\\: 2 }
:'
.
'fontcolor_expr='
.
escapeshellarg
(
$text_color
.
'%{eif: clip(255*(1*between(t, '
.
$DE
.
' + '
.
$FID
.
', '
.
$DE
.
' - '
.
$FOD
.
') + ((t - '
.
$DS
.
')/'
.
$FID
.
')*between(t, '
.
$DS
.
', '
.
$DS
.
' + '
.
$FID
.
') + (-(t - '
.
$DE
.
')/'
.
$FOD
.
')*between(t, '
.
$DE
.
' - '
.
$FOD
.
', '
.
$DE
.
')), 0, 255) : x: 2 }'
)
.
'
:'
.
'x='
.
escapeshellarg
(
VideoTemp
::
POSITION_FFMPEG
[
$component
->
position
][
0
])
.
':'
.
'y='
.
escapeshellarg
(
VideoTemp
::
POSITION_FFMPEG
[
$component
->
position
][
1
])
.
':'
.
'fix_bounds='
.
$fix_bounds
.
':'
.
...
...
Please
register
or
login
to post a comment