Skip to content

Commit 86d73dc

Browse files
committed
Fix Worker.terminate()
1 parent 1e4b209 commit 86d73dc

File tree

13 files changed

+30
-7
lines changed

13 files changed

+30
-7
lines changed

docs/api.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- [Worker.trim](#worker-trim)
1111
- [Worker.concatDemuxer](#worker-concatDemuxer)
1212
- [Worker.run](#worker-run)
13+
- [Worker.terminate](#worker-terminate)
1314

1415
---
1516

@@ -230,3 +231,17 @@ Worker.run() is similar to FFmpeg cli tool, aims to provide maximum flexiblity f
230231
await worker.run("-i flame.avi -s 1920x1080 output.mp4");
231232
})();
232233
```
234+
235+
<a name="worker-run"></a>
236+
237+
### Worker.terminate(): Promise
238+
239+
Worker.terminate() terminates web worker / worker\_threads, after terminate(), you cannot use this worker anymore.
240+
241+
**Examples:**
242+
243+
```javascript
244+
(async () => {
245+
await worker.terminate();
246+
})();
247+
```

examples/browser/concatDemuxer.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ <h3>Select multiple video files to Concatenate</h3>
4949
type: "video/mp4"
5050
})
5151
);
52+
await worker.terminate();
5253
};
5354
const elm = document.getElementById("uploader");
5455
elm.addEventListener("change", transcode);

examples/browser/image2video.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ <h3>Click start to transcode images to mp4 (x264) and play!</h3>
4848

4949
const video = document.getElementById('output-video');
5050
video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
51+
await worker.terminate();
5152
}
5253
const elm = document.getElementById('start-btn');
5354
elm.addEventListener('click', image2video);

examples/browser/run.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ <h3>Upload a video to transcode to mp4 (x264) and play!</h3>
3333
await worker.load();
3434
message.innerHTML = 'Start transcoding';
3535
await worker.write(name, files[0]);
36-
await worker.run(`-i /data/${name} output.mp4`, { input: name, output: 'output.mp4' });
36+
await worker.run(`-i /data/${name} output.mp4`);
3737
message.innerHTML = 'Complete transcoding';
3838
const { data } = await worker.read('output.mp4');
3939

4040
const video = document.getElementById('output-video');
4141
video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
42+
await worker.terminate();
4243
}
4344
const elm = document.getElementById('uploader');
4445
elm.addEventListener('change', transcode);

examples/browser/transcode.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ <h3>Upload a video to transcode to mp4 (x264) and play!</h3>
4040

4141
const video = document.getElementById('output-video');
4242
video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
43+
await worker.terminate();
4344
}
4445
const elm = document.getElementById('uploader');
4546
elm.addEventListener('change', transcode);

examples/browser/trim.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ <h3>Upload a mp4 (x264) video and trim its first 10 seconds and play!</h3>
3939

4040
const video = document.getElementById('output-video');
4141
video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
42+
await worker.terminate();
4243
}
4344
const elm = document.getElementById('uploader');
4445
elm.addEventListener('change', transcode);

examples/browser/webcam.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ <h3>Record video from webcam and transcode to mp4 (x264) and play!</h3>
6969

7070
const video = document.getElementById('output-video');
7171
video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
72+
await worker.terminate();
7273
}
7374
</script>
7475
</body>

examples/node/concatDemuxer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ const worker = createWorker({
1313
const { data } = await worker.read('flame.mp4');
1414
console.log('Complete concat');
1515
fs.writeFileSync('flame.mp4', Buffer.from(data));
16-
process.exit(0);
16+
await worker.terminate();
1717
})();

examples/node/image2video.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ const worker = createWorker({
2424
await worker.remove(`tmp.${num}.png`);
2525
}
2626
fs.writeFileSync('out.mp4', Buffer.from(data));
27-
process.exit(0);
27+
await worker.terminate();
2828
})();

examples/node/run.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ const worker = createWorker({
1313
const { data } = await worker.read('flame.mp4');
1414
console.log('Complete transcoding');
1515
fs.writeFileSync('flame.mp4', Buffer.from(data));
16-
process.exit(0);
16+
await worker.terminate();
1717
})();

0 commit comments

Comments
 (0)