shithub: openh264

Download patch

ref: 276b585f03f994ba7557fb04454f9c40dfa312f5
parent: 201ab42d7ea03bea96fe8c3a324694b6daef4ac5
author: Martin Storsjö <[email protected]>
date: Tue Mar 4 18:52:33 EST 2014

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

On arm, the exact same detection is done in WelsCPUFeatureDetect,
but in the x86 version of that function we use x86 cpuid for getting
the core count, and this is not available on all processors. For the
case when cpuid can't tell the core count, use the NDK function as
higher level API.

The thread lib itself doesn't build properly on android yet, but will
do so soon.

--- 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;