Skip to content

Commit d49497c

Browse files
committed
Clean up browser examples
1 parent 8abb07e commit d49497c

File tree

4 files changed

+36
-154
lines changed

4 files changed

+36
-154
lines changed

apps/browser/concatDemuxer.html

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
<html>
22
<head>
3-
<script src="/dist/ffmpeg.dev.js"></script>
4-
<style>
5-
html,
6-
body {
7-
margin: 0;
8-
width: 100%;
9-
height: 100%;
10-
}
11-
12-
body {
13-
display: flex;
14-
flex-direction: column;
15-
align-items: center;
16-
}
17-
</style>
3+
<link rel="stylesheet" href="style.css">
4+
<script src="../../packages/ffmpeg/dist/umd/ffmpeg.js"></script>
5+
<script src="../../packages/util/dist/umd/index.js"></script>
186
</head>
197

208
<body>
@@ -23,24 +11,35 @@ <h3>Select multiple video files to Concatenate</h3>
2311
<input type="file" id="uploader" multiple />
2412
<p id="message"></p>
2513
<script>
26-
const { createFFmpeg, fetchFile } = FFmpeg;
27-
const ffmpeg = createFFmpeg({ log: true });
14+
const { fetchFile } = FFmpegUtil;
15+
const { FFmpeg } = FFmpegWASM;
16+
let ffmpeg = null;
2817

2918
const transcode = async ({ target: { files } }) => {
3019
const message = document.getElementById("message");
31-
message.innerHTML = "Loading ffmpeg-core.js";
32-
await ffmpeg.load();
20+
if (ffmpeg === null) {
21+
ffmpeg = new FFmpeg();
22+
ffmpeg.on("log", ({ message }) => {
23+
console.log(message);
24+
})
25+
ffmpeg.on("progress", ({ progress }) => {
26+
message.innerHTML = `${progress * 100} %`;
27+
});
28+
await ffmpeg.load({
29+
coreURL: "/packages/core/dist/umd/ffmpeg-core.js",
30+
});
31+
}
3332
message.innerHTML = "Start Concating";
3433
const inputPaths = [];
3534
for (const file of files) {
3635
const { name } = file;
37-
ffmpeg.FS('writeFile', name, await fetchFile(file));
36+
ffmpeg.writeFile(name, await fetchFile(file));
3837
inputPaths.push(`file ${name}`);
3938
}
40-
ffmpeg.FS('writeFile', 'concat_list.txt', inputPaths.join('\n'));
41-
await ffmpeg.run('-f', 'concat', '-safe', '0', '-i', 'concat_list.txt', 'output.mp4');
39+
await ffmpeg.writeFile('concat_list.txt', inputPaths.join('\n'));
40+
await ffmpeg.exec(['-f', 'concat', '-safe', '0', '-i', 'concat_list.txt', 'output.mp4']);
4241
message.innerHTML = "Complete Concating";
43-
const data = ffmpeg.FS('readFile', 'output.mp4');
42+
const data = await ffmpeg.readFile('output.mp4');
4443
const video = document.getElementById("output-video");
4544
video.src = URL.createObjectURL(
4645
new Blob([data.buffer], {

apps/browser/image2video.html

Lines changed: 0 additions & 53 deletions
This file was deleted.

apps/browser/trim.html

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,29 @@ <h3>Upload a mp4 (x264) video and trim its first 1 seconds and play!</h3>
1111
<p id="message"></p>
1212
<script>
1313
const { fetchFile } = FFmpegUtil;
14+
const { FFmpeg } = FFmpegWASM;
1415
let ffmpeg = null;
1516

1617
const trim = async ({ target: { files } }) => {
1718
const message = document.getElementById('message');
1819
if (ffmpeg === null) {
19-
ffmpeg = await createFFmpeg();
20-
ffmpeg.setProgress((progress) => { console.log(progress * 100) });
20+
ffmpeg = new FFmpeg();
21+
ffmpeg.on("log", ({ message }) => {
22+
console.log(message);
23+
})
24+
ffmpeg.on("progress", ({ progress }) => {
25+
message.innerHTML = `${progress * 100} %`;
26+
});
27+
await ffmpeg.load({
28+
coreURL: "/packages/core/dist/umd/ffmpeg-core.js",
29+
});
2130
}
2231
const { name } = files[0];
23-
message.innerHTML = 'Loading ffmpeg-core.js';
32+
await ffmpeg.writeFile(name, await fetchFile(files[0]));
2433
message.innerHTML = 'Start trimming';
25-
ffmpeg.FS.writeFile(name, await fetchFile(files[0]));
26-
await ffmpeg.exec('-i', name, '-ss', '0', '-to', '1', 'output.mp4');
34+
await ffmpeg.exec(['-i', name, '-ss', '0', '-to', '1', 'output.mp4']);
2735
message.innerHTML = 'Complete trimming';
28-
const data = ffmpeg.FS.readFile('output.mp4');
36+
const data = await ffmpeg.readFile('output.mp4');
2937

3038
const video = document.getElementById('output-video');
3139
video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));

apps/browser/webcam.html

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)