Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
04d293d2
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,发现更多精彩内容 >>
提交
04d293d2
编写于
11月 17, 2013
作者:
A
Alexander Smorkalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Initial NativeCamera support for Android 4.4 KitKat.
上级
e3f450cf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
41 addition
and
6 deletion
+41
-6
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
+37
-6
platforms/scripts/camera_build.conf
platforms/scripts/camera_build.conf
+4
-0
未找到文件。
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
浏览文件 @
04d293d2
#if !defined(ANDROID_r2_2_0) && !defined(ANDROID_r2_3_3) && !defined(ANDROID_r3_0_1) && \
!defined(ANDROID_r4_0_0) && !defined(ANDROID_r4_0_3) && !defined(ANDROID_r4_1_1) && \
!defined(ANDROID_r4_2_0) && !defined(ANDROID_r4_3_0)
!defined(ANDROID_r4_2_0) && !defined(ANDROID_r4_3_0)
&& !defined(ANDROID_r4_4_0)
# error Building camera wrapper for your version of Android is not supported by OpenCV.\
You need to modify OpenCV sources in order to compile camera wrapper for your version of Android.
#endif
...
...
@@ -22,7 +22,7 @@
#elif defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0)
# include <gui/ISurface.h>
# include <gui/BufferQueue.h>
#elif defined(ANDROID_r4_3_0)
#elif defined(ANDROID_r4_3_0)
|| defined(ANDROID_r4_4_0)
# include <gui/IGraphicBufferProducer.h>
# include <gui/BufferQueue.h>
#else
...
...
@@ -74,6 +74,20 @@ public:
{
}
};
#elif defined(ANDROID_r4_4_0)
class
ConsumerListenerStub
:
public
android
::
BnConsumerListener
{
public:
virtual
void
onFrameAvailable
()
{
}
virtual
void
onBuffersReleased
()
{
}
virtual
~
ConsumerListenerStub
()
{
}
};
#endif
std
::
string
getProcessName
()
...
...
@@ -306,7 +320,8 @@ public:
}
virtual
void
postData
(
int32_t
msgType
,
const
sp
<
IMemory
>&
dataPtr
#if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0) || defined(ANDROID_r4_3_0)
#if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0) \
|| defined(ANDROID_r4_3_0) || defined(ANDROID_r4_4_0)
,
camera_frame_metadata_t
*
#endif
)
...
...
@@ -623,7 +638,14 @@ CameraHandler* CameraHandler::initCameraConnect(const CameraCallback& callback,
bufferStatus
=
camera
->
setPreviewTexture
(
bufferQueue
);
if
(
bufferStatus
!=
0
)
LOGE
(
"initCameraConnect: failed setPreviewTexture call; camera might not work correctly"
);
#endif
# elif defined(ANDROID_r4_4_0)
sp
<
BufferQueue
>
bufferQueue
=
new
BufferQueue
();
sp
<
IConsumerListener
>
queueListener
=
new
ConsumerListenerStub
();
bufferQueue
->
consumerConnect
(
queueListener
,
true
);
bufferStatus
=
handler
->
camera
->
setPreviewTarget
(
bufferQueue
);
if
(
bufferStatus
!=
0
)
LOGE
(
"applyProperties: failed setPreviewTexture call; camera might not work correctly"
);
# endif
#if (defined(ANDROID_r2_2_0) || defined(ANDROID_r2_3_3) || defined(ANDROID_r3_0_1))
# if 1
...
...
@@ -663,7 +685,8 @@ void CameraHandler::closeCameraConnect()
}
camera
->
stopPreview
();
#if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0) || defined(ANDROID_r4_3_0)
#if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0) \
|| defined(ANDROID_r4_3_0) || defined(ANDROID_r4_3_0)
camera
->
setPreviewCallbackFlags
(
CAMERA_FRAME_CALLBACK_FLAG_NOOP
);
#endif
camera
->
disconnect
();
...
...
@@ -914,7 +937,8 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
CameraParameters
curCameraParameters
((
*
ppcameraHandler
)
->
params
.
flatten
());
#if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0) || defined(ANDROID_r4_3_0)
#if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0) \
|| defined(ANDROID_r4_3_0) || defined(ANDROID_r4_4_0)
CameraHandler
*
handler
=*
ppcameraHandler
;
handler
->
camera
->
stopPreview
();
...
...
@@ -943,6 +967,13 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
bufferStatus
=
handler
->
camera
->
setPreviewTexture
(
bufferQueue
);
if
(
bufferStatus
!=
0
)
LOGE
(
"applyProperties: failed setPreviewTexture call; camera might not work correctly"
);
# elif defined(ANDROID_r4_4_0)
sp
<
BufferQueue
>
bufferQueue
=
new
BufferQueue
();
sp
<
IConsumerListener
>
queueListener
=
new
ConsumerListenerStub
();
bufferQueue
->
consumerConnect
(
queueListener
,
true
);
bufferStatus
=
handler
->
camera
->
setPreviewTarget
(
bufferQueue
);
if
(
bufferStatus
!=
0
)
LOGE
(
"applyProperties: failed setPreviewTexture call; camera might not work correctly"
);
# endif
handler
->
camera
->
setPreviewCallbackFlags
(
CAMERA_FRAME_CALLBACK_FLAG_ENABLE_MASK
|
CAMERA_FRAME_CALLBACK_FLAG_COPY_OUT_MASK
);
//with copy
...
...
platforms/scripts/camera_build.conf
浏览文件 @
04d293d2
...
...
@@ -25,3 +25,7 @@ native_camera_r4.3.0; armeabi; 14; $ANDROID_STUB_ROOT/4.3.0
native_camera_r4
.
3
.
0
;
armeabi
-
v7a
;
14
; $
ANDROID_STUB_ROOT
/
4
.
3
.
0
native_camera_r4
.
3
.
0
;
x86
;
14
; $
ANDROID_STUB_ROOT
/
4
.
3
.
0
native_camera_r4
.
3
.
0
;
mips
;
14
; $
ANDROID_STUB_ROOT
/
4
.
3
.
0
native_camera_r4
.
4
.
0
;
armeabi
;
14
; $
ANDROID_STUB_ROOT
/
4
.
4
.
0
native_camera_r4
.
4
.
0
;
armeabi
-
v7a
;
14
; $
ANDROID_STUB_ROOT
/
4
.
4
.
0
native_camera_r4
.
4
.
0
;
x86
;
14
; $
ANDROID_STUB_ROOT
/
4
.
4
.
0
native_camera_r4
.
4
.
0
;
mips
;
14
; $
ANDROID_STUB_ROOT
/
4
.
4
.
0
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录