Revise API and add worker.run

jeromewu · jeromewu · commit d76936d9fa5f · 2019-11-06T11:57:41.000Z
diff --git a/README.md b/README.md
@@ -40,7 +40,9 @@ const worker = createWorker();
 
 (async () => {
   await worker.load();
-  const { data } = await worker.transcode('./test.avi', 'mp4');
+  await worker.write('test.avi', './test.avi');
+  await worker.transcode('test.avi', 'test.mp4');
+  const { data } = await worker.read('test.mp4');
   fs.writeFileSync('./test.mp4', data);
 })();
 ```
diff --git a/examples/browser/run.html b/examples/browser/run.html
@@ -0,0 +1,47 @@
+<html>
+  <head>
+    <script src="/dist/ffmpeg.dev.js"></script>
+    <style>
+      html, body {
+        margin: 0;
+        width: 100%;
+        height: 100%
+      }
+      body {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+      }
+    </style>
+  </head>
+  <body>
+    <h3>Upload a video to transcode to mp4 (x264) and play!</h3>
+    <video id="output-video" controls></video><br/>
+    <input type="file" id="uploader">
+    <p id="message" />
+    <script>
+      const { createWorker } = FFmpeg;
+      const worker = createWorker({
+        corePath: '../../node_modules/@ffmpeg/core/ffmpeg-core.js',
+        logger: ({ message }) => console.log(message),
+      });
+
+      const transcode = async ({ target: { files } }) => {
+        const message = document.getElementById('message');
+        const { name } = files[0];
+        message.innerHTML = 'Loading ffmpeg-core.js';
+        await worker.load();
+        message.innerHTML = 'Start transcoding';
+        await worker.write(name, files[0]);
+        await worker.run(`-i ${name} output.mp4`);
+        message.innerHTML = 'Complete transcoding';
+        const { data } = await worker.read('output.mp4');
+
+        const video = document.getElementById('output-video');
+        video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
+      }
+      const elm = document.getElementById('uploader');
+      elm.addEventListener('change', transcode);
+    </script>
+  </body>
+</html>
diff --git a/examples/browser/transcode.html b/examples/browser/transcode.html
@@ -26,13 +26,16 @@ <h3>Upload a video to transcode to mp4 (x264) and play!</h3>
         logger: ({ message }) => console.log(message),
       });
 
-      const transcode = async ({ target: { files }  }) => {
+      const transcode = async ({ target: { files } }) => {
         const message = document.getElementById('message');
+        const { name } = files[0];
         message.innerHTML = 'Loading ffmpeg-core.js';
         await worker.load();
         message.innerHTML = 'Start transcoding';
-        const { data } = await worker.transcode(files[0], 'mp4');
+        await worker.write(name, files[0]);
+        await worker.transcode(name,  'output.mp4');
         message.innerHTML = 'Complete transcoding';
+        const { data } = await worker.read('output.mp4');
 
         const video = document.getElementById('output-video');
         video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
diff --git a/examples/node/run.js b/examples/node/run.js
@@ -0,0 +1,17 @@
+const fs = require('fs');
+const { createWorker } = require('../../src');
+
+const worker = createWorker({
+  logger: ({ message }) => console.log(message),
+});
+
+(async () => {
+  await worker.load();
+  console.log('Start transcoding');
+  await worker.write('flame.avi', '../../tests/assets/flame.avi');
+  await worker.run('-i flame.avi flame.mp4');
+  const { data } = await worker.read('flame.mp4');
+  console.log('Complete transcoding');
+  fs.writeFileSync('flame.mp4', Buffer.from(data));
+  process.exit(0);
+})();
diff --git a/examples/node/transcode.js b/examples/node/transcode.js
@@ -1,18 +1,17 @@
 const fs = require('fs');
 const { createWorker } = require('../../src');
 
-const { argv } = process;
-const [,, inputPath, outputPath] = argv;
-
 const worker = createWorker({
   logger: ({ message }) => console.log(message),
 });
 
 (async () => {
   await worker.load();
   console.log('Start transcoding');
-  const { data } = await worker.transcode(inputPath, outputPath.split('.').pop());
+  await worker.write('flame.avi', '../../tests/assets/flame.avi');
+  await worker.transcode('flame.avi', 'flame.mp4');
+  const { data } = await worker.read('flame.mp4');
   console.log('Complete transcoding');
-  fs.writeFileSync(outputPath, Buffer.from(data));
+  fs.writeFileSync('flame.mp4', Buffer.from(data));
   process.exit(0);
 })();
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/createWorker.js b/src/createWorker.js
@@ -56,18 +56,41 @@ module.exports = (_options = {}) => {
     }))
   );
 
-  const transcode = async (media, outputExt, opts, jobId) => (
+  const write = async (path, data, jobId) => (
+    startJob(createJob({
+      id: jobId,
+      action: 'write',
+      payload: {
+        path,
+        data: await loadMedia(data),
+      },
+    }))
+  );
+
+  const transcode = (inputPath, outputPath, opts, jobId) => (
     startJob(createJob({
       id: jobId,
       action: 'transcode',
       payload: {
-        media: await loadMedia(media),
-        outputExt,
+        inputPath,
+        outputPath,
         options: opts,
       },
     }))
   );
 
+  const read = (path, jobId) => (
+    startJob(createJob({
+      id: jobId, action: 'read', payload: { path },
+    }))
+  );
+
+  const run = (args, jobId) => (
+    startJob(createJob({
+      id: jobId, action: 'run', payload: { args },
+    }))
+  );
+
   const terminate = async (jobId) => {
     if (worker !== null) {
       await startJob(createJob({
@@ -86,8 +109,10 @@ module.exports = (_options = {}) => {
     if (status === 'resolve') {
       log(`[${workerId}]: Complete ${jobId}`);
       let d = data;
-      if (action === 'transcode') {
+      if (action === 'read') {
         d = Uint8Array.from({ ...data, length: Object.keys(data).length });
+      } else {
+        logger(d);
       }
       resolves[action]({ jobId, data: d });
     } else if (status === 'reject') {
@@ -104,7 +129,10 @@ module.exports = (_options = {}) => {
     setResolve,
     setReject,
     load,
+    write,
     transcode,
+    read,
+    run,
     terminate,
   };
 };
diff --git a/src/worker-script/index.js b/src/worker-script/index.js
