Support pthread

Author: Jerome Wu

build-js.sh

@@ -6,6 +6,14 @@ NPROC=$(grep -c ^processor /proc/cpuinfo)
 ROOT_DIR=$PWD
 BUILD_DIR=$ROOT_DIR/build
 EM_TOOLCHAIN_FILE=/emsdk_portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
+PTHREAD_FLAGS='-s USE_PTHREADS=1'
+export CFLAGS=$PTHREAD_FLAGS
+export CPPFLAGS=$PTHREAD_FLAGS
+export LDFLAGS=$PTHREAD_FLAGS
+
+clean_up() {
+  rm -rf $BUILD_DIR
+}
 
 build_zlib() {
   cd third_party/zlib
@@ -27,33 +35,17 @@ build_x264() {
     --enable-static \
     --disable-cli \
     --disable-asm \
-    --disable-thread \
     --host=i686-linux \
     --prefix=$BUILD_DIR
   emmake make clean
   emmake make install-lib-static -j${NPROC}
   cd ${ROOT_DIR}
 }
 
-build_libwebp() {
-  cd third_party/libwebp
-  rm -rf build
-  mkdir build
-  cd build
-  emmake cmake .. \
-    -DCMAKE_INSTALL_PREFIX=${BUILD_DIR} \
-    -DCMAKE_TOOLCHAIN_FILE=${EM_TOOLCHAIN_FILE} \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DWEBP_BUILD_WEBP_JS=ON
-  emmake make clean
-  emmake make install -j${NPROC}
-  cd ${ROOT_DIR}
-}
-
 build_libvpx() {
   cd third_party/libvpx
-  export AS=emar
-  export STRIP=llvm-strip
+  AS=emar \
+  STRIP=llvm-strip \
   emconfigure ./configure \
     --disable-examples \
     --disable-tools \
@@ -70,6 +62,7 @@ build_libmp3lame() {
   cd third_party/libmp3lame
   emconfigure ./configure \
     --enable-shared=no \
+    --host=i686-linux \
     --prefix=${BUILD_DIR}
   emmake make clean
   emmake make install -j${NPROC}
@@ -83,7 +76,7 @@ configure_ffmpeg() {
     --enable-libx264 \
     --enable-libvpx \
     --enable-libmp3lame \
-    --disable-pthreads \
+    --enable-cross-compile \
     --disable-x86asm \
     --disable-inline-asm \
     --disable-doc \
@@ -119,19 +112,21 @@ build_ffmpegjs() {
     -o $2 fftools/ffmpeg_opt.c fftools/ffmpeg_filter.c fftools/ffmpeg_hw.c fftools/cmdutils.c fftools/ffmpeg.c \
     -lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -lpostproc -lm -lx264 -lz -lvpx -lmp3lame \
     -Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses \
-    --closure 1 \
     --pre-js javascript/prepend.js \
     --post-js javascript/post.js \
     -s USE_SDL=2 \
-    -s MODULARIZE=1 \
+    $PTHREAD_FLAGS \
+    -s INVOKE_RUN=0 \
+    -s PTHREAD_POOL_SIZE=8 \
+    -s PROXY_TO_PTHREAD=1 \
     -s SINGLE_FILE=$1 \
-    -s EXPORTED_FUNCTIONS="[_ffmpeg]" \
+    -s EXPORTED_FUNCTIONS="[_main, _proxy_main]" \
     -s EXTRA_EXPORTED_RUNTIME_METHODS="[cwrap, FS, getValue, setValue]" \
-    -s TOTAL_MEMORY=33554432 \
-    -s ALLOW_MEMORY_GROWTH=1
+    -s TOTAL_MEMORY=1065353216
 }
 
 main() {
+  clean_up
   build_zlib
   build_x264
   build_libvpx
@@ -143,3 +138,19 @@ main() {
 }
 
 main "$@"
+
+#build_libwebp() {
+#  cd third_party/libwebp
+#  rm -rf build
+#  mkdir build
+#  cd build
+#  emmake cmake .. \
+#    -DCMAKE_INSTALL_PREFIX=${BUILD_DIR} \
+#    -DCMAKE_TOOLCHAIN_FILE=${EM_TOOLCHAIN_FILE} \
+#    -DBUILD_SHARED_LIBS=OFF \
+#    -DWEBP_BUILD_WEBP_JS=ON
+#  emmake make clean
+#  emmake make install -j${NPROC}
+#  cd ${ROOT_DIR}
+#}
+

fftools/cmdutils.c

@@ -138,7 +138,13 @@ void exit_program(int ret)
     if (program_exit)
         program_exit(ret);
 
-    // exit(ret);
+    /*
+     * This is a work around to detect the end of the ffmpeg command
+     * Not ideal, but it works.
+     */
+    printf("FFMPEG_END\n");
+
+    exit(ret);
 }
 
 double parse_number_or_die(const char *context, const char *numstr, int type,

fftools/ffmpeg.c

@@ -4853,7 +4853,7 @@ static void init_variables() {
   ffmpeg_exited     = 0;
 }
 
-int ffmpeg(int argc, char **argv)
+int main(int argc, char **argv)
 {
     int i, ret;
     BenchmarkTimeStamps ti;

javascript/prepend.js

@@ -1,8 +1,8 @@
 var logger = function(){}
 
 Module['setLogger'] = function(_logger) { logger = _logger; };
-Module['print'] = function(message) { logger(message, 'stdout'); };
-Module['printErr'] = function(message) { logger(message, 'stderr'); };
+Module['print'] = function(message) { logger({ message, type: 'ffmpeg-stdout' }); };
+Module['printErr'] = function(message) { logger({ message, type: 'ffmpeg-stderr' }); };
 /*
 Module['preRun'] = [
   function() {