merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/QCameraHWI.cpp b/QCameraHWI.cpp
index d5e67ec..cd14417 100644
--- a/QCameraHWI.cpp
+++ b/QCameraHWI.cpp
@@ -158,7 +158,7 @@
mFaceDetectOn(0),
mDisEnabled(0),
mZoomSupported(false),
- mFullLiveshotEnabled(true),
+ mFullLiveshotEnabled(false),
mRecordingHint(false),
mAppRecordingHint(false),
mStatsOn(0), mCurrentHisto(-1), mSendData(false), mStatHeap(NULL),
@@ -212,7 +212,7 @@
property_get("persist.camera.hal.multitouchaf", value, "0");
mMultiTouch = atoi(value);
- property_get("persist.camera.full.liveshot", value, "1");
+ property_get("persist.camera.full.liveshot", value, "0");
mFullLiveshotEnabled = atoi(value);
property_get("persist.camera.hal.dis", value, "0");
@@ -1088,16 +1088,6 @@
}
}
- if (mRecordingHint) {
- //set the fullsize liveshot to True in Camcorder Mode
- mFullLiveshotEnabled = true;
- mStreamSnap->setFullSizeLiveshot(mFullLiveshotEnabled);
- }else{
- //set the fullsize liveshot to False in Camera Mode
- mFullLiveshotEnabled = false;
- mStreamSnap->setFullSizeLiveshot(mFullLiveshotEnabled);
- }
-
if (mHasAutoFocusSupport && strcmp(str, "auto")) {
int cafSupport = true;
int caf_type = 2;
@@ -1233,6 +1223,15 @@
mRecordingHint = false;
}
+ const char * str_fd = mParameters.get(QCameraParameters::KEY_FACE_DETECTION);
+ if((str_fd != NULL) && !strcmp(str_fd, "on")){
+ if(supportsFaceDetection() == false){
+ ALOGE("Face detection support is not available");
+ }
+ setFaceDetection("off");
+ runFaceDetection();
+ }
+
switch(mPreviewState) {
case QCAMERA_HAL_PREVIEW_START:
//mPreviewWindow = NULL;
@@ -1252,14 +1251,6 @@
default:
break;
}
- const char * str_fd = mParameters.get(QCameraParameters::KEY_FACE_DETECTION);
- if((str != NULL) && !strcmp(str_fd, "on")){
- if(supportsFaceDetection() == false){
- ALOGE("Face detection support is not available");
- }
- setFaceDetection("off");
- runFaceDetection();
- }
ALOGV("stopPreview: X, mPreviewState = %d", mPreviewState);
}
@@ -1739,9 +1730,6 @@
ALOGE("takePicture : Duplicate TakePicture Call");
return ret;
}
- mFullLiveshotEnabled = true;
- setFullLiveshot();
- mStreamSnap->setFullSizeLiveshot(mFullLiveshotEnabled);
if (canTakeFullSizeLiveshot()) {
ALOGV(" Calling takeFullSizeLiveshot");
takeFullSizeLiveshot();
@@ -2702,10 +2690,6 @@
mRecordingHint = true;
setRecordingHintValue(mRecordingHint);
- mFullLiveshotEnabled = true;
- setFullLiveshot();
- mStreamSnap->setFullSizeLiveshot(mFullLiveshotEnabled);
-
mDimension.display_width = mPreviewWidth;
mDimension.display_height= mPreviewHeight;
mDimension.orig_video_width = mVideoWidth;
diff --git a/QCameraHWI_Parm.cpp b/QCameraHWI_Parm.cpp
index 97da6e2..7fe9776 100644
--- a/QCameraHWI_Parm.cpp
+++ b/QCameraHWI_Parm.cpp
@@ -587,8 +587,8 @@
return false;
}
else{
- ALOGV("%s: Still mode : FD supported",__func__);
rc = cam_config_is_parm_supported(mCameraId,MM_CAMERA_PARM_FD);
+ ALOGV("%s: Still mode : FD supported : %d",__func__,rc);
return rc;
}
}
@@ -1025,6 +1025,7 @@
//8960 supports Power modes : Low power, Normal Power.
mParameters.set("power-mode-supported", "true");
+
//Set Live shot support
rc = cam_config_is_parm_supported(mCameraId, MM_CAMERA_PARM_LIVESHOT_MAIN);
if(!rc) {
@@ -1034,8 +1035,9 @@
mParameters.set("video-snapshot-supported", "true");
}
+
//Set default power mode
- mParameters.set(QCameraParameters::KEY_POWER_MODE,"Normal_Power");
+ mParameters.set(QCameraParameters::KEY_POWER_MODE,"Low_Power");
//Set Wnr on
mParameters.set(QCameraParameters::KEY_DENOISE,true);
//Set Camera Mode
