commit 3acad5d59e8d8701464100b514cc5d28ed302585
author Linux Build Service Account <lnxbuild@localhost> Tue Feb 12 22:37:12 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Feb 12 22:37:12 2013 -0800
tree 9e4f4da04d851a6755662743b0a38a5206fe2166
parent e7ef9b111037693cb6ddfeba97ec503dd0075161
parent fc68b9b8165bc0583a0fbd387c0b1a5eb4c1781d

Merge "camera: Handle the condition where thumb is greater than main dimension"

QCamera2/stack/common/cam_intf.h

diff --git a/QCamera2/stack/common/cam_intf.h b/QCamera2/stack/common/cam_intf.h
index 41004ce..a978c10 100755
--- a/QCamera2/stack/common/cam_intf.h
+++ b/QCamera2/stack/common/cam_intf.h
@@ -30,6 +30,7 @@
 #ifndef __QCAMERA_INTF_H__
 #define __QCAMERA_INTF_H__
 
+#include <media/msmb_isp.h>
 #include "cam_types.h"
 
 #define CAM_PRIV_IOCTL_BASE (V4L2_CID_PRIVATE_BASE + 14)
@@ -257,6 +258,7 @@
     INCLUDE(CAM_INTF_PARM_DIS_ENABLE,               int32_t,                     1);
     INCLUDE(CAM_INTF_PARM_HDR,                      cam_exp_bracketing_t,        1);
     INCLUDE(CAM_INTF_PARM_SET_BUNDLE,               cam_bundle_config_t,         1);
+    INCLUDE(CAM_INTF_PARM_FRAMESKIP,                int32_t,                     1);
 } parm_type_t;
 
 /****************************DO NOT MODIFY BELOW THIS LINE!!!!*********************/

QCamera2/stack/common/cam_types.h

diff --git a/QCamera2/stack/common/cam_types.h b/QCamera2/stack/common/cam_types.h
index d85753f..b431660 100644
--- a/QCamera2/stack/common/cam_types.h
+++ b/QCamera2/stack/common/cam_types.h
@@ -622,6 +622,7 @@
     CAM_INTF_PARM_DIS_ENABLE,
     CAM_INTF_PARM_HDR,
     CAM_INTF_PARM_SET_BUNDLE,
+    CAM_INTF_PARM_FRAMESKIP,
     CAM_INTF_PARM_MAX
 } cam_intf_parm_type_t;