From 654153c9751bd5243066bb412e1cadc5b8100d62 Mon Sep 17 00:00:00 2001 From: Yusuke Kawamoto Date: Wed, 1 Jun 2022 14:14:14 +0900 Subject: [PATCH 1/2] Revert "Upgrade to emscripten v2.0.24" Because of confusing due to API changes. --- build-with-docker.sh | 2 +- wasm/build-scripts/build-ffmpeg.sh | 8 +++++--- wasm/tests/utils/mt/index.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build-with-docker.sh b/build-with-docker.sh index 2561e60399465..aa1005b4c3f1b 100755 --- a/build-with-docker.sh +++ b/build-with-docker.sh @@ -2,7 +2,7 @@ set -euo pipefail -EM_VERSION=2.0.24 +EM_VERSION=2.0.8 docker pull emscripten/emsdk:$EM_VERSION docker run \ diff --git a/wasm/build-scripts/build-ffmpeg.sh b/wasm/build-scripts/build-ffmpeg.sh index d6bbcab2c9a55..fc054ebd7ebeb 100755 --- a/wasm/build-scripts/build-ffmpeg.sh +++ b/wasm/build-scripts/build-ffmpeg.sh @@ -5,6 +5,7 @@ source $(dirname $0)/var.sh if [[ "$FFMPEG_ST" != "yes" ]]; then mkdir -p wasm/packages/core/dist + EXPORTED_FUNCTIONS="[_main, _proxy_main]" EXTRA_FLAGS=( -pthread -s USE_PTHREADS=1 # enable pthreads support @@ -13,6 +14,7 @@ if [[ "$FFMPEG_ST" != "yes" ]]; then ) else mkdir -p wasm/packages/core-st/dist + EXPORTED_FUNCTIONS="[_main]" EXTRA_FLAGS=( -o wasm/packages/core-st/dist/ffmpeg-core.js ) @@ -28,11 +30,11 @@ FLAGS=( -s EXIT_RUNTIME=1 # exit runtime after execution -s MODULARIZE=1 # use modularized version to be more flexible -s EXPORT_NAME="createFFmpegCore" # assign export name for browser - -s EXPORTED_FUNCTIONS="[_main]" # export main and proxy_main funcs - -s EXPORTED_RUNTIME_METHODS="[FS, cwrap, ccall, setValue, writeAsciiToMemory]" # export preamble funcs + -s EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS" # export main and proxy_main funcs + -s EXTRA_EXPORTED_RUNTIME_METHODS="[FS, cwrap, ccall, setValue, writeAsciiToMemory]" # export preamble funcs -s INITIAL_MEMORY=2146435072 # 64 KB * 1024 * 16 * 2047 = 2146435072 bytes ~= 2 GB - --pre-js wasm/src/pre.js --post-js wasm/src/post.js + --pre-js wasm/src/pre.js $OPTIM_FLAGS ${EXTRA_FLAGS[@]} ) diff --git a/wasm/tests/utils/mt/index.js b/wasm/tests/utils/mt/index.js index ed5685e26678b..abc41d21bf7a3 100644 --- a/wasm/tests/utils/mt/index.js +++ b/wasm/tests/utils/mt/index.js @@ -3,7 +3,7 @@ let resolve = null; const ffmpeg = ({ core, args }) => new Promise((_resolve) => { core.ccall( - 'emscripten_proxy_main', // use emscripten_proxy_main if emscripten upgraded + 'proxy_main', // use emscripten_proxy_main if emscripten upgraded 'number', ['number', 'number'], parseArgs(core, ['ffmpeg', '-hide_banner', '-nostdin', ...args]), From 1c7a482fd4e9f8008cac186cb838bf800318f659 Mon Sep 17 00:00:00 2001 From: Yusuke Kawamoto Date: Thu, 2 Jun 2022 15:03:46 +0900 Subject: [PATCH 2/2] ios support --- wasm/build-scripts/build-ffmpeg.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wasm/build-scripts/build-ffmpeg.sh b/wasm/build-scripts/build-ffmpeg.sh index fc054ebd7ebeb..a2366eb5c376a 100755 --- a/wasm/build-scripts/build-ffmpeg.sh +++ b/wasm/build-scripts/build-ffmpeg.sh @@ -32,7 +32,9 @@ FLAGS=( -s EXPORT_NAME="createFFmpegCore" # assign export name for browser -s EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS" # export main and proxy_main funcs -s EXTRA_EXPORTED_RUNTIME_METHODS="[FS, cwrap, ccall, setValue, writeAsciiToMemory]" # export preamble funcs - -s INITIAL_MEMORY=2146435072 # 64 KB * 1024 * 16 * 2047 = 2146435072 bytes ~= 2 GB + -s INITIAL_MEMORY=33554432 # 32MB + -s MAXIMUM_MEMORY=1073741824 # 1GB + -s ALLOW_MEMORY_GROWTH=1 --post-js wasm/src/post.js --pre-js wasm/src/pre.js $OPTIM_FLAGS