diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-07-17 18:06:25 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2013-07-18 15:28:22 -0700 |
| commit | 4eb2f24ae7aab13ad9fbcd3117a42430e0c3c41f (patch) | |
| tree | d36caed8f403b52b2ba39ba351aaad1e5d64f769 /libcamera2 | |
| parent | 42d7de5d0b1e454c939efe7c271796c5b982f009 (diff) | |
| download | exynos5-4eb2f24ae7aab13ad9fbcd3117a42430e0c3c41f.tar.gz | |
Camera2: Update static camera metadata
Change-Id: Ia2ad2879446e3e03e9c120f38d5d68ed6d35231d
Diffstat (limited to 'libcamera2')
| -rw-r--r-- | libcamera2/ExynosCamera2.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libcamera2/ExynosCamera2.cpp b/libcamera2/ExynosCamera2.cpp index 3ae6590..f3bab00 100644 --- a/libcamera2/ExynosCamera2.cpp +++ b/libcamera2/ExynosCamera2.cpp @@ -74,15 +74,14 @@ public: // if there's a reasonable number of rows. static const nsecs_t kRowReadoutTime; - static const uint32_t kAvailableSensitivities[5]; + static const int32_t kSensitivityRange[2]; static const uint32_t kDefaultSensitivity; }; -const uint32_t Sensor::kAvailableSensitivities[5] = - {100, 200, 400, 800, 1600}; +const int32_t Sensor::kSensitivityRange[2] = {100, 1600}; const nsecs_t Sensor::kExposureTimeRange[2] = {1000L, 30000000000L} ; // 1 us - 30 sec const nsecs_t Sensor::kFrameDurationRange[2] = @@ -422,11 +421,6 @@ status_t ExynosCamera2::constructStaticInfo(camera_metadata_t **info, ADD_OR_SIZE(ANDROID_LENS_INFO_SHADING_MAP_SIZE, lensShadingMapSize, sizeof(lensShadingMapSize)/sizeof(int32_t)); - static const float lensShadingMap[3 * 1 * 1 ] = - { 1.f, 1.f, 1.f }; - ADD_OR_SIZE(ANDROID_LENS_INFO_SHADING_MAP, lensShadingMap, - sizeof(lensShadingMap)/sizeof(float)); - int32_t lensFacing = cameraId ? ANDROID_LENS_FACING_FRONT : ANDROID_LENS_FACING_BACK; ADD_OR_SIZE(ANDROID_LENS_FACING, &lensFacing, 1); @@ -438,10 +432,10 @@ status_t ExynosCamera2::constructStaticInfo(camera_metadata_t **info, ADD_OR_SIZE(ANDROID_SENSOR_INFO_MAX_FRAME_DURATION, &Sensor::kFrameDurationRange[1], 1); - ADD_OR_SIZE(ANDROID_SENSOR_INFO_AVAILABLE_SENSITIVITIES, - Sensor::kAvailableSensitivities, - sizeof(Sensor::kAvailableSensitivities) - /sizeof(uint32_t)); + ADD_OR_SIZE(ANDROID_SENSOR_INFO_SENSITIVITY_RANGE, + Sensor::kSensitivityRange, + sizeof(Sensor::kSensitivityRange) + /sizeof(int32_t)); ADD_OR_SIZE(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT, &Sensor::kColorFilterArrangement, 1); |