Camera: HAL: Initialize camera parameters to their
default values.
Some camera parameters are not initialized to their default values.
Set them to their default values in initDefaultParameters().
Check for mPostViewHeap only if the target is 7630, since mPostViewHeap
is used only for 7630.
diff --git a/QualcommCameraHardware.cpp b/QualcommCameraHardware.cpp
index edad7e2..01bbb44 100644
--- a/QualcommCameraHardware.cpp
+++ b/QualcommCameraHardware.cpp
@@ -791,6 +791,13 @@
mParameters.set(CameraParameters::KEY_PICTURE_FORMAT,
CameraParameters::PIXEL_FORMAT_JPEG);
+ mParameters.set(CameraParameters::KEY_SHARPNESS,
+ CAMERA_DEF_SHARPNESS);
+ mParameters.set(CameraParameters::KEY_CONTRAST,
+ CAMERA_DEF_CONTRAST);
+ mParameters.set(CameraParameters::KEY_SATURATION,
+ CAMERA_DEF_SATURATION);
+
mParameters.set(CameraParameters::KEY_ISO_MODE,
CameraParameters::ISO_AUTO);
mParameters.set(CameraParameters::KEY_LENSSHADE,
@@ -1577,25 +1584,26 @@
LOGE("initPreview X: could not initialize Camera preview heap.");
return false;
}
- if( (!strncmp(mDeviceName,"msm7630", 7))
- && (mPostViewHeap == NULL)) {
- mPreviewHeap = NULL;
- LOGV(" Allocating Postview heap ");
- /* mPostViewHeap should be declared only for 7630 target */
- mPostViewHeap =
- new PmemPool("/dev/pmem_adsp",
- MemoryHeapBase::READ_ONLY | MemoryHeapBase::NO_CACHING,
- mCameraControlFd,
- MSM_PMEM_OUTPUT2,
- mPreviewFrameSize,
- 1,
- mPreviewFrameSize,
- "postview");
+ if( !strncmp(mDeviceName,"msm7630", 7) ) {
+ mPreviewHeap = NULL;
+ if(mPostViewHeap == NULL) {
+ LOGV(" Allocating Postview heap ");
+ /* mPostViewHeap should be declared only for 7630 target */
+ mPostViewHeap =
+ new PmemPool("/dev/pmem_adsp",
+ MemoryHeapBase::READ_ONLY | MemoryHeapBase::NO_CACHING,
+ mCameraControlFd,
+ MSM_PMEM_OUTPUT2,
+ mPreviewFrameSize,
+ 1,
+ mPreviewFrameSize,
+ "postview");
- if (!mPostViewHeap->initialized()) {
- mPostViewHeap.clear();
- LOGE(" Failed to initialize Postview Heap");
- return false;
+ if (!mPostViewHeap->initialized()) {
+ mPostViewHeap.clear();
+ LOGE(" Failed to initialize Postview Heap");
+ return false;
+ }
}
} else {
mPreviewHeap = new PmemPool("/dev/pmem_adsp",