Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 3dd15d7

Browse files
Revert "Upgrade to emscripten v2.0.24" (#14)
Because of confusing due to API changes. Co-authored-by: jeromewu <[email protected]>
1 parent acaad4b commit 3dd15d7

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

build-with-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -euo pipefail
44

5-
EM_VERSION=2.0.24
5+
EM_VERSION=2.0.8
66

77
docker pull emscripten/emsdk:$EM_VERSION
88
docker run \

wasm/build-scripts/build-ffmpeg.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ source $(dirname $0)/var.sh
55

66
if [[ "$FFMPEG_ST" != "yes" ]]; then
77
mkdir -p wasm/packages/core/dist
8+
EXPORTED_FUNCTIONS="[_main, _proxy_main]"
89
EXTRA_FLAGS=(
910
-pthread
1011
-s USE_PTHREADS=1 # enable pthreads support
@@ -13,6 +14,7 @@ if [[ "$FFMPEG_ST" != "yes" ]]; then
1314
)
1415
else
1516
mkdir -p wasm/packages/core-st/dist
17+
EXPORTED_FUNCTIONS="[_main]"
1618
EXTRA_FLAGS=(
1719
-o wasm/packages/core-st/dist/ffmpeg-core.js
1820
)
@@ -28,11 +30,12 @@ FLAGS=(
2830
-s EXIT_RUNTIME=1 # exit runtime after execution
2931
-s MODULARIZE=1 # use modularized version to be more flexible
3032
-s EXPORT_NAME="createFFmpegCore" # assign export name for browser
31-
-s EXPORTED_FUNCTIONS="[_main]" # export main and proxy_main funcs
33+
34+
-s EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS" # export main and proxy_main funcs
3235
-s EXPORTED_RUNTIME_METHODS="[FS, cwrap, ccall, setValue, writeAsciiToMemory, lengthBytesUTF8, stringToUTF8, UTF8ToString]" # export preamble funcs
3336
-s INITIAL_MEMORY=2146435072 # 64 KB * 1024 * 16 * 2047 = 2146435072 bytes ~= 2 GB
34-
--pre-js wasm/src/pre.js
3537
--post-js wasm/src/post.js
38+
--pre-js wasm/src/pre.js
3639
$OPTIM_FLAGS
3740
${EXTRA_FLAGS[@]}
3841
)

wasm/tests/utils/mt/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let resolve = null;
33

44
const ffmpeg = ({ core, args }) => new Promise((_resolve) => {
55
core.ccall(
6-
'emscripten_proxy_main', // use emscripten_proxy_main if emscripten upgraded
6+
'proxy_main', // use emscripten_proxy_main if emscripten upgraded
77
'number',
88
['number', 'number'],
99
parseArgs(core, ['ffmpeg', '-hide_banner', '-nostdin', ...args]),

0 commit comments

Comments
 (0)