Merge "CameraHAL OMAP4: Avoids state switching during port reconfigur…

…ation" into gingerbread
dalingrin · May 4, 2011 · 984c632 · 984c632
2 parents 7961601 + 075ffca
commit 984c632
Show file tree

Hide file tree

Showing 2 changed files with 471 additions and 369 deletions.
diff --git a/camera-omap4/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera-omap4/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -388,6 +388,8 @@ class OMXCameraAdapter : public BaseCameraAdapter
 
 private:
 
+    status_t switchToLoaded();
+
     OMXCameraPortParameters *getPortParams(CameraFrame::FrameType frameType);
 
     OMX_ERRORTYPE SignalEvent(OMX_IN OMX_HANDLETYPE hComponent,
@@ -696,15 +698,19 @@ class OMXCameraAdapter : public BaseCameraAdapter
     Mutex mLock;
     bool mPreviewing;
     bool mCapturing;
-    bool mFlushBuffers;
 
     OMX_STATETYPE mComponentState;
 
     bool mVnfEnabled;
     bool mVstabEnabled;
 
     int mSensorOrientation;
+    bool mSensorOverclock;
 
+    //Indicates if we should leave
+    //OMX_Executing state during
+    //stop-/startPreview
+    bool mOMXStateSwitch;
 
     int mFrameCount;
     int mLastFrameCount;
@@ -723,7 +729,6 @@ class OMXCameraAdapter : public BaseCameraAdapter
     Semaphore mCaptureSem;
     bool mCaptureSignalled;
 
-
 };
 }; //// namespace
 #endif //OMX_CAMERA_ADAPTER_H