fix(video-splice): 修复末帧抽帧稳定性并强制刷新前端脚本
This commit is contained in:
1 parent
0808a94f1d
commit
f6683581e7
2 files changed
+4
-3
No files matched your search
@@ -1899,7 +1899,7 @@
|
||||
for (const ms of candidates) {
|
||||
const seconds = (ms / 1000).toFixed(3);
|
||||
try {
|
||||
await ffmpegExec(ff, ['-y', '-ss', seconds, '-i', inputName, '-frames:v', '1', frameName]);
|
||||
await ffmpegExec(ff, ['-y', '-ss', seconds, '-i', inputName, '-frames:v', '1', '-update', '1', frameName]);
|
||||
frameBytes = await ffmpegReadFile(ff, frameName);
|
||||
lockedTimestampMs = ms;
|
||||
break;
|
||||
@@ -1971,12 +1971,13 @@
|
||||
'-i', segASource,
|
||||
'-i', segBSource,
|
||||
'-filter_complex',
|
||||
`[0:v]trim=end=${trimSeconds},setpts=PTS-STARTPTS[v0];[1:v]setpts=PTS-STARTPTS[v1];[v0][v1]concat=n=2:v=1:a=0[v];[0:a]atrim=end=${trimSeconds},asetpts=PTS-STARTPTS[a0]`,
|
||||
`[0:v]trim=end=${trimSeconds},setpts=PTS-STARTPTS[v0];[1:v]setpts=PTS-STARTPTS[v1];[v0][v1]concat=n=2:v=1:a=0[v]`,
|
||||
'-map', '[v]',
|
||||
'-c:v', 'libx264',
|
||||
'-preset', 'ultrafast',
|
||||
'-pix_fmt', 'yuv420p',
|
||||
'-r', '30',
|
||||
'-an',
|
||||
mergedVideoFile
|
||||
]
|
||||
);
|
||||
|
||||
@@ -318,7 +318,7 @@
|
||||
<script src="/static/common/js/pwa.js?v=0.1.1"></script>
|
||||
<script src="/static/vendor/ffmpeg/ffmpeg.js?v=0.1.0"></script>
|
||||
<script src="/static/vendor/ffmpeg/ffmpeg-util.js?v=0.1.0"></script>
|
||||
<script src="/static/public/js/video.js?v=0.5.35"></script>
|
||||
<script src="/static/public/js/video.js?v=0.5.36"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
Reference in new issue
Block a user