diff options
| author | Alex Ray <aray@google.com> | 2013-06-13 23:15:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-13 23:15:59 +0000 |
| commit | a28a10c618e90db32e5ebf4927484fdcbda89840 (patch) | |
| tree | ea9408b959e79e2cb14e9ba6947106e7b2348049 /services | |
| parent | 04411d3ed343added179703837c6c24444acce3b (diff) | |
| parent | 03e6579fc8d853ab6dd6b8ece10ebf4d434b1e17 (diff) | |
| download | frameworks_av-a28a10c618e90db32e5ebf4927484fdcbda89840.zip frameworks_av-a28a10c618e90db32e5ebf4927484fdcbda89840.tar.gz frameworks_av-a28a10c618e90db32e5ebf4927484fdcbda89840.tar.bz2 | |
Merge "camera2: accept 4-value active array size"
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index a567c15..e8f3f50 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -837,10 +837,17 @@ String8 Parameters::get() const { status_t Parameters::buildFastInfo() { camera_metadata_ro_entry_t activeArraySize = - staticInfo(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE, 2, 2); + staticInfo(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE, 2, 4); if (!activeArraySize.count) return NO_INIT; - int32_t arrayWidth = activeArraySize.data.i32[0]; - int32_t arrayHeight = activeArraySize.data.i32[1]; + int32_t arrayWidth; + int32_t arrayHeight; + if (activeArraySize.count == 2) { + arrayWidth = activeArraySize.data.i32[0]; + arrayHeight = activeArraySize.data.i32[1]; + } else if (activeArraySize.count == 4) { + arrayWidth = activeArraySize.data.i32[2]; + arrayHeight = activeArraySize.data.i32[3]; + } else return NO_INIT; camera_metadata_ro_entry_t availableFaceDetectModes = staticInfo(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES, 0, 0, |