From 93cf474b9e1771aad1b266eff3ffa87209fab5a3 Mon Sep 17 00:00:00 2001
From: Jerome Wu <jeromewus@gmail.com>
Date: Sun, 23 Jul 2023 22:58:36 +0800
Subject: [PATCH] Clean up browser examples

---
 apps/browser/concatDemuxer.html | 45 ++++++++++-----------
 apps/browser/image2video.html   | 53 ------------------------
 apps/browser/trim.html          | 20 ++++++---
 apps/browser/webcam.html        | 72 ---------------------------------
 4 files changed, 36 insertions(+), 154 deletions(-)
 delete mode 100644 apps/browser/image2video.html
 delete mode 100644 apps/browser/webcam.html
diff --git a/apps/browser/concatDemuxer.html b/apps/browser/concatDemuxer.html
index dc6fb00..1f13bcf 100644
--- a/apps/browser/concatDemuxer.html
+++ b/apps/browser/concatDemuxer.html
@@ -1,20 +1,8 @@
 <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>
+    <link rel="stylesheet" href="style.css">
+    <script src="../../packages/ffmpeg/dist/umd/ffmpeg.js"></script>
+    <script src="../../packages/util/dist/umd/index.js"></script>
   </head>
 
   <body>
@@ -23,24 +11,35 @@
     <input type="file" id="uploader" multiple />
     <p id="message"></p>
     <script>
-      const { createFFmpeg, fetchFile } = FFmpeg;
-      const ffmpeg = createFFmpeg({ log: true });
+      const { fetchFile } = FFmpegUtil;
+      const { FFmpeg } = FFmpegWASM;
+      let ffmpeg = null;
 
       const transcode = async ({ target: { files } }) => {
         const message = document.getElementById("message");
-        message.innerHTML = "Loading ffmpeg-core.js";
-        await ffmpeg.load();
+        if (ffmpeg === null) {
+          ffmpeg = new FFmpeg();
+          ffmpeg.on("log", ({ message }) => {
+            console.log(message);
+          })
+          ffmpeg.on("progress", ({ progress }) => {
+            message.innerHTML = `${progress * 100} %`;
+          });
+          await ffmpeg.load({
+            coreURL: "/packages/core/dist/umd/ffmpeg-core.js",
+          });
+        }
         message.innerHTML = "Start Concating";
         const inputPaths = [];
         for (const file of files) {
           const { name } = file;
-          ffmpeg.FS('writeFile', name, await fetchFile(file));
+          ffmpeg.writeFile(name, await fetchFile(file));
           inputPaths.push(`file ${name}`);
         }
-        ffmpeg.FS('writeFile', 'concat_list.txt', inputPaths.join('\n'));
-        await ffmpeg.run('-f', 'concat', '-safe', '0', '-i', 'concat_list.txt', 'output.mp4');
+        await ffmpeg.writeFile('concat_list.txt', inputPaths.join('\n'));
+        await ffmpeg.exec(['-f', 'concat', '-safe', '0', '-i', 'concat_list.txt', 'output.mp4']);
         message.innerHTML = "Complete Concating";
-        const data = ffmpeg.FS('readFile', 'output.mp4');
+        const data = await ffmpeg.readFile('output.mp4');
         const video = document.getElementById("output-video");
         video.src = URL.createObjectURL(
           new Blob([data.buffer], {
diff --git a/apps/browser/image2video.html b/apps/browser/image2video.html
deleted file mode 100644
index 2ca7810..0000000
--- a/apps/browser/image2video.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<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>Click start to transcode images to mp4 (x264) and play!</h3>
-    <video id="output-video" controls></video><br/>
-    <button id="start-btn">Start</button>
-    <p id="message"></p>
-    <a href="https://github.com/ffmpegjs/ffmpeg.js/tree/master/examples/assets/triangle">Data Set</a>
-    <script>
-      const { createFFmpeg, fetchFile } = FFmpeg;
-      const ffmpeg = createFFmpeg({ log: true });
-
-      const image2video = async () => {
-        const message = document.getElementById('message');
-        message.innerHTML = 'Loading ffmpeg-core.js';
-        await ffmpeg.load();
-        message.innerHTML = 'Loading data';
-        ffmpeg.FS('writeFile', 'audio.ogg', await fetchFile('../assets/triangle/audio.ogg'));
-        for (let i = 0; i < 60; i += 1) {
-          const num = `00${i}`.slice(-3);
-          ffmpeg.FS('writeFile', `tmp.${num}.png`, await fetchFile(`../assets/triangle/tmp.${num}.png`));
-        }
-        message.innerHTML = 'Start transcoding';
-        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');
-        const data = ffmpeg.FS('readFile', 'out.mp4');
-        ffmpeg.FS('unlink', 'audio.ogg')
-        for (let i = 0; i < 60; i += 1) {
-          const num = `00${i}`.slice(-3);
-          ffmpeg.FS('unlink', `tmp.${num}.png`);
-        }
-
-        const video = document.getElementById('output-video');
-        video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
-      }
-      const elm = document.getElementById('start-btn');
-      elm.addEventListener('click', image2video);
-    </script>
-  </body>
-</html>
diff --git a/apps/browser/trim.html b/apps/browser/trim.html
index 1648ba4..3c229bc 100644
--- a/apps/browser/trim.html
+++ b/apps/browser/trim.html
@@ -11,21 +11,29 @@
     <p id="message"></p>
     <script>
       const { fetchFile } = FFmpegUtil;
+      const { FFmpeg } = FFmpegWASM;
       let ffmpeg = null;
 
       const trim = async ({ target: { files } }) => {
         const message = document.getElementById('message');
         if (ffmpeg === null) {
-          ffmpeg = await createFFmpeg();
-          ffmpeg.setProgress((progress) => { console.log(progress * 100) });
+          ffmpeg = new FFmpeg();
+          ffmpeg.on("log", ({ message }) => {
+            console.log(message);
+          })
+          ffmpeg.on("progress", ({ progress }) => {
+            message.innerHTML = `${progress * 100} %`;
+          });
+          await ffmpeg.load({
+            coreURL: "/packages/core/dist/umd/ffmpeg-core.js",
+          });
         }
         const { name } = files[0];
-        message.innerHTML = 'Loading ffmpeg-core.js';
+        await ffmpeg.writeFile(name, await fetchFile(files[0]));
         message.innerHTML = 'Start trimming';
-        ffmpeg.FS.writeFile(name, await fetchFile(files[0]));
-        await ffmpeg.exec('-i', name, '-ss', '0', '-to', '1', 'output.mp4');
+        await ffmpeg.exec(['-i', name, '-ss', '0', '-to', '1', 'output.mp4']);
         message.innerHTML = 'Complete trimming';
-        const data = ffmpeg.FS.readFile('output.mp4');
+        const data = await ffmpeg.readFile('output.mp4');
 
         const video = document.getElementById('output-video');
         video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
diff --git a/apps/browser/webcam.html b/apps/browser/webcam.html
deleted file mode 100644
index eb9c5e8..0000000
--- a/apps/browser/webcam.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<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>Record video from webcam and transcode to mp4 (x264) and play!</h3>
-    <div>
-      <video id="webcam" width="320px" height="180px"></video>
-      <video id="output-video" width="320px" height="180px" controls></video>
-    </div>
-    <button id="record" disabled>Start Recording</button>
-    <p id="message"></p>
-    <script>
-      const { createFFmpeg, fetchFile } = FFmpeg;
-      const ffmpeg = createFFmpeg({ log: true });
-
-      const webcam = document.getElementById('webcam');
-      const recordBtn = document.getElementById('record');
-      const startRecording = () => {
-        const rec = new MediaRecorder(webcam.srcObject);
-        const chunks = [];
-        
-        recordBtn.textContent = 'Stop Recording';
-        recordBtn.onclick = () => {
-          rec.stop();
-          recordBtn.textContent = 'Start Recording';
-          recordBtn.onclick = startRecording;
-        }
-
-        rec.ondataavailable = e => chunks.push(e.data);
-        rec.onstop = async () => {
-          transcode(new Uint8Array(await (new Blob(chunks)).arrayBuffer()));
-        };
-        rec.start();
-      };
-
-      (async () => {
-        webcam.srcObject = await navigator.mediaDevices.getUserMedia({ video: true, audio: true });
-        await webcam.play();
-        recordBtn.disabled = false;
-        recordBtn.onclick = startRecording;
-      })();
-
-      const transcode = async (webcamData) => {
-        const message = document.getElementById('message');
-        const name = 'record.webm';
-        message.innerHTML = 'Loading ffmpeg-core.js';
-        await ffmpeg.load();
-        message.innerHTML = 'Start transcoding';
-        ffmpeg.FS('writeFile', name, await fetchFile(webcamData));
-        await ffmpeg.run('-i', name,  'output.mp4');
-        message.innerHTML = 'Complete transcoding';
-        const data = ffmpeg.FS('readFile', 'output.mp4');
-
-        const video = document.getElementById('output-video');
-        video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
-      }
-    </script>
-  </body>
-</html>
