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
c4c3e4fe
Commit
c4c3e4fe
authored
Feb 18, 2015
by
Dmitry-Me
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unneeded indirections
parent
6ff2f395
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
camera_wrapper.cpp
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
+6
-6
No files found.
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
View file @
c4c3e4fe
...
...
@@ -1047,14 +1047,14 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
return
;
}
CameraHandler
*
handler
=*
ppcameraHandler
;
// delayed resolution setup to exclude errors during other parameres setup on the fly
// without camera restart
if
((
(
*
ppcameraHandler
)
->
width
!=
0
)
&&
((
*
ppcameraHandler
)
->
height
!=
0
))
(
*
ppcameraHandler
)
->
params
->
setPreviewSize
((
*
ppcameraHandler
)
->
width
,
(
*
ppcameraHandler
)
->
height
);
if
((
handler
->
width
!=
0
)
&&
(
handler
->
height
!=
0
))
handler
->
params
->
setPreviewSize
(
handler
->
width
,
handler
->
height
);
#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
();
handler
->
camera
->
setPreviewCallbackFlags
(
CAMERA_FRAME_CALLBACK_FLAG_NOOP
);
...
...
@@ -1066,7 +1066,7 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
return
;
}
handler
->
camera
->
setParameters
(
(
*
ppcameraHandler
)
->
params
->
flatten
());
handler
->
camera
->
setParameters
(
handler
->
params
->
flatten
());
status_t
bufferStatus
;
# if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3)
...
...
@@ -1107,7 +1107,7 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
LOGD
(
"Preview started successfully"
);
}
#else
CameraHandler
*
previousCameraHandler
=
*
ppcameraH
andler
;
CameraHandler
*
previousCameraHandler
=
h
andler
;
CameraCallback
cameraCallback
=
previousCameraHandler
->
cameraCallback
;
void
*
userData
=
previousCameraHandler
->
userData
;
int
cameraId
=
previousCameraHandler
->
cameraId
;
...
...
@@ -1117,7 +1117,7 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
LOGD
(
"CameraHandler::applyProperties(): after previousCameraHandler->closeCameraConnect"
);
LOGD
(
"CameraHandler::applyProperties(): before initCameraConnect"
);
CameraHandler
*
handler
=
initCameraConnect
(
cameraCallback
,
cameraId
,
userData
,
(
*
ppcameraHandler
)
->
params
);
handler
=
initCameraConnect
(
cameraCallback
,
cameraId
,
userData
,
handler
->
params
);
LOGD
(
"CameraHandler::applyProperties(): after initCameraConnect, handler=0x%x"
,
(
int
)
handler
);
if
(
handler
==
NULL
)
{
LOGE
(
"ERROR in applyProperties --- cannot reinit camera"
);
...
...
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