diff options
| author | Alex Ray <aray@google.com> | 2013-10-03 22:56:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-03 22:56:27 +0000 |
| commit | 877105063c2a4f9050ea899fcff3843f39050ec6 (patch) | |
| tree | 14a44eb0e8ec981593900a05c2fa38c7bdc24e8e | |
| parent | a6302fad7a2d78736ae39a341b6f3468b9c6f5a3 (diff) | |
| parent | 1b2236edfaed20ebf8087a3017042989dfa7b1fe (diff) | |
| download | exynos5-877105063c2a4f9050ea899fcff3843f39050ec6.tar.gz | |
Merge "libcamera2: Static characteristic metadata fixes" into klp-dev
| -rw-r--r-- | libcamera2/ExynosCamera2.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libcamera2/ExynosCamera2.cpp b/libcamera2/ExynosCamera2.cpp index fe5f6bc..b57c477 100644 --- a/libcamera2/ExynosCamera2.cpp +++ b/libcamera2/ExynosCamera2.cpp @@ -425,6 +425,11 @@ status_t ExynosCamera2::constructStaticInfo(camera_metadata_t **info, ANDROID_LENS_FACING_FRONT : ANDROID_LENS_FACING_BACK; ADD_OR_SIZE(ANDROID_LENS_FACING, &lensFacing, 1); + // android.request + static const int32_t maxNumOutputStreams[] = {1, 3, 1}; + ADD_OR_SIZE(ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS, maxNumOutputStreams, + sizeof(maxNumOutputStreams)/sizeof(int32_t)); + // android.sensor ADD_OR_SIZE(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE, Sensor::kExposureTimeRange, 2); @@ -449,7 +454,9 @@ status_t ExynosCamera2::constructStaticInfo(camera_metadata_t **info, m_curCameraInfo->sensorW, m_curCameraInfo->sensorH }; ADD_OR_SIZE(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE, pixelArraySize, 2); - ADD_OR_SIZE(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE, pixelArraySize,2); + + int32_t activeArraySize[4] = { 0, 0, pixelArraySize[0], pixelArraySize[1]}; + ADD_OR_SIZE(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE, activeArraySize,4); ADD_OR_SIZE(ANDROID_SENSOR_INFO_WHITE_LEVEL, &Sensor::kMaxRawValue, 1); @@ -461,6 +468,10 @@ status_t ExynosCamera2::constructStaticInfo(camera_metadata_t **info, ADD_OR_SIZE(ANDROID_SENSOR_BLACK_LEVEL_PATTERN, blackLevelPattern, sizeof(blackLevelPattern)/sizeof(int32_t)); + static const int32_t orientation[1] = {0}; + ADD_OR_SIZE(ANDROID_SENSOR_ORIENTATION, + orientation, 1); + //TODO: sensor color calibration fields // android.flash |