Fix vp9 decoding on CPUs without i8mm

Author: vkryl

app/jni/gif.cpp

@@ -98,6 +98,7 @@ struct VideoInfo {
       avcodec_close(video_dec_ctx);
 #endif
       avcodec_free_context(&video_dec_ctx);
+      video_dec_ctx = nullptr;
     }
     if (fmt_ctx) {
       avformat_close_input(&fmt_ctx);

scripts/private/build-vpx-impl.sh

@@ -32,6 +32,7 @@ pushd "$THIRDPARTY_LIBRARIES/libvpx"
 # the function itself
 
 configure_abi() {
+  CPUFEATURES_DIR="$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION/sources/android/cpufeatures"
   CFLAGS_="-DANDROID -fpic -fpie"
   LDFLAGS_=""
   case ${FLAVOR} in
@@ -50,30 +51,29 @@ configure_abi() {
       ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION_PRIMARY
       TARGET="arm64-android-gcc"
       NDK_ABIARCH="aarch64-linux-android"
-      CFLAGS="${CFLAGS_} -O3 -march=armv8-a"
+      CFLAGS="${CFLAGS_} -O3 -march=armv8-a -I${CPUFEATURES_DIR}"
       LDFLAGS="${LDFLAGS_}"
       ASFLAGS=""
       CPU=arm64-v8a
-    ;;
-    x86_64)
-      ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION_PRIMARY
-      TARGET="x86_64-android-gcc"
-      NDK_ABIARCH="x86_64-linux-android"
-      CFLAGS="${CFLAGS_} -O3 -march=x86-64 -msse4.2 -mpopcnt -m64 -fPIC"
-      LDFLAGS=""
-      ASFLAGS="-D__ANDROID__"
-      CPU=x86_64
     ;;
 	  armeabi-v7a)
       ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION_LEGACY
       TARGET="armv7-android-gcc --enable-neon --disable-neon-asm"
       NDK_ABIARCH="armv7a-linux-androideabi"
-      CPUFEATURES_DIR="$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION/sources/android/cpufeatures"
       CFLAGS="${CFLAGS_} -Os -march=armv7-a -marm -mfloat-abi=softfp -mfpu=neon -mthumb -D__thumb__ -I${CPUFEATURES_DIR}"
       LDFLAGS="${LDFLAGS_}"
       ASFLAGS=""
       CPU=armv7-a
     ;;
+    x86_64)
+      ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION_PRIMARY
+      TARGET="x86_64-android-gcc"
+      NDK_ABIARCH="x86_64-linux-android"
+      CFLAGS="${CFLAGS_} -O3 -march=x86-64 -msse4.2 -mpopcnt -m64 -fPIC"
+      LDFLAGS=""
+      ASFLAGS="-D__ANDROID__"
+      CPU=x86_64
+    ;;
     x86)
       ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION_LEGACY
       TARGET="x86-android-gcc"
@@ -134,9 +134,10 @@ configure_make() {
 
   make clean || echo -e "[info] running configure for the first time"
 
-  CPU_DETECT="--disable-runtime-cpu-detect"
-  if [[ $1 =~ x86.* || $1 =~ arm64-v8a ]]; then
+  if [[ $ABI == "arm64-v8a" || $ABI == "armeabi-v7a" ]]; then
     CPU_DETECT="--enable-runtime-cpu-detect"
+  else
+    CPU_DETECT="--disable-runtime-cpu-detect"
   fi
 
   ./configure \
@@ -164,7 +165,7 @@ configure_make() {
   make -j"$CPU_COUNT" install
 }
 
-for ABI in armeabi-v7a arm64-v8a x86 x86_64 ; do
+for ABI in arm64-v8a armeabi-v7a x86_64 x86 ; do
   for FLAVOR in latest lollipop legacy ; do
     if [[ "$FLAVOR" != "legacy" || $ABI == "armeabi-v7a" || $ABI == "x86" ]]; then
       echo -e "${STYLE_INFO}- libvpx build start: ${ABI} ${FLAVOR}${STYLE_END}"

version.properties

@@ -4,7 +4,7 @@ version.major=0
 # Anchor date point in app versioning
 version.creation=873642600564
 # Native bundle (/app/jni)
-version.jni=237.0.0
+version.jni=238.0.0
 # LevelDB (/vkryl/leveldb)
 version.leveldb=6.0.0
 # Emoji (/app/src/main/assets/emoji)