okooooooo/grok2api
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(video): 降低浏览器拼接FS错误概率

Browse Source
This commit is contained in:
root committed 2026-02-17 19:20:07 +08:00
1 parent a3987d07d9
commit a9b95f4b39
2 files changed
+24 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/static/public/js/video.js
+23 -30
View File
@@ -1490,43 +1490,36 @@
const segASource = `${prefix}_a_source.mp4`;
const segBSource = `${prefix}_b_source.mp4`;
const segA = `${prefix}_a.mp4`;
const segB = `${prefix}_b.mp4`;
const listFile = `${prefix}_list.txt`;
const mergedFile = `${prefix}_merged.mp4`;
await ffmpegWriteFile(ff, segASource, sourceStable);
await ffmpegWriteFile(ff, segBSource, generatedBuffer);
if (Number(trimSeconds) > 0) {
await ffmpegExec(
ff,
['-y', '-i', segASource, '-t', trimSeconds, '-c:v', 'libx264', '-preset', 'ultrafast', '-pix_fmt', 'yuv420p', '-c:a', 'aac', '-ar', '48000', '-ac', '2', segA]
);
await ffmpegExec(
ff,
['-y', '-i', segBSource, '-c:v', 'libx264', '-preset', 'ultrafast', '-pix_fmt', 'yuv420p', '-c:a', 'aac', '-ar', '48000', '-ac', '2', segB]
);
const filesToClean = [segASource, segBSource, segA, listFile, mergedFile];
try {
if (Number(trimSeconds) <= 0) {
return new Blob([toStableUint8(generatedBuffer)], { type: 'video/mp4' });
}
await ffmpegWriteFile(ff, segASource, sourceStable);
await ffmpegWriteFile(ff, segBSource, generatedBuffer);
await ffmpegExec(ff, ['-y', '-i', segASource, '-t', trimSeconds, '-c', 'copy', segA]);
await ffmpegWriteFile(
ff,
listFile,
new TextEncoder().encode(`file '${segA}'\nfile '${segB}'\n`)
);
await ffmpegExec(
ff,
['-y', '-f', 'concat', '-safe', '0', '-i', listFile, '-c:v', 'libx264', '-preset', 'ultrafast', '-pix_fmt', 'yuv420p', '-c:a', 'aac', '-ar', '48000', '-ac', '2', mergedFile]
);
} else {
await ffmpegExec(
ff,
['-y', '-i', segBSource, '-c:v', 'libx264', '-preset', 'ultrafast', '-pix_fmt', 'yuv420p', '-c:a', 'aac', '-ar', '48000', '-ac', '2', mergedFile]
new TextEncoder().encode(`file '${segA}'\nfile '${segBSource}'\n`)
);
try {
await ffmpegExec(ff, ['-y', '-f', 'concat', '-safe', '0', '-i', listFile, '-c', 'copy', mergedFile]);
} catch (copyErr) {
await ffmpegExec(
ff,
['-y', '-f', 'concat', '-safe', '0', '-i', listFile, '-c:v', 'libx264', '-preset', 'ultrafast', '-pix_fmt', 'yuv420p', '-c:a', 'aac', '-ar', '48000', '-ac', '2', mergedFile]
);
}
const merged = await ffmpegReadFile(ff, mergedFile);
return new Blob([toStableUint8(merged)], { type: 'video/mp4' });
} finally {
for (const file of filesToClean) {
await ffmpegDeleteFileSafe(ff, file);
}
}
const merged = await ffmpegReadFile(ff, mergedFile);
await ffmpegDeleteFileSafe(ff, segASource);
await ffmpegDeleteFileSafe(ff, segBSource);
await ffmpegDeleteFileSafe(ff, segA);
await ffmpegDeleteFileSafe(ff, segB);
await ffmpegDeleteFileSafe(ff, listFile);
await ffmpegDeleteFileSafe(ff, mergedFile);
return new Blob([toStableUint8(merged)], { type: 'video/mp4' });
};
try {
app/static/public/pages/video.html
+1 -1
View File
@@ -274,7 +274,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.4.1"></script>
<script src="/static/public/js/video.js?v=0.4.2"></script>
</body>
</html>