diff options
| author | Daniel Levin <dendy@ti.com> | 2012-06-06 13:08:35 +0300 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-25 08:56:44 -0500 |
| commit | f56ad80d4144e7551ecce5481652daa1c9d5340c (patch) | |
| tree | 91ad68121521c194e0d1b8191c89f5fe55d8c98f /camera/CameraHal_Module.cpp | |
| parent | c384a237a866ad10eac95dc7070d4171d0fbe9f9 (diff) | |
| download | hardware_ti_omap4-f56ad80d4144e7551ecce5481652daa1c9d5340c.zip hardware_ti_omap4-f56ad80d4144e7551ecce5481652daa1c9d5340c.tar.gz hardware_ti_omap4-f56ad80d4144e7551ecce5481652daa1c9d5340c.tar.bz2 | |
CameraHAL: Wrapped sources with OMAP_ENHANCEMENT_* macros
Wrapped the enhanced code with OMAP_ENHANCEMENT_* macros.
Currently next enhancing modules dedicated:
- CPCAM: OMAP_ENHANCEMENT_CPCAM
- VTC: OMAP_ENHANCEMENT_VTC
- S3D: OMAP_ENHANCEMENT_S3D
- Burst capture: OMAP_ENHANCEMENT
Disabled the VTC test.
Disabled the camera_test.
Must be used together with:
http://review.omapzoom.org/#/c/23318/
Change-Id: Ie23aa6b7e0a72dabe529f2828442afa0464d4af4
Signed-off-by: Daniel Levin <dendy@ti.com>
Diffstat (limited to 'camera/CameraHal_Module.cpp')
| -rw-r--r-- | camera/CameraHal_Module.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp index b94b9d6..ba45a06 100644 --- a/camera/CameraHal_Module.cpp +++ b/camera/CameraHal_Module.cpp @@ -88,6 +88,7 @@ int camera_set_preview_window(struct camera_device * device, return rv; } +#ifdef OMAP_ENHANCEMENT_CPCAM int camera_set_buffer_source(struct camera_device * device, struct preview_stream_ops *tapin, struct preview_stream_ops *tapout) @@ -106,6 +107,7 @@ int camera_set_buffer_source(struct camera_device * device, return rv; } +#endif void camera_set_callbacks(struct camera_device * device, camera_notify_callback notify_cb, @@ -326,7 +328,7 @@ int camera_cancel_auto_focus(struct camera_device * device) return rv; } -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM int camera_take_picture(struct camera_device * device, const char *params) #else int camera_take_picture(struct camera_device * device) @@ -334,7 +336,7 @@ int camera_take_picture(struct camera_device * device) { int rv = -EINVAL; ti_camera_device_t* ti_dev = NULL; -#ifndef OMAP_ENHANCEMENT +#ifndef OMAP_ENHANCEMENT_CPCAM const char* params = NULL; #endif @@ -365,6 +367,7 @@ int camera_cancel_picture(struct camera_device * device) return rv; } +#ifdef OMAP_ENHANCEMENT_CPCAM int camera_reprocess(struct camera_device * device, const char *params) { int rv = -EINVAL; @@ -396,6 +399,7 @@ int camera_cancel_reprocess(struct camera_device * device) rv = gCameraHals[ti_dev->cameraid]->cancel_reprocess(); return rv; } +#endif int camera_set_parameters(struct camera_device * device, const char *params) { @@ -597,7 +601,9 @@ int camera_device_open(const hw_module_t* module, const char* name, camera_device->base.ops = camera_ops; camera_ops->set_preview_window = camera_set_preview_window; +#ifdef OMAP_ENHANCEMENT_CPCAM camera_ops->set_buffer_source = camera_set_buffer_source; +#endif camera_ops->set_callbacks = camera_set_callbacks; camera_ops->enable_msg_type = camera_enable_msg_type; camera_ops->disable_msg_type = camera_disable_msg_type; @@ -620,7 +626,7 @@ int camera_device_open(const hw_module_t* module, const char* name, camera_ops->send_command = camera_send_command; camera_ops->release = camera_release; camera_ops->dump = camera_dump; -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM camera_ops->reprocess = camera_reprocess; camera_ops->cancel_reprocess = camera_cancel_reprocess; #endif |