diff options
author | Mekala Natarajan <mekalan@codeaurora.org> | 2014-01-16 13:50:18 -0800 |
---|---|---|
committer | Vineeta Srivastava <vsrivastava@google.com> | 2014-01-16 15:11:26 -0800 |
commit | edda38bcd3d3a3344e09925e7bb629b9e1361a36 (patch) | |
tree | 746a7b0d7a3d1757e9edf3d0c3ef8cc497ad1b07 /camera/mm-camera-interface/mm_camera_interface2.h | |
parent | b8d393e7224d1cbd1fad5f9b819e71f092927cdf (diff) | |
download | mako-edda38bcd3d3a3344e09925e7bb629b9e1361a36.tar.gz |
camera: Fixes for race conditions in abnormal snapshot stop.
Change-Id: Iba20800baee92dcd59ae6edb96e7dc1953c83a88
Bug: 12467743
Bug: 11021907
Diffstat (limited to 'camera/mm-camera-interface/mm_camera_interface2.h')
-rwxr-xr-x[-rw-r--r--] | camera/mm-camera-interface/mm_camera_interface2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/mm-camera-interface/mm_camera_interface2.h b/camera/mm-camera-interface/mm_camera_interface2.h index e674d79..ba4dcd5 100644..100755 --- a/camera/mm-camera-interface/mm_camera_interface2.h +++ b/camera/mm-camera-interface/mm_camera_interface2.h @@ -295,6 +295,7 @@ typedef struct { mm_camera_ops_type_t opcode, void *val); int32_t (*open)(mm_camera_t * camera, mm_camera_op_mode_type_t op_mode); void (*close)(mm_camera_t * camera); + void (*stop)(mm_camera_t * camera); int32_t (*ch_acquire)(mm_camera_t * camera, mm_camera_channel_type_t ch_type); void (*ch_release)(mm_camera_t * camera, mm_camera_channel_type_t ch_type); int32_t (*ch_set_attr)(mm_camera_t * camera, mm_camera_channel_type_t ch_type, @@ -473,6 +474,7 @@ int32_t cam_ops_action(int cam_id, uint8_t start, mm_camera_ops_type_t opcode, void *val); int32_t cam_ops_open(int cam_id, mm_camera_op_mode_type_t op_mode); void cam_ops_close(int cam_id); +void cam_ops_stop(int cam_id); int32_t cam_ops_ch_acquire(int cam_id, mm_camera_channel_type_t ch_type); void cam_ops_ch_release(int cam_id, mm_camera_channel_type_t ch_type); int32_t cam_ops_ch_set_attr(int cam_id, mm_camera_channel_type_t ch_type, |