Fixed less than optimal number of decoding threads on some Android devices

diff --git a/xbmc/android/activity/AndroidFeatures.cpp b/xbmc/android/activity/AndroidFeatures.cpp
index 7526cd0..0c958b8 100644 (file)
--- a/xbmc/android/activity/AndroidFeatures.cpp
+++ b/xbmc/android/activity/AndroidFeatures.cpp
@@ -63,3 +63,14 @@ int CAndroidFeatures::GetVersion()
   return version;
 }
 
+int CAndroidFeatures::GetCPUCount()
+{
+  static int count = -1;
+
+  if (count == -1)
+  {
+    count = android_getCpuCount();
+  }
+  return count;
+}
+

diff --git a/xbmc/android/activity/AndroidFeatures.h b/xbmc/android/activity/AndroidFeatures.h
index 9d0c20b..98aee45 100644 (file)
--- a/xbmc/android/activity/AndroidFeatures.h
+++ b/xbmc/android/activity/AndroidFeatures.h
@@ -27,4 +27,5 @@ class CAndroidFeatures
 
   static bool         HasNeon();
   static int          GetVersion();
-};
\ No newline at end of file
+  static int          GetCPUCount();
+};

diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
index 660d355..f1d07dd 100644 (file)
--- a/xbmc/utils/CPUInfo.cpp
+++ b/xbmc/utils/CPUInfo.cpp
@@ -412,6 +412,14 @@ CCPUInfo::CCPUInfo(void)
       }
     }
     fclose(fCPUInfo);
+    //  /proc/cpuinfo is not reliable on some Android platforms
+    //  At least we should get the correct cpu count for multithreaded decoding
+#if defined(TARGET_ANDROID)
+    if (CAndroidFeatures::GetCPUCount() > m_cpuCount)
+    {
+      m_cpuCount = CAndroidFeatures::GetCPUCount();
+    }
+#endif
   }
   else
   {