Me nochange

.github/workflows/build.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: sudo apt-get update -qq
       - run: sudo apt-get install -qq nasm g++-multilib gcc-multilib libc6-dev-i386 python3-pip python3-setuptools
       - run: sudo python3 -m pip install meson==0.52.1 ninja
@@ -25,10 +25,22 @@ jobs:
       - run: ./run_Test.sh BinaryCompare Adobe_PDF_sample_a_1024x768_50Frms.264
       - run: ./run_Test.sh BinaryCompare Zhling_1280x720.264
 
+  asan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: sudo apt-get update -qq
+      - run: sudo apt-get install -qq nasm
+      - run: nasm -v
+      - run: c++ --version
+      - run: make gtest-bootstrap
+      - run: LDFLAGS=-fsanitize=address CFLAGS=-fsanitize=address make -j$(nproc)
+      - run: ./codec_unittest
+
   windows:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: choco install nasm
       # nasm is not installed into the $PATH so add it manually
       - run: echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
@@ -56,19 +68,22 @@ jobs:
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-nasm
             mingw-w64-x86_64-meson
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: c++ --version
       - run: make gmp-bootstrap
       - run: make gtest-bootstrap
-      - run: CFLAGS=-Werror make -j$(nproc) all plugin test
-      - run: meson builddir --werror
+      # disable Werror on gcc 12 until #3533 is fixed.
+      #- run: CFLAGS=-Werror make -j$(nproc) all plugin test
+      - run: make -j$(nproc) all plugin test
+      #- run: meson builddir --werror
+      - run: meson builddir
       - run: ninja -C builddir -v
       - run: meson test -C builddir -v
 
   macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: brew install nasm meson
       - run: make gmp-bootstrap
       - run: make gtest-bootstrap
@@ -82,7 +97,7 @@ jobs:
   linux-cross-arm:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: sudo apt-get update -qq
       - run: sudo apt-get install -qq g++-arm-linux-gnueabihf g++-aarch64-linux-gnu qemu-user
       - run: arm-linux-gnueabihf-g++ --version
@@ -96,8 +111,30 @@ jobs:
   macos-cross-arm64:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: make gmp-bootstrap
       - run: make gtest-bootstrap
       - run: c++ --version
       - run: CFLAGS=-Werror make -j$(sysctl -n hw.ncpu) ARCH=arm64
+
+  fuzzing:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Build Fuzzers
+      id: build
+      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'openh264'
+        language: c++
+    - name: Run Fuzzers
+      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'openh264'
+        language: c++
+        fuzz-seconds: 600
+    - name: Upload Crash
+      uses: actions/upload-artifact@v1
+      if: failure() && steps.build.outcome == 'success'
+      with:
+        name: artifacts
+        path: ./out/artifacts

.gitignore

@@ -57,3 +57,9 @@ codec/build/iOS/dec/welsdec/build/
 # editor files
 *~
 
+# android gradle integration – regenerated when the project is opened in Android Studio
+/.idea/
+/.gradle/
+/gradle/
+/gradlew.bat
+/local.properties

Makefile

@@ -29,15 +29,17 @@ LIBDIR_NAME=lib
 SHAREDLIB_DIR=$(PREFIX)/lib
 PROJECT_NAME=openh264
 MODULE_NAME=gmpopenh264
-GMP_API_BRANCH=Firefox39
+GMP_API_BRANCH=Firefox114_2
 GTEST_VER=release-1.8.1
 CCASFLAGS=$(CFLAGS)
 STATIC_LDFLAGS=-lstdc++
 STRIP ?= strip
 USE_STACK_PROTECTOR = Yes
+USE_LOW_VERSION_NDK=No
+USE_ANT=No
 
-SHAREDLIB_MAJORVERSION=6
-FULL_VERSION := 2.3.0
+SHAREDLIB_MAJORVERSION=7
+FULL_VERSION := 2.4.1
 
 ifeq (,$(wildcard $(SRC_PATH)gmp-api))
 HAVE_GMP_API=No
@@ -80,7 +82,17 @@ endif
 # Make sure the all target is the first one
 all: libraries binaries
 
+ifeq (android, $(OS))
+USE_LOW_VERSION_NDK = $(shell $(SRC_PATH)build/ndk-version-check.sh $(NDKROOT))
+ifeq (Yes, $(USE_LOW_VERSION_NDK))
+USE_ANT = Yes
+include $(SRC_PATH)build/platform-android-r18b.mk
+else
+include $(SRC_PATH)build/platform-android.mk
+endif
+else
 include $(SRC_PATH)build/platform-$(OS).mk
+endif
 
 MODULE := $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX)
 
@@ -364,11 +376,22 @@ endif
 ifeq (android,$(OS))
 ifeq (./,$(SRC_PATH))
 codec_unittest$(EXEEXT):
+ifeq ($(USE_ANT), Yes)
 	cd ./test/build/android && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && android update project -t $(TARGET) -p . && ant debug
+else
+	$(NDK_BUILD) -C test/build/android -B
+	./gradlew unittest:assembleDebug
+endif
 
 clean_Android: clean_Android_ut
 clean_Android_ut:
+ifeq ($(USE_ANT), Yes)
 	-cd ./test/build/android && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean
+else
+	-$(NDK_BUILD) -C test/build/android -B clean
+	-./gradlew unittest:clean
+endif
+
 endif
 endif
 

README.md

@@ -159,7 +159,7 @@ See <http://mesonbuild.com/Installing.html> for instructions on how to
 install meson, then:
 
 ``` shell
-meson builddir
+meson setup builddir
 ninja -C builddir
 ```
 

RELEASES

@@ -1,6 +1,23 @@
 
 Releases
 -----------
+v2.4.1
+------
+- Fix off by one regression in decoder
+- Add security policy
+- Fix glitches that sometimes happen near the scene changes
+
+v2.4.0
+------
+- Add LoongArch SIMD
+- Support Android NDK r20 (also r21)
+- Support using gradle to build Android demo and unittest
+- Bug fixes
+
+v2.3.1
+------
+- update SHAREDLIB_MAJORVERSION value in Makefile
+
 v2.3.0
 ------
 - Decoder bug fix to correct the B-frame order in some case
@@ -231,8 +248,8 @@ http://ciscobinary.openh264.org/libopenh264-2.3.0-linux32.6.so.bz2
 http://ciscobinary.openh264.org/libopenh264-2.3.0-linux64.6.so.bz2
 http://ciscobinary.openh264.org/libopenh264-2.3.0-linux-arm.6.so.bz2
 http://ciscobinary.openh264.org/libopenh264-2.3.0-linux-arm64.6.so.bz2
-http://ciscobinary.openh264.org/libopenh264-2.3.0-osx-arm64.6.dylib.bz2
-http://ciscobinary.openh264.org/libopenh264-2.3.0-osx-x64.6.dylib.bz2
+http://ciscobinary.openh264.org/libopenh264-2.3.0-mac-arm64.6.dylib.bz2
+http://ciscobinary.openh264.org/libopenh264-2.3.0-mac-x64.6.dylib.bz2
 http://ciscobinary.openh264.org/openh264-2.3.0-win32.dll.bz2
 http://ciscobinary.openh264.org/openh264-2.3.0-win64.dll.bz2
 

SECURITY.md

@@ -0,0 +1,16 @@
+# Security Policy
+
+If you have discovered a security vulnerability in this project, please report it
+privately. **Do not disclose it as a public issue.** This gives us time to work with you
+to fix the issue before public exposure, reducing the chance that the exploit will be
+used before a patch is released.
+
+You may submit the report as an email to [email protected].
+
+Please provide the following information in your report:
+
+- A description of the vulnerability and its impact
+- How to reproduce the issue
+
+This project is maintained on a reasonable-effort basis. As such, please give us 90 days to
+work on a fix before public exposure.

build.gradle

@@ -0,0 +1,30 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.3'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+apply plugin: 'idea'
+
+idea.module {
+    excludeDirs -= file("build")
+    excludeDirs += file(".idea")
+    excludeDirs += file("gradle")
+    sourceDirs += file("build")
+    sourceDirs += file("codec")
+    testSourceDirs += file("test")
+    testSourceDirs += file("autotest")
+    resourceDirs += file("res")
+    resourceDirs += file("docs")
+}

build/ndk-version-check.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+#**********************************************************************************
+#    This script is using in Makefile to check the ndk version:
+#
+#   --usage:
+#             ./ndk-version-check.sh ndkroot
+#
+# date:  10/20/2023 Created
+#**********************************************************************************
+
+NDK_PATH=$1
+if [ ! -n "$NDK_PATH" ]
+then
+    exit 1
+fi
+NDK_VERSION=${NDK_PATH##*/}
+NDK_VERSION_NUM=`echo $NDK_VERSION | tr -cd "[0-9]"`
+
+if [ $NDK_VERSION_NUM -le 18 ]
+then
+    echo "Yes"
+fi