diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-09 15:22:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-09 15:22:47 -0700 |
commit | a70995f9dec3c2915792113c9c228b5b6474a915 (patch) | |
tree | 93e3388f2b427702e7b9a3cb6bece874ddb9caf5 /services/camera | |
parent | 9436ff8d852306fb1160170b1cb8613d840df637 (diff) | |
parent | 4cc45fa65659ff8771a185e4f4584a9b0da10247 (diff) | |
download | frameworks_av-a70995f9dec3c2915792113c9c228b5b6474a915.zip frameworks_av-a70995f9dec3c2915792113c9c228b5b6474a915.tar.gz frameworks_av-a70995f9dec3c2915792113c9c228b5b6474a915.tar.bz2 |
Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
Diffstat (limited to 'services/camera')
-rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 199e525..05494d3 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -271,6 +271,10 @@ status_t Parameters::initialize(const CameraMetadata *info) { jpegRotation); gpsEnabled = false; + gpsCoordinates[0] = 0.0; + gpsCoordinates[1] = 0.0; + gpsCoordinates[2] = 0.0; + gpsTimestamp = 0; gpsProcessingMethod = "unknown"; // GPS fields in CameraParameters are not set by implementation @@ -742,12 +746,14 @@ status_t Parameters::initialize(const CameraMetadata *info) { params.set(CameraParameters::KEY_VIDEO_FRAME_FORMAT, CameraParameters::PIXEL_FORMAT_ANDROID_OPAQUE); + recordingHint = false; params.set(CameraParameters::KEY_RECORDING_HINT, CameraParameters::FALSE); params.set(CameraParameters::KEY_VIDEO_SNAPSHOT_SUPPORTED, CameraParameters::TRUE); + videoStabilization = false; params.set(CameraParameters::KEY_VIDEO_STABILIZATION, CameraParameters::FALSE); @@ -772,10 +778,12 @@ status_t Parameters::initialize(const CameraMetadata *info) { enableFocusMoveMessages = false; afTriggerCounter = 1; currentAfTriggerId = -1; + afInMotion = false; precaptureTriggerCounter = 1; previewCallbackFlags = 0; + previewCallbackOneShot = false; char value[PROPERTY_VALUE_MAX]; property_get("camera.disable_zsl_mode", value, "0"); |