diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-08-17 12:55:43 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-17 12:55:43 -0700 |
| commit | 71cbb94bedd5679720fcb54c27f8ebe802daa78e (patch) | |
| tree | 915d886bda31dc37170784d6428ea50a264cce14 /camera/inc | |
| parent | 71791abab1223bcdfe161aed80279b34e7df26d6 (diff) | |
| download | hardware_ti_omap4-71cbb94bedd5679720fcb54c27f8ebe802daa78e.zip hardware_ti_omap4-71cbb94bedd5679720fcb54c27f8ebe802daa78e.tar.gz hardware_ti_omap4-71cbb94bedd5679720fcb54c27f8ebe802daa78e.tar.bz2 | |
Revert "(TEMP) Avoid SetConfig when starting front sensor"
This reverts commit 2f394067996c47b8c02a335af7403c34908bff07.
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index fe3dc5b..42d7d11 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -55,8 +55,6 @@ namespace android { #define FOCUS_THRESHOLD 5 //[s.] -#define NUM_SKIP_FRAMES 99 - #define MIN_JPEG_QUALITY 1 #define MAX_JPEG_QUALITY 100 #define EXP_BRACKET_RANGE 10 @@ -589,7 +587,7 @@ private: class CommandHandler : public Thread { public: CommandHandler(OMXCameraAdapter* ca) - : Thread(false), mCameraAdapter(ca), mWaitToSetConfig(false), mForceQuit(false) { } + : Thread(false), mCameraAdapter(ca) { } virtual bool threadLoop() { bool ret; @@ -607,27 +605,10 @@ private: CAMERA_PERFORM_AUTOFOCUS }; - // TODO(XXX): temporary hack. must remove after setconfig and transition issue - // with secondary camera is fixed - void setWait(bool wait) { - mWaitToSetConfig = wait; - } - - // TODO(XXX): temporary hack. must remove after setconfig and transition issue - // with secondary camera is fixed - void setForceQuit() { - mForceQuit = true; - } - private: bool Handler(); TIUTILS::MessageQueue mCommandMsgQ; OMXCameraAdapter* mCameraAdapter; - - // TODO(XXX): temporary hack. must remove after setconfig and transition issue - // with secondary camera is fixed - bool mWaitToSetConfig; - bool mForceQuit; }; sp<CommandHandler> mCommandHandler; @@ -737,10 +718,6 @@ private: size_t mBurstFrames; size_t mCapturedFrames; - // TODO(XXX): temporary hack. must remove after setconfig and transition issue - // with secondary camera is fixed - bool mWaitToSetConfig; - bool mMeasurementEnabled; //Exposure Bracketing |