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

Native camera issue on HTC One S fixed.

Browse Source 
Camera connect->disconnect->connect leads to sigsegv.
Apply properties method reimplemented.
This commit is contained in:
Alexander Smorkalov
2012-09-07 12:43:45 +04:00
parent 19e1f89cd6
commit 710e070990
4 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/src/cap_android.cpp
View File

@@ -203,6 +203,7 @@ CvCapture_Android::CvCapture_Android(int cameraId)
m_frameFormat = noformat;
//try connect to camera
LOGD("CvCapture_Android::CvCapture_Android(%i)", cameraId);
m_activity = new HighguiAndroidCameraActivity(this);
if (m_activity == 0) return;
@@ -328,7 +329,7 @@ bool CvCapture_Android::setProperty( int propIdx, double propValue )
break;
default:
CV_Error( CV_StsOutOfRange, "Failed attempt to SET unsupported camera property." );
return false;
return false;
}
if (propIdx != CV_CAP_PROP_AUTOGRAB) {// property for highgui class CvCapture_Android only
@@ -353,10 +354,10 @@ bool CvCapture_Android::grabFrame()
{
m_activity->applyProperties();
m_CameraParamsChanged = false;
m_dataState= CVCAPTURE_ANDROID_STATE_NO_FRAME;//we will wait new frame
m_dataState = CVCAPTURE_ANDROID_STATE_NO_FRAME;//we will wait new frame
}
if (m_dataState!=CVCAPTURE_ANDROID_STATE_HAS_NEW_FRAME_UNGRABBED)
if (m_dataState != CVCAPTURE_ANDROID_STATE_HAS_NEW_FRAME_UNGRABBED)
{
m_waitingNextFrame = true;
pthread_cond_wait(&m_nextFrameCond, &m_nextFrameMutex);