From 5cafc7354540436c70af0f8ed02ff7f212b049c3 Mon Sep 17 00:00:00 2001
From: Jerome Wu <jeromewus@gmail.com>
Date: Mon, 17 May 2021 17:03:07 +0800
Subject: [PATCH] Release v0.10.0

---
 README.md                       |  4 ++--
 docs/api.md                     | 18 ++++++++++++++++++
 examples/browser/transcode.html | 17 +++++++++++++++--
 package-lock.json               |  8 ++++----
 package.json                    |  4 ++--
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index c22691c..73954f1 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ $ node --experimental-wasm-threads --experimental-wasm-bulk-memory transcode.js
 Or, using a script tag in the browser (only works in some browsers, see list below):
 
 ```html
-<script src="https://unpkg.com/@ffmpeg/ffmpeg@0.9.8/dist/ffmpeg.min.js"></script>
+<script src="https://unpkg.com/@ffmpeg/ffmpeg@0.10.0/dist/ffmpeg.min.js"></script>
 <script>
   const { createFFmpeg } = FFmpeg;
   ...
@@ -99,7 +99,7 @@ const ffmpeg = createFFmpeg({
 
 ```javascript
 const ffmpeg = createFFmpeg({
-  corePath: 'https://unpkg.com/@ffmpeg/core@0.9.0/dist/ffmpeg-core.js',
+  corePath: 'https://unpkg.com/@ffmpeg/core@0.10.0/dist/ffmpeg-core.js',
 });
 ```
 
diff --git a/docs/api.md b/docs/api.md
index a4a98e5..0c2d815 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -4,6 +4,7 @@
   - [ffmpeg.load()](#ffmpeg-load)
   - [ffmpeg.run()](#ffmpeg-run)
   - [ffmpeg.FS()](#ffmpeg-fs)
+  - [ffmpeg.exit()](#ffmpeg-exit)
   - [ffmpeg.setLogging()](#ffmpeg-setlogging)
   - [ffmpeg.setLogger()](#ffmpeg-setlogger)
   - [ffmpeg.setProgress()](#ffmpeg-setProgress)
@@ -98,6 +99,23 @@ ffmpeg.FS('readFile', 'video.mp4');
 ffmpeg.FS('unlink', 'video.mp4');
 ```
 
+<a name="ffmpeg-exit"></a>
+
+### ffmpeg.exit()
+
+Kill the execution of the program, also remove MEMFS to free memory
+
+**Examples:**
+
+```javascript
+const ffmpeg = createFFmpeg({ log: true });
+await ffmpeg.load(...);
+setTimeout(() => {
+  ffmpeg.exit(); // ffmpeg.exit() is callable only after load() stage.
+}, 1000);
+await ffmpeg.run(...);
+```
+
 <a name="ffmpeg-setlogging"></a>
 
 ### ffmpeg.setLogging(logging)
diff --git a/examples/browser/transcode.html b/examples/browser/transcode.html
index 25d1292..d0253f4 100644
--- a/examples/browser/transcode.html
+++ b/examples/browser/transcode.html
@@ -18,16 +18,22 @@
     <h3>Upload a video to transcode to mp4 (x264) and play!</h3>
     <video id="output-video" controls></video><br/>
     <input type="file" id="uploader">
+    <button onClick="cancel()">Cancel</button>
     <p id="message"></p>
     <script>
       const { createFFmpeg, fetchFile } = FFmpeg;
-      const ffmpeg = createFFmpeg({ log: true });
+      let ffmpeg = null;
 
       const transcode = async ({ target: { files } }) => {
+        if (ffmpeg === null) {
+          ffmpeg = createFFmpeg({ log: true });
+        }
         const message = document.getElementById('message');
         const { name } = files[0];
         message.innerHTML = 'Loading ffmpeg-core.js';
-        await ffmpeg.load();
+        if (!ffmpeg.isLoaded()) {
+          await ffmpeg.load();
+        }
         ffmpeg.FS('writeFile', name, await fetchFile(files[0]));
         message.innerHTML = 'Start transcoding';
         await ffmpeg.run('-i', name,  'output.mp4');
@@ -39,6 +45,13 @@
       }
       const elm = document.getElementById('uploader');
       elm.addEventListener('change', transcode);
+
+      const cancel = () => {
+        try {
+          ffmpeg.exit();
+        } catch(e) {}
+        ffmpeg = null;
+      }
     </script>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
index d8e5a82..34fe480 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@ffmpeg/ffmpeg",
-  "version": "0.9.8",
+  "version": "0.10.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2065,9 +2065,9 @@
       }
     },
     "@ffmpeg/core": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@ffmpeg/core/-/core-0.9.0.tgz",
-      "integrity": "sha512-d931yzQpb8GRgTZr+T7+BMqglPZ1R8FPH3W3UA8I21RzuasRHsMwQ4MQTlS9twjfqvUGIkD8p/8mNToUVN/Yrw==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@ffmpeg/core/-/core-0.10.0.tgz",
+      "integrity": "sha512-qunWJl5PezpXEm31tb8Qu5z37B5KVA1VYZCpXchMhuAb3X9T7PuE3SlhOwphEoRhzaOa3lpofDfzihAUMFaVPQ==",
       "dev": true
     },
     "@hapi/hoek": {
diff --git a/package.json b/package.json
index d74675b..d793293 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ffmpeg/ffmpeg",
-  "version": "0.9.8",
+  "version": "0.10.0",
   "description": "FFmpeg WebAssembly version",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -50,7 +50,7 @@
   "devDependencies": {
     "@babel/core": "^7.12.3",
     "@babel/preset-env": "^7.12.1",
-    "@ffmpeg/core": "^0.9.0",
+    "@ffmpeg/core": "^0.10.0",
     "@types/emscripten": "^1.39.4",
     "babel-loader": "^8.1.0",
     "chai": "^4.2.0",