Skip to content

Commit d76b5ed

Browse files
committed
Release v0.10.0
1 parent ea760ac commit d76b5ed

File tree

5 files changed

+41
-10
lines changed

5 files changed

+41
-10
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $ node --experimental-wasm-threads --experimental-wasm-bulk-memory transcode.js
4747
Or, using a script tag in the browser (only works in some browsers, see list below):
4848

4949
```html
50-
<script src="https://unpkg.com/@ffmpeg/ffmpeg@0.9.8/dist/ffmpeg.min.js"></script>
50+
<script src="https://unpkg.com/@ffmpeg/ffmpeg@0.10.0/dist/ffmpeg.min.js"></script>
5151
<script>
5252
const { createFFmpeg } = FFmpeg;
5353
...
@@ -99,7 +99,7 @@ const ffmpeg = createFFmpeg({
9999

100100
```javascript
101101
const ffmpeg = createFFmpeg({
102-
corePath: 'https://unpkg.com/@ffmpeg/core@0.9.0/dist/ffmpeg-core.js',
102+
corePath: 'https://unpkg.com/@ffmpeg/core@0.10.0/dist/ffmpeg-core.js',
103103
});
104104
```
105105

docs/api.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- [ffmpeg.load()](#ffmpeg-load)
55
- [ffmpeg.run()](#ffmpeg-run)
66
- [ffmpeg.FS()](#ffmpeg-fs)
7+
- [ffmpeg.exit()](#ffmpeg-exit)
78
- [ffmpeg.setLogging()](#ffmpeg-setlogging)
89
- [ffmpeg.setLogger()](#ffmpeg-setlogger)
910
- [ffmpeg.setProgress()](#ffmpeg-setProgress)
@@ -98,6 +99,23 @@ ffmpeg.FS('readFile', 'video.mp4');
9899
ffmpeg.FS('unlink', 'video.mp4');
99100
```
100101

102+
<a name="ffmpeg-exit"></a>
103+
104+
### ffmpeg.exit()
105+
106+
Kill the execution of the program, also remove MEMFS to free memory
107+
108+
**Examples:**
109+
110+
```javascript
111+
const ffmpeg = createFFmpeg({ log: true });
112+
await ffmpeg.load(...);
113+
setTimeout(() => {
114+
ffmpeg.exit(); // ffmpeg.exit() is callable only after load() stage.
115+
}, 1000);
116+
await ffmpeg.run(...);
117+
```
118+
101119
<a name="ffmpeg-setlogging"></a>
102120

103121
### ffmpeg.setLogging(logging)

examples/browser/transcode.html

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,22 @@
1818
<h3>Upload a video to transcode to mp4 (x264) and play!</h3>
1919
<video id="output-video" controls></video><br/>
2020
<input type="file" id="uploader">
21+
<button onClick="cancel()">Cancel</button>
2122
<p id="message"></p>
2223
<script>
2324
const { createFFmpeg, fetchFile } = FFmpeg;
24-
const ffmpeg = createFFmpeg({ log: true });
25+
let ffmpeg = null;
2526

2627
const transcode = async ({ target: { files } }) => {
28+
if (ffmpeg === null) {
29+
ffmpeg = createFFmpeg({ log: true });
30+
}
2731
const message = document.getElementById('message');
2832
const { name } = files[0];
2933
message.innerHTML = 'Loading ffmpeg-core.js';
30-
await ffmpeg.load();
34+
if (!ffmpeg.isLoaded()) {
35+
await ffmpeg.load();
36+
}
3137
ffmpeg.FS('writeFile', name, await fetchFile(files[0]));
3238
message.innerHTML = 'Start transcoding';
3339
await ffmpeg.run('-i', name, 'output.mp4');
@@ -39,6 +45,13 @@ <h3>Upload a video to transcode to mp4 (x264) and play!</h3>
3945
}
4046
const elm = document.getElementById('uploader');
4147
elm.addEventListener('change', transcode);
48+
49+
const cancel = () => {
50+
try {
51+
ffmpeg.exit();
52+
} catch(e) {}
53+
ffmpeg = null;
54+
}
4255
</script>
4356
</body>
4457
</html>

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ffmpeg/ffmpeg",
3-
"version": "0.9.8",
3+
"version": "0.10.0",
44
"description": "FFmpeg WebAssembly version",
55
"main": "src/index.js",
66
"types": "src/index.d.ts",
@@ -50,7 +50,7 @@
5050
"devDependencies": {
5151
"@babel/core": "^7.12.3",
5252
"@babel/preset-env": "^7.12.1",
53-
"@ffmpeg/core": "^0.9.0",
53+
"@ffmpeg/core": "^0.10.0",
5454
"@types/emscripten": "^1.39.4",
5555
"babel-loader": "^8.1.0",
5656
"chai": "^4.2.0",

0 commit comments

Comments
 (0)