Skip to content

Commit 1fabb27

Browse files
jeromewujeromewu
committed
Update examples
1 parent e76c174 commit 1fabb27

File tree

13 files changed

+57
-111
lines changed

13 files changed

+57
-111
lines changed

‎examples/browser/concatDemuxer.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h3>Select multiple video files to Concatenate</h3>
2323
<input type="file" id="uploader" multiple />
2424
<p id="message"></p>
2525
<script>
26-
const { createFFmpeg } = FFmpeg;
26+
const { createFFmpeg, fetchFile } = FFmpeg;
2727
const ffmpeg = createFFmpeg({ log: true });
2828

2929
const transcode = async ({ target: { files } }) => {
@@ -34,12 +34,13 @@ <h3>Select multiple video files to Concatenate</h3>
3434
const inputPaths = [];
3535
for (const file of files) {
3636
const { name } = file;
37-
await ffmpeg.write(name, file);
38-
inputPaths.push(name);
37+
ffmpeg.FS('writeFile', name, await fetchFile(file));
38+
inputPaths.push(`file ${name}`);
3939
}
40-
await ffmpeg.concatDemuxer(inputPaths, "output.mp4");
40+
ffmpeg.FS('writeFile', 'concat_list.txt', inputPaths.join('\n'));
41+
await ffmpeg.run('-f', 'concat', '-safe', '0', '-i', 'concat_list.txt', 'output.mp4');
4142
message.innerHTML = "Complete Concating";
42-
const data = await ffmpeg.read("output.mp4");
43+
const data = ffmpeg.FS('readFile', 'output.mp4');
4344
const video = document.getElementById("output-video");
4445
video.src = URL.createObjectURL(
4546
new Blob([data.buffer], {

‎examples/browser/image2video.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,28 @@ <h3>Click start to transcode images to mp4 (x264) and play!</h3>
1919
<video id="output-video" controls></video><br/>
2020
<button id="start-btn">Start</button>
2121
<p id="message"></p>
22-
<a href="https://github.com/ffmpegjs/ffmpeg.js/tree/master/tests/assets/triangle">Data Set</a>
22+
<a href="https://github.com/ffmpegjs/ffmpeg.js/tree/master/examples/assets/triangle">Data Set</a>
2323
<script>
24-
const { createFFmpeg } = FFmpeg;
24+
const { createFFmpeg, fetchFile } = FFmpeg;
2525
const ffmpeg = createFFmpeg({ log: true });
2626

2727
const image2video = async () => {
2828
const message = document.getElementById('message');
2929
message.innerHTML = 'Loading ffmpeg-core.js';
3030
await ffmpeg.load();
3131
message.innerHTML = 'Loading data';
32-
await ffmpeg.write('audio.ogg', '../../tests/assets/triangle/audio.ogg');
32+
ffmpeg.FS('writeFile', 'audio.ogg', await fetchFile('../assets/triangle/audio.ogg'));
3333
for (let i = 0; i < 60; i += 1) {
3434
const num = `00${i}`.slice(-3);
35-
await ffmpeg.write(`tmp.${num}.png`, `../../tests/assets/triangle/tmp.${num}.png`);
35+
ffmpeg.FS('writeFile', `tmp.${num}.png`, await fetchFile(`../assets/triangle/tmp.${num}.png`));
3636
}
3737
message.innerHTML = 'Start transcoding';
38-
await ffmpeg.run('-framerate 30 -pattern_type glob -i *.png -i audio.ogg -c:a copy -shortest -c:v libx264 -pix_fmt yuv420p out.mp4', { output: 'out.mp4' });
39-
const data = await ffmpeg.read('out.mp4');
40-
await ffmpeg.remove('audio.ogg');
38+
await ffmpeg.run('-framerate', '30', '-pattern_type', 'glob', '-i', '*.png', '-i', 'audio.ogg', '-c:a', 'copy', '-shortest', '-c:v', 'libx264', '-pix_fmt', 'yuv420p', 'out.mp4');
39+
const data = ffmpeg.FS('readFile', 'out.mp4');
40+
ffmpeg.FS('unlink', 'audio.ogg')
4141
for (let i = 0; i < 60; i += 1) {
4242
const num = `00${i}`.slice(-3);
43-
await ffmpeg.remove(`tmp.${num}.png`);
43+
ffmpeg.FS('unlink', `tmp.${num}.png`);
4444
}
4545

4646
const video = document.getElementById('output-video');

‎examples/browser/run.html

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

‎examples/browser/transcode.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,19 @@ <h3>Upload a video to transcode to mp4 (x264) and play!</h3>
2020
<input type="file" id="uploader">
2121
<p id="message"></p>
2222
<script>
23-
const { createFFmpeg } = FFmpeg;
23+
const { createFFmpeg, fetchFile } = FFmpeg;
2424
const ffmpeg = createFFmpeg({ log: true });
2525

2626
const transcode = async ({ target: { files } }) => {
2727
const message = document.getElementById('message');
2828
const { name } = files[0];
2929
message.innerHTML = 'Loading ffmpeg-core.js';
3030
await ffmpeg.load();
31-
await ffmpeg.write(name, files[0]);
31+
ffmpeg.FS('writeFile', name, await fetchFile(files[0]));
3232
message.innerHTML = 'Start transcoding';
33-
await ffmpeg.transcode(name, 'output.mp4');
33+
await ffmpeg.run('-i', name, 'output.mp4');
3434
message.innerHTML = 'Complete transcoding';
35-
const data = ffmpeg.read('output.mp4');
36-
ffmpeg.remove('output.mp4');
35+
const data = ffmpeg.FS('readFile', 'output.mp4');
3736

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

‎examples/browser/trim.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
</style>
1616
</head>
1717
<body>
18-
<h3>Upload a mp4 (x264) video and trim its first 10 seconds and play!</h3>
18+
<h3>Upload a mp4 (x264) video and trim its first 1 seconds and play!</h3>
1919
<video id="output-video" controls></video><br/>
2020
<input type="file" id="uploader">
2121
<p id="message"></p>
2222
<script>
23-
const { createFFmpeg } = FFmpeg;
23+
const { createFFmpeg, fetchFile } = FFmpeg;
2424
const ffmpeg = createFFmpeg({ log: true });
2525

2626
const trim = async ({ target: { files } }) => {
@@ -29,10 +29,10 @@ <h3>Upload a mp4 (x264) video and trim its first 10 seconds and play!</h3>
2929
message.innerHTML = 'Loading ffmpeg-core.js';
3030
await ffmpeg.load();
3131
message.innerHTML = 'Start trimming';
32-
await ffmpeg.write(name, files[0]);
33-
await ffmpeg.trim(name, 'output.mp4', 0, 10);
32+
ffmpeg.FS('writeFile', name, await fetchFile(files[0]));
33+
await ffmpeg.run('-i', name, '-ss', '0', '-to', '1', 'output.mp4');
3434
message.innerHTML = 'Complete trimming';
35-
const data = ffmpeg.read('output.mp4');
35+
const data = ffmpeg.FS('readFile', 'output.mp4');
3636

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

‎examples/browser/webcam.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h3>Record video from webcam and transcode to mp4 (x264) and play!</h3>
2323
<button id="record" disabled>Start Recording</button>
2424
<p id="message"></p>
2525
<script>
26-
const { createFFmpeg } = FFmpeg;
26+
const { createFFmpeg, fetchFile } = FFmpeg;
2727
const ffmpeg = createFFmpeg({ log: true });
2828

2929
const webcam = document.getElementById('webcam');
@@ -59,10 +59,10 @@ <h3>Record video from webcam and transcode to mp4 (x264) and play!</h3>
5959
message.innerHTML = 'Loading ffmpeg-core.js';
6060
await ffmpeg.load();
6161
message.innerHTML = 'Start transcoding';
62-
await ffmpeg.write(name, webcamData);
63-
await ffmpeg.transcode(name, 'output.mp4');
62+
ffmpeg.FS('writeFile', name, await fetchFile(webcamData));
63+
await ffmpeg.run('-i', name, 'output.mp4');
6464
message.innerHTML = 'Complete transcoding';
65-
const data = ffmpeg.read('output.mp4');
65+
const data = ffmpeg.FS('readFile', 'output.mp4');
6666

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

‎examples/node/concatDemuxer.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
const fs = require('fs');
2-
const { createFFmpeg } = require('../../src');
2+
const { createFFmpeg, fetchFile } = require('../../src');
33

44
const ffmpeg = createFFmpeg({ log: true });
55

66
(async () => {
77
await ffmpeg.load();
8-
await ffmpeg.write('flame.avi', '../../tests/assets/flame.avi');
9-
await ffmpeg.concatDemuxer(['flame.avi', 'flame.avi'], 'flame.mp4');
10-
fs.writeFileSync('flame.mp4', ffmpeg.read('flame.mp4'));
8+
ffmpeg.FS('writeFile', 'flame.avi', await fetchFile('../assets/flame.avi'));
9+
ffmpeg.FS('writeFile', 'concat_list.txt', 'file flame.avi\nfile flame.avi');
10+
await ffmpeg.run('-f', 'concat', '-safe', '0', '-i', 'concat_list.txt', 'flame.mp4');
11+
fs.writeFileSync('flame.mp4', ffmpeg.FS('readFile', 'flame.mp4'));
1112
process.exit(0);
1213
})();

‎examples/node/hstack.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
const fs = require('fs');
2-
const { createFFmpeg } = require('../../src');
2+
const { createFFmpeg, fetchFile } = require('../../src');
33

44
const ffmpeg = createFFmpeg({ log: true });
55

66
(async () => {
77
await ffmpeg.load();
8-
await ffmpeg.write('flame.avi', '../../tests/assets/flame.avi');
9-
await ffmpeg.run('-i flame.avi -i flame.avi -filter_complex hstack flame.mp4');
10-
fs.writeFileSync('flame.mp4', ffmpeg.read('flame.mp4'));
8+
ffmpeg.FS('writeFile', 'flame.avi', await fetchFile('../assets/flame.avi'));
9+
await ffmpeg.run('-i', 'flame.avi', '-i', 'flame.avi', '-filter_complex', 'hstack', 'flame.mp4');
10+
fs.writeFileSync('flame.mp4', ffmpeg.FS('readFile', 'flame.mp4'));
1111
process.exit(0);
1212
})();

‎examples/node/image2video.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
const fs = require('fs');
2-
const { createFFmpeg } = require('../../src');
2+
const { createFFmpeg, fetchFile } = require('../../src');
33

44
const ffmpeg = createFFmpeg({ log: true });
55

66
(async () => {
77
await ffmpeg.load();
8-
await ffmpeg.write('audio.ogg', '../../tests/assets/triangle/audio.ogg');
8+
ffmpeg.FS('writeFile', 'audio.ogg', await fetchFile('../assets/triangle/audio.ogg'));
99
for (let i = 0; i < 60; i += 1) {
1010
const num = `00${i}`.slice(-3);
11-
await ffmpeg.write(`tmp.${num}.png`, `../../tests/assets/triangle/tmp.${num}.png`);
11+
ffmpeg.FS('writeFile', `tmp.${num}.png`, await fetchFile(`../assets/triangle/tmp.${num}.png`));
1212
}
13-
await ffmpeg.run('-framerate 30 -pattern_type glob -i *.png -i audio.ogg -c:a copy -shortest -c:v libx264 -pix_fmt yuv420p out.mp4');
14-
await ffmpeg.remove('audio.ogg');
13+
console.log(ffmpeg.FS('readdir', '/'));
14+
await ffmpeg.run('-framerate', '30', '-pattern_type', 'glob', '-i', '*.png', '-i', 'audio.ogg', '-c:a', 'copy', '-shortest', '-c:v', 'libx264', '-pix_fmt', 'yuv420p', 'out.mp4');
15+
await ffmpeg.FS('unlink', 'audio.ogg');
1516
for (let i = 0; i < 60; i += 1) {
1617
const num = `00${i}`.slice(-3);
17-
await ffmpeg.remove(`tmp.${num}.png`);
18+
await ffmpeg.FS('unlink', `tmp.${num}.png`);
1819
}
19-
fs.writeFileSync('out.mp4', ffmpeg.read('out.mp4'));
20+
fs.writeFileSync('out.mp4', ffmpeg.FS('readFile', 'out.mp4'));
2021
process.exit(0);
2122
})();

‎examples/node/multiple-output.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
const fs = require('fs');
2-
const { createFFmpeg } = require('../../src');
2+
const { createFFmpeg, fetchFile } = require('../../src');
33

44
const ffmpeg = createFFmpeg({ log: true });
55

66
(async () => {
77
await ffmpeg.load();
8-
await ffmpeg.write('flame.avi', '../../tests/assets/flame.avi');
9-
await ffmpeg.run('-i flame.avi -map 0:v -r 25 out_%06d.bmp');
10-
ffmpeg.ls('/').filter((p) => p.endsWith('.bmp')).forEach((p) => {
11-
fs.writeFileSync(p, ffmpeg.read(p));
8+
ffmpeg.FS('writeFile', 'flame.avi', await fetchFile('../assets/flame.avi'));
9+
await ffmpeg.run('-i', 'flame.avi', '-map', '0:v', '-r', '25', 'out_%06d.bmp');
10+
ffmpeg.FS('readdir', '/').filter((p) => p.endsWith('.bmp')).forEach((p) => {
11+
fs.writeFileSync(p, ffmpeg.FS('readFile', p));
1212
});
1313

1414
process.exit(0);

0 commit comments

Comments
 (0)