diff options
| author | Shuzhen Wang <shuzhenw@codeaurora.org> | 2015-01-27 22:36:25 -0800 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2015-01-28 13:01:08 -0800 |
| commit | c707b1d73e29aa8df2a6d2f666eca57e816b0f6e (patch) | |
| tree | 0fe60fa9f12e68df739b3b0c850005c678aa8a9f /camera/mm-camera-interface/mm_camera.h | |
| parent | 5c6d74bb8fc04cdf47ebbc07c0b645d0c1c37646 (diff) | |
| download | mako-lollipop-mr1-fi-release.tar.gz | |
Camera: Add support to not queue all buffers up frontandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
Camera HAL needs to call cancel_buffer on min_undequeued_buffers
preview buffers up front. That means not all preview buffers should
be queued into camera driver. This change adds the support.
Bug: 18630337
Change-Id: I794b0dcafa03ebfaddf4c68b66b09c74bbb206d0
Diffstat (limited to 'camera/mm-camera-interface/mm_camera.h')
| -rw-r--r-- | camera/mm-camera-interface/mm_camera.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/camera/mm-camera-interface/mm_camera.h b/camera/mm-camera-interface/mm_camera.h index 0d62fbe..57c229b 100644 --- a/camera/mm-camera-interface/mm_camera.h +++ b/camera/mm-camera-interface/mm_camera.h @@ -1,5 +1,5 @@ /* -Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. +Copyright (c) 2011-2012,2015, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -58,7 +58,6 @@ typedef enum { MM_CAMERA_STATE_EVT_GET_CROP, MM_CAMERA_STATE_EVT_DISPATCH_BUFFERED_FRAME, MM_CAMERA_STATE_EVT_REQUEST_BUF, // request amount of buffers to kernel only - MM_CAMERA_STATE_EVT_ENQUEUE_BUF, // enqueue some of buffers to kernel only MM_CAMERA_STATE_EVT_MAX } mm_camera_state_evt_type_t; @@ -114,7 +113,7 @@ typedef struct { mm_camera_frame_queue_t readyq; int32_t num_frame; uint32_t frame_len; - int8_t reg_flag; + int8_t reg_flag[MM_CAMERA_MAX_NUM_FRAMES]; uint32_t frame_offset[MM_CAMERA_MAX_NUM_FRAMES]; mm_camera_frame_t frame[MM_CAMERA_MAX_NUM_FRAMES]; int8_t ref_count[MM_CAMERA_MAX_NUM_FRAMES]; @@ -302,7 +301,6 @@ extern int32_t mm_camera_get_parm(mm_camera_obj_t * my_obj, extern int32_t mm_camera_set_parm(mm_camera_obj_t * my_obj, mm_camera_parm_t *parm); extern int32_t mm_camera_request_buf(mm_camera_obj_t * my_obj, mm_camera_reg_buf_t *buf); -extern int32_t mm_camera_enqueue_buf(mm_camera_obj_t * my_obj, mm_camera_reg_buf_t *buf); extern int32_t mm_camera_prepare_buf(mm_camera_obj_t * my_obj, mm_camera_reg_buf_t *buf); extern int32_t mm_camera_unprepare_buf(mm_camera_obj_t * my_obj, mm_camera_channel_type_t ch_type); extern int mm_camera_poll_thread_launch(mm_camera_obj_t * my_obj, int ch_type); |