generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

getWidth/getHeight optimized.

Browse Source
This commit is contained in:
Alexander Smorkalov 2012-09-10 17:07:21 +04:00
parent 98c92f196e
commit 7d4432df27
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/androidcamera/src/camera_activity.cpp
View File

@ -61,7 +61,7 @@ private:
std::string CameraWrapperConnector::pathLibFolder; std::string CameraWrapperConnector::pathLibFolder;
bool CameraWrapperConnector::isConnectedToLib=false; bool CameraWrapperConnector::isConnectedToLib = false;
InitCameraConnectC CameraWrapperConnector::pInitCameraC = 0; InitCameraConnectC CameraWrapperConnector::pInitCameraC = 0;
CloseCameraConnectC CameraWrapperConnector::pCloseCameraC = 0; CloseCameraConnectC CameraWrapperConnector::pCloseCameraC = 0;
GetCameraPropertyC CameraWrapperConnector::pGetPropertyC = 0; GetCameraPropertyC CameraWrapperConnector::pGetPropertyC = 0;
@ -421,18 +421,24 @@ void CameraActivity::applyProperties()
frameWidth = -1; frameWidth = -1;
frameHeight = -1; frameHeight = -1;
CameraWrapperConnector::applyProperties(&camera); CameraWrapperConnector::applyProperties(&camera);
frameWidth = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEWIDTH);
frameHeight = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT);
} }
int CameraActivity::getFrameWidth() int CameraActivity::getFrameWidth()
{ {
LOGD("CameraActivity::getFrameWidth()"); LOGD("CameraActivity::getFrameWidth()");
return getProperty(ANDROID_CAMERA_PROPERTY_FRAMEWIDTH); if (frameWidth <= 0)
frameWidth = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEWIDTH);
return frameWidth;
} }
int CameraActivity::getFrameHeight() int CameraActivity::getFrameHeight()
{ {
LOGD("CameraActivity::getFrameHeight()"); LOGD("CameraActivity::getFrameHeight()");
return frameHeight = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT); if (frameHeight <= 0)
frameHeight = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT);
return frameHeight;
} }
void CameraActivity::setPathLibFolder(const char* path) void CameraActivity::setPathLibFolder(const char* path)