shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #434 from mstorsjo/threadlib-core-count-android

Use the cpu-features NDK library for detecting the number of cores in WelsThreadLib

--- a/codec/common/WelsThreadLib.cpp

+++ b/codec/common/WelsThreadLib.cpp

@@ -55,6 +55,9 @@

 #define HW_NCPU_NAME "hw.ncpu"

 #endif

 #endif

+#ifdef ANDROID_NDK

+#include <cpu-features.h>

+#endif

 #include "WelsThreadLib.h"

 #include <stdio.h>

@@ -414,7 +417,10 @@

 }

 WELS_THREAD_ERROR_CODE    WelsQueryLogicalProcessInfo (WelsLogicalProcessInfo* pInfo) {

-#ifdef LINUX

+#ifdef ANDROID_NDK

+  pInfo->ProcessorCount = android_getCpuCount();

+  return WELS_THREAD_ERROR_OK;

+#elif defined(LINUX)

   cpu_set_t cpuset;