diff options
| author | Saravanan Solaiyappan <saravanan.s@ti.com> | 2012-05-03 18:55:21 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-25 08:56:29 -0500 |
| commit | e7378b77953187c29c567dca880fc9a2b6f82949 (patch) | |
| tree | 17f66706d0b484c18da9832f269b8714f37c6e48 /camera/inc/CameraHal.h | |
| parent | 5d732514084b76d6d047b89066ad679a098c89d6 (diff) | |
| download | hardware_ti_omap4-e7378b77953187c29c567dca880fc9a2b6f82949.tar.gz hardware_ti_omap4-e7378b77953187c29c567dca880fc9a2b6f82949.tar.bz2 hardware_ti_omap4-e7378b77953187c29c567dca880fc9a2b6f82949.zip | |
Revert "CameraHal: Changes necessitated by slice based processing"
This reverts commit 3b51680449dc324b9a44370a9dddfd0a34e1281d.
Change-Id: I07a063b0d114eecb0320600612dea4c631796f7f
Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com>
Diffstat (limited to 'camera/inc/CameraHal.h')
| -rw-r--r-- | camera/inc/CameraHal.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index fe6f2d2..10466bb 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -848,9 +848,6 @@ public: CAMERA_STOP_FD = 23, CAMERA_SWITCH_TO_EXECUTING = 24, CAMERA_USE_BUFFERS_VIDEO_CAPTURE = 25, - CAMERA_SETUP_TUNNEL = 26, - CAMERA_DESTROY_TUNNEL = 27, - CAMERA_PREVIEW_INITIALIZATION = 28, }; enum CameraMode @@ -908,7 +905,7 @@ public: virtual int registerEndCaptureCallback(end_image_capture_callback callback, void *user_data) = 0; //API to send a command to the camera - virtual status_t sendCommand(CameraCommands operation, int value1=0, int value2=0, int value3=0, int value4=0) = 0; + virtual status_t sendCommand(CameraCommands operation, int value1=0, int value2=0, int value3=0) = 0; virtual ~CameraAdapter() {}; @@ -1033,12 +1030,6 @@ public: int startPreview(); /** - * Set preview mode related initialization. - * Only used when slice based processing is enabled. - */ - int cameraPreviewInitialization(); - - /** * Only used if overlays are used for camera preview. */ int setPreviewWindow(struct preview_stream_ops *window); @@ -1304,8 +1295,6 @@ private: bool mDynamicPreviewSwitch; //keeps paused state of display bool mDisplayPaused; - bool mTunnelSetup; - bool mVTCUseCase; //Index of current camera adapter int mCameraIndex; @@ -1349,7 +1338,6 @@ private: CameraProperties::Properties* mCameraProperties; bool mPreviewStartInProgress; - bool mPreviewInitializationDone; bool mSetPreviewWindowCalled; |