diff options
| author | Daniel Levin <dendy@ti.com> | 2012-11-27 21:34:12 +0200 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-12-04 15:38:30 +0200 |
| commit | cf614ea4fd9ebc303d6314016d7e226fa7cd1966 (patch) | |
| tree | 7f09a3067b666a09dd8faadcac8d33b89166e219 /camera/CameraHal_Module.cpp | |
| parent | 92c40268fb2cdf196b7bd97fa5e569d8267a9ac7 (diff) | |
| parent | 005d358cbcf413658d3e5204b699d9bf7367c256 (diff) | |
| download | hardware_ti_omap4-cf614ea4fd9ebc303d6314016d7e226fa7cd1966.zip hardware_ti_omap4-cf614ea4fd9ebc303d6314016d7e226fa7cd1966.tar.gz hardware_ti_omap4-cf614ea4fd9ebc303d6314016d7e226fa7cd1966.tar.bz2 | |
Merge branch 'd-jb-mr0-release-camera' into p-jb-mr1-release
Conflicts:
camera/OMXCameraAdapter/OMXCameraAdapter.cpp
test/CameraHal/camera_test_bufferqueue.h
test/CameraHal/camera_test_surfacetexture.cpp
Change-Id: I1f13c6a5b6369e943773d04a650406a79eb95750
Signed-off-by: Daniel Levin <dendy@ti.com>
Diffstat (limited to 'camera/CameraHal_Module.cpp')
| -rw-r--r-- | camera/CameraHal_Module.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp index 313c7fc..a9277a2 100644 --- a/camera/CameraHal_Module.cpp +++ b/camera/CameraHal_Module.cpp @@ -140,6 +140,25 @@ int camera_set_buffer_source(struct camera_device * device, return rv; } + +int camera_release_buffer_source(struct camera_device * device, + struct preview_stream_ops *tapin, + struct preview_stream_ops *tapout) +{ + CAMHAL_LOG_MODULE_FUNCTION_NAME; + + int rv = -EINVAL; + ti_camera_device_t* ti_dev = NULL; + + if(!device) + return rv; + + ti_dev = (ti_camera_device_t*) device; + + rv = gCameraHals[ti_dev->cameraid]->releaseBufferSource(tapin, tapout); + + return rv; +} #endif void camera_set_callbacks(struct camera_device * device, @@ -513,6 +532,7 @@ int camera_send_command(struct camera_device * device, #ifdef OMAP_ENHANCEMENT_CPCAM ops->set_extended_preview_ops = camera_set_extended_preview_ops; ops->set_buffer_source = camera_set_buffer_source; + ops->release_buffer_source = camera_release_buffer_source; ops->take_picture_with_parameters = camera_take_picture_with_parameters; ops->reprocess = camera_reprocess; ops->cancel_reprocess = camera_cancel_reprocess; |