Feat: Render recording

.github/workflows/android.yml

@@ -30,10 +30,10 @@ jobs:
         run: |
           pip install meson --break-system-packages
 
-      - name: Setup ninja
+      - name: Setup dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build jq -y --no-install-recommends
+          sudo apt-get install ninja-build jq nasm -y --no-install-recommends
 
       - name: Setup JDK
         uses: actions/setup-java@v4
@@ -50,6 +50,7 @@ jobs:
 
       - name: Build native libraries
         run: |
+          export ANDROID_SDK_HOME="$HOME/.android/sdk"
           bash ./platforms/build-android.sh ${{ matrix.config.arch }} complete_rebuild release
           cp -r ./assets/ platforms/android/app/src/main
 

.github/workflows/lint.yml

@@ -32,9 +32,9 @@ jobs:
       - name: Prepare compile_commands.json
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* desktop-file-utils -y --no-install-recommends
+          sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* desktop-file-utils libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libswscale-dev -y --no-install-recommends
 
-          meson setup build -Dbuildtype=release -Dclang_libcpp=disabled -Dtests=true
+          meson setup build -Dbuildtype=release -Dclang_libcpp=disabled -Dtests=true -Duse_embedded_ffmpeg=enabled
           meson compile -C build git_version.hpp
 
       - uses: cpp-linter/cpp-linter-action@v2
@@ -52,7 +52,7 @@ jobs:
           tidy-checks: ''
           step-summary: true
           file-annotations: true
-          ignore: subprojects|build|android|assets|recordings|docs|toolchains|platforms|wrapper|src/libs/core/hash-library|tests|src/helper/web_utils.*|src/lobby/web_client.*|src/lobby/curl_client.*
+          ignore: subprojects|build|android|assets|recordings|docs|toolchains|platforms|wrapper|src/libs/core/hash-library|tests|src/graphics/video_renderer_windows.*|src/helper/web_utils.*|src/lobby/web_client.*|src/lobby/curl_client.*
 
       - name: Fail CI run if linter checks failed
         if: steps.linter.outputs.checks-failed != 0

meson.options

@@ -25,3 +25,10 @@ option(
     value: false,
     description: 'if you only want to build the libs, enable this',
 )
+
+option(
+    'use_embedded_ffmpeg',
+    type: 'feature',
+    value: 'auto',
+    description: 'embed ffmpeg to render recording videos',
+)

platforms/android/app/jni/Android.mk

@@ -68,6 +68,42 @@ LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libkeyutils.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libavutil
+LOCAL_SRC_FILES := $(shell meson introspect --dependencies "${BUILD_PATH}" | jq  -r ".[] | select(.name==\"libavutil\") | .link_args | .[]")
+include $(PREBUILT_SHARED_LIBRARY)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libavcodec
+LOCAL_SRC_FILES := $(shell meson introspect --dependencies "${BUILD_PATH}" | jq  -r ".[] | select(.name==\"libavcodec\") | .link_args | .[]")
+include $(PREBUILT_SHARED_LIBRARY)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libavformat
+LOCAL_SRC_FILES := $(shell meson introspect --dependencies "${BUILD_PATH}" | jq  -r ".[] | select(.name==\"libavformat\") | .link_args | .[]")
+include $(PREBUILT_SHARED_LIBRARY)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libavfilter
+LOCAL_SRC_FILES := $(shell meson introspect --dependencies "${BUILD_PATH}" | jq  -r ".[] | select(.name==\"libavfilter\") | .link_args | .[]")
+include $(PREBUILT_SHARED_LIBRARY)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libswscale
+LOCAL_SRC_FILES := $(shell meson introspect --dependencies "${BUILD_PATH}" | jq  -r ".[] | select(.name==\"libswscale\") | .link_args | .[]")
+include $(PREBUILT_SHARED_LIBRARY)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libswresample
+LOCAL_SRC_FILES := $(shell meson introspect --dependencies "${BUILD_PATH}" | jq  -r ".[] | select(.name==\"libswresample\") | .link_args | .[]")
+include $(PREBUILT_SHARED_LIBRARY)
+
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := oopetris_core
 LIB_PATH := $(BUILD_PATH)/src/libs/core
@@ -99,7 +135,7 @@ include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := main
-LOCAL_SHARED_LIBRARIES := SDL2 sdl2_ttf freetype png16 sdl2_mixer vorbis vorbisfile ogg sdl2_image fmt keyutils oopetris_core oopetris_recordings oopetris_graphics oopetris
+LOCAL_SHARED_LIBRARIES := SDL2 sdl2_ttf freetype png16 sdl2_mixer vorbis vorbisfile ogg sdl2_image fmt keyutils oopetris_core oopetris_recordings oopetris_graphics oopetris libavutil libavcodec libavformat libavfilter libswscale libswresample
 LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
 LOCAL_LDFLAGS := -Wl,--no-undefined
 include $(BUILD_SHARED_LIBRARY)

platforms/build-android.sh

@@ -114,8 +114,9 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
     export BIN_DIR="$HOST_ROOT/bin"
     export PATH="$BIN_DIR:$PATH"
 
-    LIB_PATH="${SYS_ROOT}/usr/lib/$ARM_TRIPLE:${SYS_ROOT}/usr/lib/$ARM_TRIPLE/${SDK_VERSION}"
-    INC_PATH="${SYS_ROOT}/usr/include"
+    export LIB_PATH="${SYS_ROOT}/usr/lib/$ARM_TRIPLE:${SYS_ROOT}/usr/lib/$ARM_TRIPLE/${SDK_VERSION}"
+    export INC_PATH="${SYS_ROOT}/usr/include"
+    export PKG_CONFIG_PATH="${SYS_ROOT}/usr/lib/pkgconfig/"
 
     export LIBRARY_PATH="$SYS_ROOT/usr/lib/$ARM_NAME_TRIPLE/$SDK_VERSION"
 
@@ -146,6 +147,16 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
 
         find "$HOST_ROOT/sysroot/usr/lib/$ARM_NAME_TRIPLE/$SDK_VERSION/" -maxdepth 1 -name "*.o" -exec ln -s "{}" "${SYS_ROOT:?}/usr/lib/" \;
 
+        # TODO: remove this temporary fix:
+        # see: https://github.com/android/ndk/issues/2107
+        if [ "$ARCH_VERSION" = "armv7a" ]; then
+            sed -i -e 's/asm(/__asm__(/g' "$HOST_ROOT/sysroot/usr/include/arm-linux-androideabi/asm/swab.h"
+        elif [ "$ARCH_VERSION" = "i686" ]; then
+            sed -i -e 's/asm(/__asm__(/g' "$HOST_ROOT/sysroot/usr/include/i686-linux-android/asm/swab.h"
+        elif [ "$ARCH_VERSION" = "x86_64" ]; then
+            sed -i -e 's/asm(/__asm__(/g' "$HOST_ROOT/sysroot/usr/include/x86_64-linux-android/asm/swab.h"
+        fi
+
         cd "$LAST_DIR"
 
     fi
@@ -270,7 +281,6 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
             -DBUILD_SHARED_LIBS=OFF \
             -DINSTALL_PKGCONFIG_MODULES=ON
 
-
         cmake --build .
 
         cmake --install .
@@ -344,6 +354,52 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
 
     cd "$LAST_DIR"
 
+    ## build ffmpeg for android (using https://github.com/Javernaut/ffmpeg-android-maker)
+
+    LAST_DIR="$PWD"
+
+    cd "$SYS_ROOT"
+
+    BUILD_DIR_FFMPEG="build-ffmpeg"
+
+    BUILD_FFMPEG_FILE="$SYS_ROOT/$BUILD_DIR_FFMPEG/build_successfull.meta"
+
+    if [ "$COMPILE_TYPE" == "complete_rebuild" ] || ! [ -e "$BUILD_FFMPEG_FILE" ]; then
+
+        mkdir -p "$BUILD_DIR_FFMPEG"
+
+        cd "$BUILD_DIR_FFMPEG"
+
+        FFMPEG_MAKER_DIR="maker"
+
+        if ! [ -e "$FFMPEG_MAKER_DIR" ]; then
+
+            git clone https://github.com/Javernaut/ffmpeg-android-maker.git "$FFMPEG_MAKER_DIR"
+
+            cd "$FFMPEG_MAKER_DIR"
+        else
+            cd "$FFMPEG_MAKER_DIR"
+
+            git pull
+
+        fi
+
+        ./ffmpeg-android-maker.sh "--target-abis=$ARCH" "--android-api-level=$SDK_VERSION" --enable-libx264
+
+        FFMPEG_MAKER_OUTPUT_DIR="output"
+
+        find "$FFMPEG_MAKER_OUTPUT_DIR/include/" -maxdepth 3 -mindepth 2 -type d -exec cp -r {} "$SYS_ROOT/usr/include/" \;
+
+        find "$FFMPEG_MAKER_OUTPUT_DIR/lib/" -type f -exec cp -r {} "$SYS_ROOT/usr/lib/" \;
+
+        find "build/" -maxdepth 5 -mindepth 4 -type f -name "*.pc" -exec cp -r {} "$SYS_ROOT/usr/lib/pkgconfig/" \;
+
+        touch "$BUILD_FFMPEG_FILE"
+
+    fi
+
+    cd "$LAST_DIR"
+
     ## END of manual build of dependencies
 
     MESON_CPU_FAMILY=$ARCH
@@ -393,7 +449,7 @@ prefix = '$SYS_ROOT'
 libdir = '$LIB_PATH'
 
 [properties]
-pkg_config_libdir = '$SYS_ROOT/usr/lib/pkgconfig'
+pkg_config_libdir = '$PKG_CONFIG_PATH'
 sys_root = '${SYS_ROOT}'
 
 EOF
@@ -436,7 +492,8 @@ EOF
             --cross-file "./platforms/crossbuild-android-$ARM_TARGET_ARCH.ini" \
             "-Dbuildtype=$BUILDTYPE" \
             -Dsdl2:use_hidapi=enabled \
-            -Dclang_libcpp=disabled
+            -Dclang_libcpp=disabled \
+            -Duse_embedded_ffmpeg=enabled
 
     fi
 

platforms/build-switch.sh

@@ -157,7 +157,8 @@ if [ "$COMPILE_TYPE" == "complete_rebuild" ] || [ ! -e "$BUILD_DIR" ]; then
         -Dcurl:unittests=disabled \
         -Dcurl:bearer-auth=enabled \
         -Dcurl:brotli=enabled \
-        -Dcurl:libz=enabled
+        -Dcurl:libz=enabled \
+        -Duse_embedded_ffmpeg=enabled
 
 fi