Complete basic rewrite

Author: jeromewu

Diff for: Dockerfile

@@ -37,11 +37,11 @@ RUN bash -x /src/build.sh
 
 # Build ffmpeg.wasm
 FROM ffmpeg-builder AS ffmpeg-wasm-builder
-COPY src/bind /src/wasm/bind
-COPY src/fftools /src/wasm/fftools
+COPY src/bind /src/src/bind
+COPY src/fftools /src/src/fftools
 COPY build/ffmpeg-wasm.sh build.sh
-RUN mkdir -p /src/dist/umd && bash -x /src/build.sh -o dist/umd/ffmpeg.js
-RUN mkdir -p /src/dist/esm && bash -x /src/build.sh -sEXPORT_ES6 -o dist/esm/ffmpeg.js
+RUN mkdir -p /src/dist/umd && bash -x /src/build.sh -o dist/umd/ffmpeg-core.js
+RUN mkdir -p /src/dist/esm && bash -x /src/build.sh -sEXPORT_ES6 -o dist/esm/ffmpeg-core.js
 
 # Export ffmpeg-core.wasm to dist/, use `docker buildx build -o . .` to get assets
 FROM scratch AS exportor

Diff for: Makefile

@@ -9,13 +9,13 @@ PROD_CFLAGS := -O3 -msimd128
 PROD_MT_CFLAGS := $(PROD_CFLAGS) $(MT_FLAGS)
 
 clean:
-	rm -rf ./packages/ffmpeg$(PKG_SUFFIX)/dist
-	rm -rf ./packages/ffmpeg$(PKG_SUFFIX)/types
+	rm -rf ./packages/core$(PKG_SUFFIX)/dist
+	rm -rf ./packages/core$(PKG_SUFFIX)/types
 
 .PHONY: build
 build:
 	make clean PKG_SUFFIX="$(PKG_SUFFIX)"
-	cp -r src/types/ffmpeg packages/ffmpeg$(PKG_SUFFIX)/types
+	cp -r src/types/ffmpeg-core packages/core$(PKG_SUFFIX)/types
 	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
 	EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)" \
 	FFMPEG_ST="$(FFMPEG_ST)" \
@@ -25,7 +25,7 @@ build:
 			--build-arg EXTRA_LDFLAGS \
 			--build-arg FFMPEG_MT \
 			--build-arg FFMPEG_ST \
-			-o ./packages/ffmpeg$(PKG_SUFFIX) \
+			-o ./packages/core$(PKG_SUFFIX) \
 			$(EXTRA_ARGS) \
 			.
 
@@ -49,3 +49,6 @@ prd:
 
 prd-mt:
 	make build-mt EXTRA_CFLAGS="$(PROD_MT_CFLAGS)"
+
+test:
+	npm run test

Diff for: apps/browser/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "browser example",
   "scripts": {
-    "start": "npx http-server ../../"
+    "start": "npx http-server -c-1 ../../"
   },
   "author": "Jerome Wu <[email protected]>",
   "license": "MIT"

Diff for: apps/browser/transcode.html

@@ -11,20 +11,32 @@ <h3>Upload a video to transcode to mp4 (x264) and play!</h3>
     <p id="message"></p>
     <script>
       const { fetchFile } = FFmpegUtil;
+      const { FFmpeg } = FFmpegWASM;
       let ffmpeg = null;
 
       const transcode = 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(FFmpeg.DOWNLOAD, ({ url, total, received, done }) => {
+              console.log(`downloading ${url}, progress: ${received / total * 100} %, done: ${done}`);
+          });
+          ffmpeg.on(FFmpeg.PROGRESS, (p) => {
+              message.innerHTML = `${p * 100} %`;
+          });
+          ffmpeg.on(FFmpeg.LOG, ({ message }) => {
+              console.log(message);
+          });
+          await ffmpeg.load({
+            coreURL: "/packages/core/dist/umd/ffmpeg-core.js",
+          });
         }
         const { name } = files[0];
-        ffmpeg.FS.writeFile(name, await fetchFile(files[0]));
+        await ffmpeg.writeFile(name, await fetchFile(files[0]));
         message.innerHTML = 'Start transcoding';
-        await ffmpeg.exec('-i', name,  'output.mp4');
+        await ffmpeg.exec(['-i', name,  'output.mp4']);
         message.innerHTML = 'Complete transcoding';
-        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 for: build/ffmpeg-wasm.sh

@@ -3,11 +3,11 @@
 # ex:
 #     bash ffmpeg-wasm.sh -o ffmpeg.js
 
-EXPORT_NAME="createFFmpeg"
+EXPORT_NAME="createFFmpegCore"
 
 CONF_FLAGS=(
   -I. 
-  -I./wasm/fftools 
+  -I./src/fftools 
   -I$INSTALL_DIR/include 
   -L$INSTALL_DIR/lib 
   -Llibavcodec 
@@ -35,17 +35,17 @@ CONF_FLAGS=(
   ${FFMPEG_MT:+ -sPTHREAD_POOL_SIZE=32}    # use 32 threads
   ${FFMPEG_ST:+ -sINITIAL_MEMORY=32MB -sALLOW_MEMORY_GROWTH} # Use just enough memory as memory usage can grow
   -sEXPORT_NAME="$EXPORT_NAME"             # required in browser env, so that user can access this module from window.createFFmpeg
-  -sEXPORTED_FUNCTIONS=$(node wasm/bind/ffmpeg/export.js) # exported functions
-  -sEXPORTED_RUNTIME_METHODS=$(node wasm/bind/ffmpeg/export-runtime.js) # exported built-in functions
-  --pre-js wasm/bind/ffmpeg/bind.js        # extra bindings, contains most of the ffmpeg.wasm javascript code
+  -sEXPORTED_FUNCTIONS=$(node src/bind/ffmpeg/export.js) # exported functions
+  -sEXPORTED_RUNTIME_METHODS=$(node src/bind/ffmpeg/export-runtime.js) # exported built-in functions
+  --pre-js src/bind/ffmpeg/bind.js        # extra bindings, contains most of the ffmpeg.wasm javascript code
   # ffmpeg source code
-  wasm/fftools/cmdutils.c 
-  wasm/fftools/ffmpeg.c 
-  wasm/fftools/ffmpeg_filter.c 
-  wasm/fftools/ffmpeg_hw.c 
-  wasm/fftools/ffmpeg_mux.c 
-  wasm/fftools/ffmpeg_opt.c 
-  wasm/fftools/opt_common.c 
+  src/fftools/cmdutils.c 
+  src/fftools/ffmpeg.c 
+  src/fftools/ffmpeg_filter.c 
+  src/fftools/ffmpeg_hw.c 
+  src/fftools/ffmpeg_mux.c 
+  src/fftools/ffmpeg_opt.c 
+  src/fftools/opt_common.c 
 )
 
 emcc "${CONF_FLAGS[@]}" $@