Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
fd759223
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fd759223
编写于
11月 22, 2013
作者:
A
Alexander Smorkalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Package selection for Tegra 4i fixed. Initial Tegra5 support added.
上级
8a4f3570
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
16 deletion
+26
-16
platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h
...oid/service/engine/jni/BinderComponent/HardwareDetector.h
+9
-6
platforms/android/service/engine/jni/NativeService/CommonPackageManager.cpp
...service/engine/jni/NativeService/CommonPackageManager.cpp
+4
-1
platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
.../android/service/engine/jni/NativeService/PackageInfo.cpp
+2
-0
platforms/android/service/engine/jni/NativeService/PackageInfo.h
...ms/android/service/engine/jni/NativeService/PackageInfo.h
+2
-0
platforms/android/service/engine/jni/Tests/OpenCVEngineTest.cpp
...rms/android/service/engine/jni/Tests/OpenCVEngineTest.cpp
+9
-9
未找到文件。
platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h
浏览文件 @
fd759223
...
...
@@ -14,8 +14,9 @@
#define FEATURES_HAS_VFPv3d16 1L
#define FEATURES_HAS_VFPv3 2L
#define FEATURES_HAS_NEON 4L
#define FEATURES_HAS_NEON2 8L
#define FEATURES_HAS_VFPv4 4L
#define FEATURES_HAS_NEON 8L
#define FEATURES_HAS_NEON2 16L
#define FEATURES_HAS_SSE 1L
#define FEATURES_HAS_SSE2 2L
#define FEATURES_HAS_SSSE3 4L
...
...
@@ -24,10 +25,12 @@
// TODO: Do not forget to add Platrfom name to PackageInfo::PlatformNameMap
// in method PackageInfo::InitPlatformNameMap()
#define PLATFORM_UNKNOWN 0L
#define PLATFORM_TEGRA 1L
#define PLATFORM_TEGRA2 2L
#define PLATFORM_TEGRA3 3L
#define PLATFORM_TEGRA4 4L
#define PLATFORM_TEGRA 1L
#define PLATFORM_TEGRA2 2L
#define PLATFORM_TEGRA3 3L
#define PLATFORM_TEGRA4 4L
#define PLATFORM_TEGRA4i 5L
#define PLATFORM_TEGRA5 6L
int
DetectKnownPlatforms
();
int
GetProcessorCount
();
...
...
platforms/android/service/engine/jni/NativeService/CommonPackageManager.cpp
浏览文件 @
fd759223
...
...
@@ -196,8 +196,11 @@ std::vector<std::pair<int, int> > CommonPackageManager::InitArmRating()
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3d16
|
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_UNKNOWN
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_VFPv3d16
|
FEATURES_HAS_NEON
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_UNKNOWN
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_VFPv3d16
|
FEATURES_HAS_VFPv4
|
FEATURES_HAS_NEON
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_TEGRA3
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_NEON
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_TEGRA4
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_NEON
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_TEGRA4i
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_VFPv4
|
FEATURES_HAS_NEON
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_TEGRA4
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_VFPv4
|
FEATURES_HAS_NEON
));
result
.
push_back
(
std
::
pair
<
int
,
int
>
(
PLATFORM_TEGRA5
,
ARCH_ARMv7
|
FEATURES_HAS_VFPv3
|
FEATURES_HAS_VFPv4
|
FEATURES_HAS_NEON
));
return
result
;
}
...
...
platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
浏览文件 @
fd759223
...
...
@@ -19,6 +19,8 @@ map<int, string> PackageInfo::InitPlatformNameMap()
result
[
PLATFORM_TEGRA2
]
=
PLATFORM_TEGRA2_NAME
;
result
[
PLATFORM_TEGRA3
]
=
PLATFORM_TEGRA3_NAME
;
result
[
PLATFORM_TEGRA4
]
=
PLATFORM_TEGRA4_NAME
;
result
[
PLATFORM_TEGRA4i
]
=
PLATFORM_TEGRA4_NAME
;
result
[
PLATFORM_TEGRA5
]
=
PLATFORM_TEGRA5_NAME
;
return
result
;
}
...
...
platforms/android/service/engine/jni/NativeService/PackageInfo.h
浏览文件 @
fd759223
...
...
@@ -21,10 +21,12 @@
#define FEATURES_HAS_SSSE3_NAME "ssse3"
#define FEATURES_HAS_GPU_NAME "gpu"
// TODO: Do not forget to update PackageInfo::InitPlatformNameMap() after constant changes
#define PLATFORM_TEGRA_NAME "tegra"
#define PLATFORM_TEGRA2_NAME "tegra2"
#define PLATFORM_TEGRA3_NAME "tegra3"
#define PLATFORM_TEGRA4_NAME "tegra4"
#define PLATFORM_TEGRA5_NAME "tegra5"
class
PackageInfo
{
...
...
platforms/android/service/engine/jni/Tests/OpenCVEngineTest.cpp
浏览文件 @
fd759223
...
...
@@ -20,16 +20,16 @@ class ServiceStarter
public:
ServiceStarter
()
{
PackageManager
=
new
PackageManagerStub
();
Engine
=
new
OpenCVEngine
(
PackageManager
);
PackageManager
=
new
PackageManagerStub
();
Engine
=
new
OpenCVEngine
(
PackageManager
);
defaultServiceManager
()
->
addService
(
IOpenCVEngine
::
descriptor
,
Engine
);
LOGI
(
"OpenCVEngine native service started successfully"
);
ProcessState
::
self
()
->
startThreadPool
();
defaultServiceManager
()
->
addService
(
IOpenCVEngine
::
descriptor
,
Engine
);
LOGI
(
"OpenCVEngine native service started successfully"
);
ProcessState
::
self
()
->
startThreadPool
();
}
~
ServiceStarter
()
{
delete
PackageManager
;
delete
PackageManager
;
}
PackageManagerStub
*
PackageManager
;
...
...
@@ -46,9 +46,9 @@ sp<IOpenCVEngine> InitConnect()
do
{
EngineService
=
ServiceManager
->
getService
(
IOpenCVEngine
::
descriptor
);
if
(
EngineService
!=
0
)
break
;
usleep
(
500000
);
// 0.5 s
EngineService
=
ServiceManager
->
getService
(
IOpenCVEngine
::
descriptor
);
if
(
EngineService
!=
0
)
break
;
usleep
(
500000
);
// 0.5 s
}
while
(
true
);
Engine
=
interface_cast
<
IOpenCVEngine
>
(
EngineService
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录