diff options
| author | Mike J. Chen <mjchen@sta.samsung.com> | 2011-01-21 17:33:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-21 17:33:37 -0800 |
| commit | 917d76478ff06c1e7767202f6ddb9e70116ef442 (patch) | |
| tree | ae65a4130ab4aee2784bdad85d059bc76cc92dcd /libcamera/SecCameraHWInterface.h | |
| parent | 87bbe23ebffab7f5fdea3f8f673f14f6414ee0ce (diff) | |
| parent | 39eb0ad9be2c0db48ba56bab3b99273c36be428b (diff) | |
| download | device_samsung_crespo-917d76478ff06c1e7767202f6ddb9e70116ef442.zip device_samsung_crespo-917d76478ff06c1e7767202f6ddb9e70116ef442.tar.gz device_samsung_crespo-917d76478ff06c1e7767202f6ddb9e70116ef442.tar.bz2 | |
am 39eb0ad9: am 0bd85d7b: SP5C11X: libcamera: #ifdef/#defines cleanup
* commit '39eb0ad9be2c0db48ba56bab3b99273c36be428b':
SP5C11X: libcamera: #ifdef/#defines cleanup
Diffstat (limited to 'libcamera/SecCameraHWInterface.h')
| -rw-r--r-- | libcamera/SecCameraHWInterface.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libcamera/SecCameraHWInterface.h b/libcamera/SecCameraHWInterface.h index c095645..5c1a78b 100644 --- a/libcamera/SecCameraHWInterface.h +++ b/libcamera/SecCameraHWInterface.h @@ -81,13 +81,7 @@ private: CameraHardwareSec *mHardware; public: PreviewThread(CameraHardwareSec *hw): -#ifdef SINGLE_PROCESS - // In single process mode this thread needs to be a java thread, - // since we won't be calling through the binder. - Thread(true), -#else Thread(false), -#endif mHardware(hw) { } virtual bool threadLoop() { int ret = mHardware->previewThread(); @@ -182,9 +176,6 @@ private: sp<MemoryBase> mRecordBuffers[kBufferCountForRecord]; SecCamera *mSecCamera; - int mPreviewFrameSize; - int mRawFrameSize; - int mPreviewFrameRateMicrosec; const __u8 *mCameraSensorName; mutable Mutex mSkipFrameLock; @@ -203,20 +194,10 @@ private: int32_t mMsgEnabled; - // only used from PreviewThread - int mCurrentPreviewFrame; - int mCurrentRecordFrame; - bool mRecordRunning; -#ifdef JPEG_FROM_SENSOR int mPostViewWidth; int mPostViewHeight; int mPostViewSize; -#endif - - struct timeval mTimeStart; - struct timeval mTimeStop; - }; }; // namespace android |