Merge up to v0.8.4

Author: jeromewu

.github/workflows/main.yml

@@ -25,34 +25,36 @@ jobs:
           bash build-with-docker.sh
       - uses: actions/upload-artifact@master
         with:
-          name: ffmpeg-core-linux
-          path: wasm/dist
-  macos-build:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Setup cache
-        id: cache-system-libraries
-        uses: actions/cache@v2
-        with:
-          path: ${{env.EM_CACHE_FOLDER}}
-          key: ${{env.EM_VERSION}}-${{ runner.os }}
-      - uses: mymindstorm/setup-emsdk@v6
-        with:
-          version: ${{env.EM_VERSION}}
-          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
-      - name: Build FFMpeg
-        shell: bash
-        run: |
-          export PATH=$PATH:$PWD/emsdk-cache/emsdk-master/upstream/bin
-          bash build.sh
-      - uses: actions/upload-artifact@master
-        with:
-          name: ffmpeg-core-macos
+          name: ffmpeg-core
           path: wasm/dist
+  # Disable macos build due to there is no ldconfig command
+  # during freetype2 build.
+  # macos-build:
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #         fetch-depth: 0
+  #         submodules: recursive
+  #     - name: Setup cache
+  #       id: cache-system-libraries
+  #       uses: actions/cache@v2
+  #       with:
+  #         path: ${{env.EM_CACHE_FOLDER}}
+  #         key: ${{env.EM_VERSION}}-${{ runner.os }}
+  #     - uses: mymindstorm/setup-emsdk@v6
+  #       with:
+  #         version: ${{env.EM_VERSION}}
+  #         actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
+  #     - name: Build FFMpeg
+  #       shell: bash
+  #       run: |
+  #         export PATH=$PATH:$PWD/emsdk-cache/emsdk-master/upstream/bin
+  #         bash build.sh
+  #     - uses: actions/upload-artifact@master
+  #       with:
+  #         name: ffmpeg-core-macos
+  #         path: wasm/dist
   # Not working with error messsage:
   #   C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\x86_64-w64-mingw32\bin\ar.exe: libavfilter/vsink_null: No such file or directory
   # windows-build:

.gitmodules

@@ -34,3 +34,9 @@
 [submodule "third_party/zlib"]
 	path = third_party/zlib
 	url = https://github.com/ffmpegwasm/zlib
+[submodule "third_party/freetype2"]
+	path = third_party/freetype2
+	url = https://github.com/ffmpegwasm/freetype2
+[submodule "third_party/opus"]
+	path = third_party/opus
+	url = https://github.com/ffmpegwasm/opus

README.md

@@ -77,3 +77,10 @@ $ npm test
 | fdk-aac | 2.0.1 | aac format |
 | ogg | 1.3.4 | required by vorbis |
 | vorbis | 1.3.6 | ogg format |
+| opus | 1.3.1 | opus format |
+
+#### Others
+
+| Library/Tool Name | Version | Remark |
+| ----------------- | ------- | ------ |
+| freetype2 | 2.10.4 | font file support |

build.sh

@@ -28,6 +28,10 @@ $SCRIPT_ROOT/build-ogg.sh
 $SCRIPT_ROOT/build-vorbis.sh
 # build theora
 $SCRIPT_ROOT/build-theora.sh
+# build opus
+$SCRIPT_ROOT/build-opus.sh
+# build freetype2
+$SCRIPT_ROOT/build-freetype2.sh
 # build aom (disabled as it is extremely slow)
 $SCRIPT_ROOT/build-aom.sh
 # configure FFmpeg with Emscripten

third_party/freetype2

@@ -9,7 +9,8 @@ FLAGS=(
   -I. -I./fftools -I$BUILD_DIR/include
   -Llibavcodec -Llibavdevice -Llibavfilter -Llibavformat -Llibavresample -Llibavutil -Llibpostproc -Llibswscale -Llibswresample -L$BUILD_DIR/lib
   -Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses -Qunused-arguments
-  -lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -lpostproc -lm -lx264 -lx265 -lvpx -lwavpack -lmp3lame -lfdk-aac -lvorbis -lvorbisenc -lvorbisfile -logg -ltheora -ltheoraenc -ltheoradec -lz -laom -pthread
+  -lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -lpostproc -lm -lx264 -lx265 -lvpx -lwavpack -lmp3lame -lfdk-aac -lvorbis -lvorbisenc -lvorbisfile -logg -ltheora -ltheoraenc -ltheoradec -lz -lfreetype -lopus -pthread
+  -laom
   fftools/ffmpeg_opt.c fftools/ffmpeg_filter.c fftools/ffmpeg_hw.c fftools/cmdutils.c fftools/ffmpeg.c
   -o wasm/dist/ffmpeg-core.js
   -s USE_SDL=2                                  # use SDL2

third_party/opus

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -euo pipefail
+source $(dirname $0)/var.sh
+
+LIB_PATH=third_party/freetype2
+CFLAGS="-s USE_PTHREADS=1 $OPTIM_FLAGS"
+CONF_FLAGS=(
+  --prefix=$BUILD_DIR                                 # install library in a build directory for FFmpeg to include
+  --host=i686-gnu                                     # use i686 linux
+  --enable-shared=no                                  # not to build shared library
+)
+echo "CONF_FLAGS=${CONF_FLAGS[@]}"
+(cd $LIB_PATH && \
+  emconfigure ./autogen.sh && \
+  CFLAGS=$CFLAGS emconfigure ./configure "${CONF_FLAGS[@]}")
+emmake make -C $LIB_PATH clean
+emmake make -C $LIB_PATH install -j

wasm/build-scripts/build-ffmpeg.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -euo pipefail
+source $(dirname $0)/var.sh
+
+LIB_PATH=third_party/opus
+CFLAGS="-s USE_PTHREADS=1 $OPTIM_FLAGS"
+CONF_FLAGS=(
+  --prefix=$BUILD_DIR                                 # install library in a build directory for FFmpeg to include
+  --host=i686-gnu                                     # use i686 linux
+  --enable-shared=no                                  # not to build shared library
+  --disable-asm                                       # not to use asm
+  --disable-rtcd                                      # not to detect cpu capabilities
+  --disable-doc                                       # not to build docs
+  --disable-extra-programs                            # not to build demo and tests
+  --disable-stack-protector
+)
+echo "CONF_FLAGS=${CONF_FLAGS[@]}"
+(cd $LIB_PATH && \
+  emconfigure ./autogen.sh && \
+  CFLAGS=$CFLAGS emconfigure ./configure "${CONF_FLAGS[@]}")
+emmake make -C $LIB_PATH clean
+emmake make -C $LIB_PATH install -j

wasm/build-scripts/build-freetype2.sh

@@ -16,6 +16,8 @@ FLAGS=(
   --enable-libfdk-aac     # enable libfdk-aac
   --enable-libtheora      # enable libtheora
   --enable-libvorbis      # enable libvorbis
+  --enable-libfreetype    # enable freetype
+  --enable-libopus        # enable opus
   --enable-libaom         # enable libaom
 )
 echo "FFMPEG_CONFIG_FLAGS=${FLAGS[@]}"