diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2015-06-23 23:33:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 23:33:36 +0000 |
commit | ec5d6f84d4d91602920e606e7683dee6d9d433f1 (patch) | |
tree | f0ff0fd871a8fe2b8d5da005e41ffaa265a411ba | |
parent | 55a2dcce3a409393dc51ab2eb433914331f2df51 (diff) | |
parent | a3b3caaae3fc23b99c5c455ee429f79c270cfbae (diff) | |
download | frameworks_av-ec5d6f84d4d91602920e606e7683dee6d9d433f1.zip frameworks_av-ec5d6f84d4d91602920e606e7683dee6d9d433f1.tar.gz frameworks_av-ec5d6f84d4d91602920e606e7683dee6d9d433f1.tar.bz2 |
Merge "Add default for pre-distortion active array." into mnc-dev
-rw-r--r-- | services/camera/libcameraservice/common/CameraModule.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/common/CameraModule.cpp b/services/camera/libcameraservice/common/CameraModule.cpp index fcbf958..85d4488 100644 --- a/services/camera/libcameraservice/common/CameraModule.cpp +++ b/services/camera/libcameraservice/common/CameraModule.cpp @@ -132,6 +132,15 @@ void CameraModule::deriveCameraCharacteristicsKeys( highSpeedConfig); } } + + // Always add a default for the pre-correction active array if the vendor chooses to omit this + camera_metadata_entry entry = chars.find(ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE); + if (entry.count == 0) { + entry = chars.find(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE); + chars.update(ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE, entry.data.i32, + entry.count); + } + return; } |