Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Commit

Permalink
Minor update build scripts and release 0.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromewu committed Aug 14, 2022
1 parent 9e96b1c commit 3ea4213
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 31 deletions.
44 changes: 22 additions & 22 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@ run-all() {
SCRIPTS=(
# install dependencies
install-deps
build-zlib
build-x264
build-x265
build-libvpx
build-wavpack
build-lame
build-fdk-aac
build-ogg
build-vorbis
build-theora
build-opus
build-libwebp
build-freetype2
build-fribidi
build-harfbuzz
build-libass
#build-aom # disabled as it is extremely slow
configure-ffmpeg
build-zlib
build-x264
build-x265
build-libvpx
build-wavpack
build-lame
build-fdk-aac
build-ogg
build-vorbis
build-theora
build-opus
build-libwebp
build-freetype2
build-fribidi
build-harfbuzz
build-libass
#build-aom # disabled as it is extremely slow
configure-ffmpeg
build-ffmpeg
configure-ffmpeg.mp4-scale
build-ffmpeg.mp4-scale
configure-ffmpeg.png-to-mp4
build-ffmpeg.png-to-mp4
# configure-ffmpeg.mp4-scale
# build-ffmpeg.mp4-scale
# configure-ffmpeg.png-to-mp4
# build-ffmpeg.png-to-mp4
)
run ${SCRIPTS[@]}
}
Expand Down
7 changes: 4 additions & 3 deletions wasm/build-scripts/build-ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@ if [[ "$FFMPEG_ST" != "yes" ]]; then
-s USE_PTHREADS=1 # enable pthreads support
-s PROXY_TO_PTHREAD=1 # detach main() from browser/UI main thread
-o wasm/packages/core/dist/ffmpeg-core.js
-s INITIAL_MEMORY=1073741824 # 1GB
)
else
mkdir -p wasm/packages/core-st/dist
EXPORTED_FUNCTIONS="[_main]"
EXTRA_FLAGS=(
-o wasm/packages/core-st/dist/ffmpeg-core.js
-s INITIAL_MEMORY=33554432 # 32MB
-s MAXIMUM_MEMORY=1073741824 # 1GB
-s ALLOW_MEMORY_GROWTH=1
)
fi
FLAGS=(
Expand All @@ -32,9 +36,6 @@ 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, lengthBytesUTF8, stringToUTF8, UTF8ToString]" # export preamble funcs
-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
Expand Down
4 changes: 2 additions & 2 deletions wasm/packages/core-st/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wasm/packages/core-st/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ffmpeg/core-st",
"version": "0.10.0",
"version": "0.11.0",
"description": "ffmpeg.wasm core (single thread)",
"main": "dist/ffmpeg-core.js",
"files": [
Expand Down
4 changes: 2 additions & 2 deletions wasm/packages/core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wasm/packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ffmpeg/core",
"version": "0.10.0",
"version": "0.11.0",
"description": "ffmpeg.wasm core",
"main": "dist/ffmpeg-core.js",
"files": [
Expand Down

0 comments on commit 3ea4213

Please sign in to comment.