summaryrefslogtreecommitdiffstats
path: root/camera/inc
diff options
context:
space:
mode:
authorZiyan <jaraidaniel@gmail.com>2016-02-06 14:10:14 +0100
committerZiyan <jaraidaniel@gmail.com>2016-02-10 20:12:45 +0100
commit522c9cceeb130974a0621e7c5ce794ff046b5412 (patch)
tree156cd277249d0f668b6b4001e3b255c59637a21c /camera/inc
parenta3e97a7d54e4e13ab4a2c547a05eb03c2e3d7559 (diff)
downloaddevice_samsung_tuna-522c9cceeb130974a0621e7c5ce794ff046b5412.zip
device_samsung_tuna-522c9cceeb130974a0621e7c5ce794ff046b5412.tar.gz
device_samsung_tuna-522c9cceeb130974a0621e7c5ce794ff046b5412.tar.bz2
camera: update default zoom in video mode to workaround pink lines
Change-Id: Ie1001438fb90b8f6a3991a14e0f11968eb2d1ac9
Diffstat (limited to 'camera/inc')
-rw-r--r--camera/inc/OMXCameraAdapter/OMXCameraAdapter.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index 10590df..5f0433c 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -536,6 +536,9 @@ private:
//Digital zoom
status_t setParametersZoom(const android::CameraParameters &params,
BaseCameraAdapter::AdapterState state);
+#ifdef CAMERAHAL_TUNA
+ int32_t getZoomStep(int index);
+#endif
status_t doZoom(int index);
status_t advanceZoom();
@@ -1093,7 +1096,7 @@ private:
//current zoom
android::Mutex mZoomLock;
unsigned int mCurrentZoomIdx, mTargetZoomIdx, mPreviousZoomIndx;
- bool mZoomUpdating, mZoomUpdate;
+ bool mZoomUpdating, mZoomUpdate, mPrevZoomModeIsVideo;
int mZoomInc;
bool mReturnZoomStatus;
static const int32_t ZOOM_STEPS [];
@@ -1196,7 +1199,7 @@ private:
android::Mutex mDoAFMutex;
android::Condition mDoAFCond;
- size_t mSensorIndex;
+ size_t mSensorIndex, mPrevZoomSensorIndex;
CodingMode mCodingMode;
// Time source delta of ducati & system time