commit be494d19b61b202bc071ec8f6bc5d395ebf397bb
author Sungjoong Kang <sj3.kang@samsung.com> Sat Aug 04 15:36:56 2012 -0700
committer Rebecca Schultz Zavin <rebecca@android.com> Tue Aug 07 15:16:34 2012 -0700
tree a8da946996ce39ec1c8b7efa392b5c110ae1eb26
parent 304a1f91d0abd919994d3b2dc2d66060c36e109f

hardware: samsung_slsi: libcamera2: Stability Fix and code clean-up

Clean-up unused codes and logs.
Resolves instability caused by frame sync error.
Unifies internal data structure.

Change-Id: I29a220e29b5856a42f0727427f9e8af10848500c
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

libcamera2/ExynosCameraHWInterface2.h

diff --git a/libcamera2/ExynosCameraHWInterface2.h b/libcamera2/ExynosCameraHWInterface2.h
index 9e85236..6d70524 100644
--- a/libcamera2/ExynosCameraHWInterface2.h
+++ b/libcamera2/ExynosCameraHWInterface2.h
@@ -102,8 +102,9 @@
     int buffers;
     enum v4l2_memory memory;
     enum v4l2_buf_type type;
-	ion_client ionClient;
-	ExynosBuffer	buffer[NUM_MAX_CAMERA_BUFFERS];
+    ion_client ionClient;
+    ExynosBuffer buffer[NUM_MAX_CAMERA_BUFFERS];
+    bool streamOn;
 } node_info_t;
 
 
@@ -122,14 +123,14 @@
 typedef enum request_entry_status {
     EMPTY,
     REGISTERED,
-    PROCESSING
+    REQUESTED,
+    CAPTURED
 } request_entry_status_t;
 
 typedef struct request_manager_entry {
     request_entry_status_t      status;
     camera_metadata_t           *original_request;
-    // TODO : allocate memory dynamically
-    camera2_ctl_metadata_NEW_t  internal_shot;
+    struct camera2_shot_ext     internal_shot;
     int                         output_stream_count;
     bool                         dynamic_meta_vaild;
 } request_manager_entry_t;
@@ -245,17 +246,18 @@
             uint32_t                usage;
             int                     numHwBuffers;
             int                     numSvcBuffers;
+            int                     numOwnSvcBuffers;
             int                     fd;
             int                     svcPlanes;
             int                     nodePlanes;
     enum v4l2_memory                memory;
     enum v4l2_buf_type              halBuftype;
-
+            int                     numSvcBufsInHal;
             buffer_handle_t         svcBufHandle[NUM_MAX_CAMERA_BUFFERS];
             ExynosBuffer            svcBuffers[NUM_MAX_CAMERA_BUFFERS];
             int                     svcBufStatus[NUM_MAX_CAMERA_BUFFERS];
-
-	        ion_client              ionClient;
+            int                     svcBufIndex;
+            ion_client              ionClient;
             node_info_t             node;
 } stream_parameters_t;
 
@@ -266,12 +268,13 @@
     const   camera2_stream_ops_t*   streamOps;
             uint32_t                usage;
             int                     numSvcBuffers;
+            int                     numOwnSvcBuffers;
             int                     svcPlanes;
             buffer_handle_t         svcBufHandle[NUM_MAX_CAMERA_BUFFERS];
             ExynosBuffer            svcBuffers[NUM_MAX_CAMERA_BUFFERS];
             int                     svcBufStatus[NUM_MAX_CAMERA_BUFFERS];
-            int                     m_svcBufIndex;
-            int                     numBufsInHal;
+            int                     svcBufIndex;
+            int                     numSvcBufsInHal;
 } record_parameters_t;
 
 class ExynosCameraHWInterface2 : public virtual RefBase {
@@ -473,7 +476,6 @@
     bool                                m_closing;
     ExynosBuffer                        m_resizeBuf;
     ExynosBuffer                        m_resizeBuf2;    
-    int                                 m_svcBufIndex;
     bool                                m_recordingEnabled;
     int                                 m_previewOutput;
     int                                 m_recordOutput;
@@ -482,7 +484,6 @@
     int             				    m_cameraId;
     bool                                m_scp_closing;
     bool                                m_scp_closed;
-    bool                                m_sensor_drop;
     
 };