diff --git a/android/service/engine/AndroidManifest.xml b/android/service/engine/AndroidManifest.xml index 7567dd31e..9512c7b6c 100644 --- a/android/service/engine/AndroidManifest.xml +++ b/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="12" + android:versionName="1.2" > diff --git a/android/service/engine/jni/BinderComponent/HardwareDetector.cpp b/android/service/engine/jni/BinderComponent/HardwareDetector.cpp index ce6032521..ccfad3ccf 100644 --- a/android/service/engine/jni/BinderComponent/HardwareDetector.cpp +++ b/android/service/engine/jni/BinderComponent/HardwareDetector.cpp @@ -156,7 +156,6 @@ int GetProcessorCount() int DetectKnownPlatforms() { -#ifdef __SUPPORT_TEGRA3 int tegra_status = DetectTegra(); if (3 == tegra_status) @@ -167,9 +166,6 @@ int DetectKnownPlatforms() { return PLATFORM_UNKNOWN; } -#else - return PLATFORM_UNKNOWN; -#endif // NOTE: Uncomment when all Tegras will be supported /*if (tegra_status > 0) diff --git a/android/service/engine/jni/NativeService/CommonPackageManager.cpp b/android/service/engine/jni/NativeService/CommonPackageManager.cpp index ee846769e..99eb7325c 100644 --- a/android/service/engine/jni/NativeService/CommonPackageManager.cpp +++ b/android/service/engine/jni/NativeService/CommonPackageManager.cpp @@ -91,10 +91,11 @@ string CommonPackageManager::GetPackagePathByVersion(const std::string& version, group = CommonPackageManager::IntelRating; int HardwareRating = GetHardwareRating(platform, cpu_id, group); + LOGD("Current hardware platform %d, %d", platform, cpu_id); if (-1 == HardwareRating) { - LOGE("Cannot calculate rating for current hardware platfrom!"); + LOGE("Cannot calculate rating for current hardware platform!"); } else { @@ -115,6 +116,10 @@ string CommonPackageManager::GetPackagePathByVersion(const std::string& version, { result = found->GetInstalationPath(); } + else + { + LOGI("Found package is incompatible with current hardware platform"); + } } } } @@ -162,8 +167,10 @@ std::vector > CommonPackageManager::InitArmRating() result.push_back(std::pair(PLATFORM_UNKNOWN, ARCH_ARMv6)); result.push_back(std::pair(PLATFORM_UNKNOWN, ARCH_ARMv6 | FEATURES_HAS_VFPv3d16)); result.push_back(std::pair(PLATFORM_UNKNOWN, ARCH_ARMv6 | FEATURES_HAS_VFPv3)); + result.push_back(std::pair(PLATFORM_UNKNOWN, ARCH_ARMv6 | FEATURES_HAS_VFPv3 | FEATURES_HAS_VFPv3d16)); result.push_back(std::pair(PLATFORM_UNKNOWN, ARCH_ARMv7)); result.push_back(std::pair(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3)); + result.push_back(std::pair(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_NEON)); result.push_back(std::pair(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_NEON)); result.push_back(std::pair(PLATFORM_TEGRA2, ARCH_ARMv7 | FEATURES_HAS_VFPv3)); result.push_back(std::pair(PLATFORM_TEGRA3, ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_NEON)); diff --git a/android/service/engine/jni/include/EngineCommon.h b/android/service/engine/jni/include/EngineCommon.h index 9968f4ff5..96f6dee9f 100644 --- a/android/service/engine/jni/include/EngineCommon.h +++ b/android/service/engine/jni/include/EngineCommon.h @@ -3,7 +3,7 @@ // Global tag for Logcat output #undef LOG_TAG -#define LOG_TAG "OpenCVEngine" +#define LOG_TAG "OpenCVEngine" #ifndef OPEN_CV_ENGINE_VERSION #define OPEN_CV_ENGINE_VERSION 1