diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-07-18 23:21:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-18 23:21:18 +0000 |
| commit | ccb835ba267e927f7df759290bd46ac78712a3b2 (patch) | |
| tree | e14af6bae5a118dfb2719a58ca47c0bb4c7c6ae2 | |
| parent | 8ff1e5f1e3e24baf311e6263b48f389c206f14ac (diff) | |
| parent | 0049ee8925212a3a5ff095a8a66cab184adf8f1b (diff) | |
| download | android_device_generic_goldfish-ccb835ba267e927f7df759290bd46ac78712a3b2.tar.gz android_device_generic_goldfish-ccb835ba267e927f7df759290bd46ac78712a3b2.tar.bz2 android_device_generic_goldfish-ccb835ba267e927f7df759290bd46ac78712a3b2.zip | |
Merge "Camera2/3: Update static metadata"
| -rw-r--r-- | camera/EmulatedFakeCamera2.cpp | 13 | ||||
| -rw-r--r-- | camera/EmulatedFakeCamera3.cpp | 13 | ||||
| -rw-r--r-- | camera/fake-pipeline2/Sensor.cpp | 3 | ||||
| -rw-r--r-- | camera/fake-pipeline2/Sensor.h | 2 |
4 files changed, 10 insertions, 21 deletions
diff --git a/camera/EmulatedFakeCamera2.cpp b/camera/EmulatedFakeCamera2.cpp index f7e8ed0..62f4e9f 100644 --- a/camera/EmulatedFakeCamera2.cpp +++ b/camera/EmulatedFakeCamera2.cpp @@ -2201,11 +2201,6 @@ status_t EmulatedFakeCamera2::constructStaticInfo( 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)); - // Identity transform static const int32_t geometricCorrectionMapSize[] = {2, 2}; ADD_OR_SIZE(ANDROID_LENS_INFO_GEOMETRIC_CORRECTION_MAP_SIZE, @@ -2248,10 +2243,10 @@ status_t EmulatedFakeCamera2::constructStaticInfo( 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); diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp index 154cbc6..0274aad 100644 --- a/camera/EmulatedFakeCamera3.cpp +++ b/camera/EmulatedFakeCamera3.cpp @@ -1062,11 +1062,6 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { info.update(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 }; - info.update(ANDROID_LENS_INFO_SHADING_MAP, lensShadingMap, - sizeof(lensShadingMap)/sizeof(float)); - // Identity transform static const int32_t geometricCorrectionMapSize[] = {2, 2}; info.update(ANDROID_LENS_INFO_GEOMETRIC_CORRECTION_MAP_SIZE, @@ -1109,10 +1104,10 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { info.update(ANDROID_SENSOR_INFO_MAX_FRAME_DURATION, &Sensor::kFrameDurationRange[1], 1); - info.update(ANDROID_SENSOR_INFO_AVAILABLE_SENSITIVITIES, - (int32_t*)Sensor::kAvailableSensitivities, - sizeof(Sensor::kAvailableSensitivities) - /sizeof(uint32_t)); + info.update(ANDROID_SENSOR_INFO_SENSITIVITY_RANGE, + Sensor::kSensitivityRange, + sizeof(Sensor::kSensitivityRange) + /sizeof(int32_t)); info.update(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT, &Sensor::kColorFilterArrangement, 1); diff --git a/camera/fake-pipeline2/Sensor.cpp b/camera/fake-pipeline2/Sensor.cpp index 3f9f318..91fe9ab 100644 --- a/camera/fake-pipeline2/Sensor.cpp +++ b/camera/fake-pipeline2/Sensor.cpp @@ -77,8 +77,7 @@ const float Sensor::kReadNoiseVarAfterGain = const nsecs_t Sensor::kRowReadoutTime = Sensor::kFrameDurationRange[0] / Sensor::kResolution[1]; -const uint32_t Sensor::kAvailableSensitivities[5] = - {100, 200, 400, 800, 1600}; +const int32_t Sensor::kSensitivityRange[2] = {100, 1600}; const uint32_t Sensor::kDefaultSensitivity = 100; /** A few utility functions for math, normal distributions */ diff --git a/camera/fake-pipeline2/Sensor.h b/camera/fake-pipeline2/Sensor.h index 8e2ffe8..33a8861 100644 --- a/camera/fake-pipeline2/Sensor.h +++ b/camera/fake-pipeline2/Sensor.h @@ -186,7 +186,7 @@ class Sensor: private Thread, public virtual RefBase { // 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; private: |