Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
76fdbeee
Commit
76fdbeee
authored
Jul 12, 2012
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tegra detector fixed;
Some aditional logs added; AndroidManifest version incremented.
parent
69296c33
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
8 deletions
+11
-8
AndroidManifest.xml
android/service/engine/AndroidManifest.xml
+2
-2
HardwareDetector.cpp
...d/service/engine/jni/BinderComponent/HardwareDetector.cpp
+0
-4
CommonPackageManager.cpp
...service/engine/jni/NativeService/CommonPackageManager.cpp
+8
-1
EngineCommon.h
android/service/engine/jni/include/EngineCommon.h
+1
-1
No files found.
android/service/engine/AndroidManifest.xml
View file @
76fdbeee
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.opencv.engine"
android:versionCode=
"1
1
"
android:versionName=
"1.
1
"
>
android:versionCode=
"1
2
"
android:versionName=
"1.
2
"
>
<uses-sdk
android:minSdkVersion=
"8"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
...
...
android/service/engine/jni/BinderComponent/HardwareDetector.cpp
View file @
76fdbeee
...
...
@@ -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)
...
...
android/service/engine/jni/NativeService/CommonPackageManager.cpp
View file @
76fdbeee
...
...
@@ -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 platf
ro
m!"
);
LOGE
(
"Cannot calculate rating for current hardware platf
or
m!"
);
}
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<std::pair<int, int> > CommonPackageManager::InitArmRating()
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv6
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv6
|
FEATURES_HAS_VFPv3d16
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv6
|
FEATURES_HAS_VFPv3
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv6
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_VFPv3d16
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv7
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv7
|
FEATURES_HAS_NEON
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_NEON
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_TEGRA2
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_TEGRA3
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_NEON
));
...
...
android/service/engine/jni/include/EngineCommon.h
View file @
76fdbeee
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment