cisco · alexcohn · Jun 27, 2019 · Mar 4, 2020 · Mar 4, 2020 · Mar 22, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "cpu_features"]
+	path = cpu_features
+	url = https://github.com/google/cpu_features.git
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ CCASFLAGS=$(CFLAGS)
 STATIC_LDFLAGS=-lstdc++
 STRIP ?= strip
 
-SHAREDLIB_MAJORVERSION=5
+SHAREDLIB_MAJORVERSION=6
 FULL_VERSION := 2.1.0
 
 ifeq (,$(wildcard $(SRC_PATH)gmp-api))
@@ -374,7 +374,7 @@ endif
 endif
 endif
 
--include $(OBJS:.$(OBJ)=.d)
+-include $(filter %.d, $(OBJS:.$(OBJ)=.d))
 
 OBJDIRS = $(sort $(dir $(OBJS)))
 

diff --git a/README.md b/README.md
@@ -58,23 +58,21 @@ To build the arm assembly for Windows Phone, gas-preprocessor is required. It ca
 
 For Android Builds
 ------------------
-To build for android platform, You need to install android sdk and ndk. You also need to export `**ANDROID_SDK**/tools` to PATH. On Linux, this can be done by
+To build for android platform, You need to install android sdk and ndk.
 
-    export PATH=**ANDROID_SDK**/tools:$PATH
+The codec demo apps can be built by
 
-The codec and demo can be built by
+    make OS=android ANDROID_HOME=**ANDROID_SDK** NDKROOT=**ANDROID_NDK** TARGET=**ANDROID_TARGET**
 
-    make OS=android NDKROOT=**ANDROID_NDK** TARGET=**ANDROID_TARGET**
-
-Valid `**ANDROID_TARGET**` can be found in `**ANDROID_SDK**/platforms`, such as `android-12`.
+Valid `**ANDROID_TARGET**` can be found in `**ANDROID_SDK**/platforms`, such as `android-21`.
 You can also set `ARCH`, `NDKLEVEL` according to your device and NDK version.
-`ARCH` specifies the architecture of android device. Currently `arm`, `arm64`, `x86` and `x86_64` are supported, the default is `arm`. (`mips` and `mips64` can also be used, but there's no specific optimization for those architectures.)
-`NDKLEVEL` specifies android api level, the default is 12. Available possibilities can be found in `**ANDROID_NDK**/platforms`, such as `android-21` (strip away the `android-` prefix).
+`ARCH` specifies the architecture of android device. Currently `arm`, `arm64`, `x86` and `x86_64` are supported, the default is `arm`. (`mips` and `mips64` can also be used,  but there's no specific optimization for those architectures.)
 
 By default these commands build for the `armeabi-v7a` ABI. To build for the other android
 ABIs, add `ARCH=arm64`, `ARCH=x86`, `ARCH=x86_64`, `ARCH=mips` or `ARCH=mips64`.
 To build for the older `armeabi` ABI (which has armv5te as baseline), add `APP_ABI=armeabi` (`ARCH=arm` is implicit).
 To build for 64-bit ABI, such as `arm64`, explicitly set `NDKLEVEL` to 21 or higher.
+To build fir 32 or 64-bit `mips`, you need NDK r16 or earlier.
 
 For iOS Builds
 --------------

diff --git a/build/platform-android.mk b/build/platform-android.mk
@@ -120,12 +120,15 @@ clean_Android:
 endif
 
 COMMON_INCLUDES += -I$(NDKROOT)/sources/android/cpufeatures
-COMMON_OBJS += $(COMMON_SRCDIR)/src/cpu-features.$(OBJ)
+COMMON_OBJS += ./libndk_compat.so
 
-COMMON_CFLAGS += \
-	-Dandroid_getCpuIdArm=wels_getCpuIdArm -Dandroid_setCpuArm=wels_setCpuArm \
-	-Dandroid_getCpuCount=wels_getCpuCount -Dandroid_getCpuFamily=wels_getCpuFamily \
-	-Dandroid_getCpuFeatures=wels_getCpuFeatures -Dandroid_setCpu=wels_setCpu \
+.PHONY: ./libndk_compat.so
+./libndk_compat.so: ./cpu_features/android-$(APP_ABI)/ndk_compat/libndk_compat.so
+	cp $< $@
 
-codec/common/src/cpu-features.$(OBJ): $(NDKROOT)/sources/android/cpufeatures/cpu-features.c
-	$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c $(CXX_O) $<
+./cpu_features/android-$(APP_ABI)/ndk_compat/libndk_compat.so:
+	cmake -B./cpu_features/android-$(APP_ABI) -H./cpu_features -DANDROID_ABI=$(APP_ABI) -DANDROID_PLATFORM=$(TARGET) -DCMAKE_TOOLCHAIN_FILE=$(NDKROOT)/build/cmake/android.toolchain.cmake -DBUILD_SHARED_LIBS=ON
+	$(MAKE) -C ./cpu_features/android-$(APP_ABI)/ndk_compat ndk_compat
+
+clean_Android:
+	-$(MAKE) -C ./cpu_features/android-$(APP_ABI)/ndk_compat clean
diff --git a/codec/build/android/dec/.gitignore b/codec/build/android/dec/.gitignore
@@ -1 +1,2 @@
-build
+/build/
+/gen/
diff --git a/codec/build/android/dec/jni/Android.mk b/codec/build/android/dec/jni/Android.mk
@@ -1,9 +1,5 @@
-
 LOCAL_PATH := $(call my-dir)
-MY_LOCAL_PATH := $(LOCAL_PATH)
 
 # Step3
 #Generate the libwelsdecdemo.so file
 include $(LOCAL_PATH)/welsdecdemo.mk
-LOCAL_PATH := $(MY_LOCAL_PATH)
-
diff --git a/codec/build/android/dec/jni/welsdecdemo.mk b/codec/build/android/dec/jni/welsdecdemo.mk
@@ -1,15 +1,6 @@
 # Generate the libwelsdecdemo.so file
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE    := wels
-LOCAL_SRC_FILES := ../../../../../libopenh264.so
-ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_SRC_FILES)))
-include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-
-
 include $(CLEAR_VARS)
 
 #
@@ -20,9 +11,9 @@ LOCAL_MODULE := welsdecdemo
 #
 # Source Files
 #
-CODEC_PATH := ../../../../
-CONSOLE_DEC_PATH := ../../../../console/dec
-CONSOLE_COMMON_PATH := ../../../../console/common
+CODEC_PATH := ../../../..
+CONSOLE_DEC_PATH := $(CODEC_PATH)/console/dec
+CONSOLE_COMMON_PATH := $(CODEC_PATH)/console/common
 LOCAL_SRC_FILES := \
             $(CONSOLE_DEC_PATH)/src/h264dec.cpp \
             $(CONSOLE_COMMON_PATH)/src/read_config.cpp \
@@ -32,16 +23,12 @@ LOCAL_SRC_FILES := \
 # Header Includes
 #
 LOCAL_C_INCLUDES := \
-            $(LOCAL_PATH)/../../../../api/svc \
-            $(LOCAL_PATH)/../../../../console/dec/inc \
-            $(LOCAL_PATH)/../../../../console/common/inc \
-            $(LOCAL_PATH)/../../../../common/inc
-#
-# Compile Flags and Link Libraries
-#
-LOCAL_CFLAGS := -DANDROID_NDK
+            $(LOCAL_PATH)/$(CONSOLE_DEC_PATH)/inc \
+            $(LOCAL_PATH)/$(CONSOLE_COMMON_PATH)/inc
 
 LOCAL_LDLIBS := -llog
 LOCAL_SHARED_LIBRARIES := wels
 
 include $(BUILD_SHARED_LIBRARY)
+
+include $(LOCAL_PATH)/../../wels.mk
diff --git a/codec/build/android/enc/.gitignore b/codec/build/android/enc/.gitignore
@@ -1 +1,2 @@
-build
+/build/
+/gen/
diff --git a/codec/build/android/enc/jni/Android.mk b/codec/build/android/enc/jni/Android.mk
@@ -1,9 +1,5 @@
-
 LOCAL_PATH := $(call my-dir)
-MY_LOCAL_PATH := $(LOCAL_PATH)
 
 # Step3
-#Generate the libwelsdecdemo.so file
+#Generate the libwelsencdemo.so file
 include $(LOCAL_PATH)/welsencdemo.mk
-LOCAL_PATH := $(MY_LOCAL_PATH)
-
diff --git a/codec/build/android/enc/jni/welsencdemo.mk b/codec/build/android/enc/jni/welsencdemo.mk
@@ -1,15 +1,6 @@
 # Generate the libwelsencdemo.so file
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE    := wels
-LOCAL_SRC_FILES := ../../../../../libopenh264.so
-ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_SRC_FILES)))
-include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-
-
 include $(CLEAR_VARS)
 
 #
@@ -20,9 +11,9 @@ LOCAL_MODULE := welsencdemo
 #
 # Source Files
 #
-CODEC_PATH := ../../../../
-CONSOLE_ENC_PATH := ../../../../console/enc
-CONSOLE_COMMON_PATH := ../../../../console/common
+CODEC_PATH := ../../../..
+CONSOLE_ENC_PATH := $(CODEC_PATH)/console/enc
+CONSOLE_COMMON_PATH := $(CODEC_PATH)/console/common
 LOCAL_SRC_FILES := \
             $(CONSOLE_ENC_PATH)/src/welsenc.cpp \
             $(CONSOLE_COMMON_PATH)/src/read_config.cpp \
@@ -32,20 +23,14 @@ LOCAL_SRC_FILES := \
 # Header Includes
 #
 LOCAL_C_INCLUDES := \
-            $(LOCAL_PATH)/../../../../api/svc \
-            $(LOCAL_PATH)/../../../../console/enc/inc \
-            $(LOCAL_PATH)/../../../../console/common/inc \
-            $(LOCAL_PATH)/../../../../encoder/core/inc \
-            $(LOCAL_PATH)/../../../../processing/interface \
-            $(LOCAL_PATH)/../../../../common/inc
-
-
-#
-# Compile Flags and Link Libraries
-#
-LOCAL_CFLAGS := -DANDROID_NDK
+            $(LOCAL_PATH)/$(CONSOLE_ENC_PATH)/inc \
+            $(LOCAL_PATH)/$(CODEC_PATH)/console/common/inc \
+            $(LOCAL_PATH)/$(CODEC_PATH)/encoder/core/inc \
+            $(LOCAL_PATH)/$(CODEC_PATH)/processing/interface \
 
 LOCAL_LDLIBS := -llog
 LOCAL_SHARED_LIBRARIES := wels
 
 include $(BUILD_SHARED_LIBRARY)
+
+include $(LOCAL_PATH)/../../wels.mk
diff --git a/codec/build/android/wels.mk b/codec/build/android/wels.mk
@@ -0,0 +1,22 @@
+# a common .mk that includes libopenh264.so in Android project
+LOCAL_PATH := $(call my-dir)/../../..
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := wels
+LOCAL_SRC_FILES := libopenh264.so
+LOCAL_EXPORT_SHARED_LIBRARIES := cpu-features
+LOCAL_EXPORT_CFLAGS := -DANDROID_NDK
+LOCAL_EXPORT_C_INCLUDES := \
+    $(LOCAL_PATH)/codec/api/svc \
+    $(LOCAL_PATH)/codec/common/inc
+
+ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_SRC_FILES)))
+include $(PREBUILT_SHARED_LIBRARY)
+endif
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := cpu-features
+LOCAL_SRC_FILES := cpu_features/android-$(APP_ABI)/ndk_compat/libndk_compat.so
+ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_SRC_FILES)))
+include $(PREBUILT_SHARED_LIBRARY)
+endif
diff --git a/codec/common/src/cpu.cpp b/codec/common/src/cpu.cpp
@@ -331,7 +331,7 @@ static uint32_t get_cpu_flags_from_cpuinfo(void)
     }
     while (fgets(buf, sizeof(buf), fp)) {
         if(!strncmp(buf, "ASEs implemented", strlen("ASEs implemented"))) {
-            if (strstr(buf, "loongson-mmi") || strstr(buf, "loongson-ext")) {
+            if (strstr(buf, "loongson-mmi") && strstr(buf, "loongson-ext")) {
                 flags |= WELS_CPU_MMI;
             }
             if (strstr(buf, "msa")) {

diff --git a/codec/common/x86/asm_inc.asm b/codec/common/x86/asm_inc.asm
@@ -485,15 +485,20 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits ; Mark the stack as non-
 %endmacro
 
 %macro WELS_EXTERN 1
-    %ifndef WELS_PRIVATE_EXTERN
-        %define WELS_PRIVATE_EXTERN
-    %endif
     ALIGN 16, nop
     %ifdef PREFIX
-        global _%1 WELS_PRIVATE_EXTERN
+        %ifdef WELS_PRIVATE_EXTERN
+            global _%1: WELS_PRIVATE_EXTERN
+        %else
+            global _%1
+        %endif
         %define %1 _%1
     %else
-        global %1 WELS_PRIVATE_EXTERN
+        %ifdef WELS_PRIVATE_EXTERN
+            global %1: WELS_PRIVATE_EXTERN
+        %else
+            global %1
+        %endif
     %endif
     %1:
 %endmacro

diff --git a/codec/encoder/core/inc/param_svc.h b/codec/encoder/core/inc/param_svc.h
@@ -365,7 +365,7 @@ typedef struct TagWelsSvcCodingParam: SEncParamExt {
       uiIntraPeriod = ((uiIntraPeriod + uiGopSize - 1) / uiGopSize) * uiGopSize;
 
     if (((pCodingParam.iNumRefFrame != AUTO_REF_PIC_COUNT)
-         && ((pCodingParam.iNumRefFrame > MAX_REF_PIC_COUNT) || (pCodingParam.iNumRefFrame < MIN_REF_PIC_COUNT)))
+         && !((pCodingParam.iNumRefFrame > MAX_REF_PIC_COUNT) || (pCodingParam.iNumRefFrame < MIN_REF_PIC_COUNT)))
         || ((iNumRefFrame != AUTO_REF_PIC_COUNT) && (pCodingParam.iNumRefFrame == AUTO_REF_PIC_COUNT))) {
       iNumRefFrame  = pCodingParam.iNumRefFrame;
     }

diff --git a/codec/encoder/core/src/au_set.cpp b/codec/encoder/core/src/au_set.cpp
@@ -134,7 +134,7 @@ static int32_t WelsCheckNumRefSetting (SLogContext* pLogCtx, SWelsSvcCodingParam
 
 int32_t WelsCheckRefFrameLimitationNumRefFirst (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam) {
 
-  if (WelsCheckNumRefSetting (pLogCtx, pParam, true)) {
+  if (WelsCheckNumRefSetting (pLogCtx, pParam, false)) {
     // we take num-ref as the honored setting but it conflicts with temporal and LTR
     return ENC_RETURN_UNSUPPORTED_PARA;
   }

diff --git a/codec/encoder/core/src/encoder_ext.cpp b/codec/encoder/core/src/encoder_ext.cpp
@@ -374,12 +374,12 @@ int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) {
                  pCfg->bEnableFrameSkip);
     if ((pCfg->iMaxQp <= 0) || (pCfg->iMinQp <= 0)) {
       if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) {
-        WelsLog (pLogCtx, WELS_LOG_WARNING, "Change QP Range from(%d,%d) to (%d,%d)", pCfg->iMinQp, pCfg->iMaxQp, MIN_SCREEN_QP,
+        WelsLog (pLogCtx, WELS_LOG_INFO, "Change QP Range from(%d,%d) to (%d,%d)", pCfg->iMinQp, pCfg->iMaxQp, MIN_SCREEN_QP,
                  MAX_SCREEN_QP);
         pCfg->iMinQp = MIN_SCREEN_QP;
         pCfg->iMaxQp = MAX_SCREEN_QP;
       } else {
-        WelsLog (pLogCtx, WELS_LOG_WARNING, "Change QP Range from(%d,%d) to (%d,%d)", pCfg->iMinQp, pCfg->iMaxQp,
+        WelsLog (pLogCtx, WELS_LOG_INFO, "Change QP Range from(%d,%d) to (%d,%d)", pCfg->iMinQp, pCfg->iMaxQp,
                  GOM_MIN_QP_MODE, MAX_LOW_BR_QP);
         pCfg->iMinQp = GOM_MIN_QP_MODE;
         pCfg->iMaxQp = MAX_LOW_BR_QP;

diff --git a/codec/encoder/core/src/ref_list_mgr_svc.cpp b/codec/encoder/core/src/ref_list_mgr_svc.cpp
@@ -628,7 +628,6 @@ bool WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t iPOC, int32_t iBestLtrRe
           WelsLog (& (pCtx->sLogCtx), WELS_LOG_DETAIL,
                    "WelsBuildRefList pCtx->uiTemporalId = %d,pRef->iFrameNum = %d,pRef->uiTemporalId = %d",
                    pCtx->uiTemporalId, pRef->iFrameNum, pRef->uiTemporalId);
-          break;
         }
       }
     }

diff --git a/codec/encoder/core/src/svc_encode_slice.cpp b/codec/encoder/core/src/svc_encode_slice.cpp
@@ -101,7 +101,7 @@ void WelsSliceHeaderExtInit (sWelsEncCtx* pEncCtx, SDqLayer* pCurLayer, SSlice*
   if (P_SLICE == pEncCtx->eSliceType) {
     pCurSliceHeader->uiNumRefIdxL0Active = 1;
     if (pCurSliceHeader->uiRefCount > 0 &&
-        pCurSliceHeader->uiRefCount < pCurLayer->sLayerInfo.pSpsP->iNumRefFrames) {
+        pCurSliceHeader->uiRefCount <= pCurLayer->sLayerInfo.pSpsP->iNumRefFrames) {
       pCurSliceHeader->bNumRefIdxActiveOverrideFlag = true;
       pCurSliceHeader->uiNumRefIdxL0Active = pCurSliceHeader->uiRefCount;
     }

diff --git a/cpu_features b/cpu_features
diff --git a/meson.build b/meson.build
@@ -1,10 +1,10 @@
 project('openh264', ['c', 'cpp'],
-  version : '2.0.0',
+  version : '2.1.0',
   meson_version : '>= 0.47',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
 
-major_version = '5'
+major_version = '6'
 
 cpp = meson.get_compiler('cpp')
 

diff --git a/test/api/decode_api_test.cpp b/test/api/decode_api_test.cpp
@@ -781,9 +781,9 @@ const uint32_t kiFrameNum = 100; //DO NOT CHANGE!
 const char* const pHashStr[][2] = { //DO NOT CHANGE!
   // Allow for different output depending on whether averaging is done
   // vertically or horizontally first when downsampling.
-  { "caaaa3352ab8614e3a35836f5d7c9a528294e953", "326cc236e9ba5277aedc5cf0865dd4cbd2f89fe0" },
-  { "2dc97661e94515d9947a344127062f82814afc2a", "72f36bb33d190979be88077c6166a09767dd2992" },
-  { "106ec96a90412aabea5c0cfa6bfc654a0b5db33e", "998c2947bccf140bde1e43e29376614038eb7c71" }
+  { "d5fb6d72f8cc0ea4b037e883598c162fd32b475d", "0fc7e06d0d766ac911730da2aa9e953bc858a161" },
+  { "17203f07486e895aef7c1bf94133fd731caba572", "1d47de674c9c44d8292ee00fa053a42bb9383614" },
+  { "86bf890aef2abe24abe40ebe3d9ec76a25ddebe7", "43eaac708413c109ca120c5d570176f1c9b4036c" }
 };
 
 class DecodeParseAPI : public ::testing::TestWithParam<EncodeDecodeFileParamBase>, public EncodeDecodeTestBase {

diff --git a/test/api/decode_encode_test.cpp b/test/api/decode_encode_test.cpp
@@ -130,8 +130,8 @@ TEST_P (DecodeEncodeTest, CompareOutput) {
   }
 }
 static const DecodeEncodeFileParam kFileParamArray[] = {
-  {"res/test_vd_1d.264", "f25b59215ffd34b1c6509d821a7392eb2247a107", 320, 192, 12.0f},
-  {"res/test_vd_rc.264", "345d376f395225a4121285c3c4fca145c9fd5fbd", 320, 192, 12.0f},
+  {"res/test_vd_1d.264", "2c8026e883bed044fb3528c6f1fb7e15f617390c", 320, 192, 12.0f},
+  {"res/test_vd_rc.264", "b70f84c4c0d74e24565aedc053394bf3c877939a", 320, 192, 12.0f},
 };