diff options
| -rw-r--r-- | camera/EmulatedFakeCamera2.cpp | 13 | ||||
| -rw-r--r-- | camera/EmulatedFakeCamera3.cpp | 17 | ||||
| -rw-r--r-- | camera/fake-pipeline2/Sensor.cpp | 3 | ||||
| -rw-r--r-- | camera/fake-pipeline2/Sensor.h | 2 | ||||
| -rw-r--r-- | fstab.goldfish | 7 | ||||
| -rw-r--r-- | init.goldfish.rc | 3 |
6 files changed, 20 insertions, 25 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 ae4716c..0274aad 100644 --- a/camera/EmulatedFakeCamera3.cpp +++ b/camera/EmulatedFakeCamera3.cpp @@ -190,7 +190,7 @@ status_t EmulatedFakeCamera3::connectCamera(hw_device_t** device) { mControlMode = ANDROID_CONTROL_MODE_AUTO; mFacePriority = false; - mAeMode = ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH; + mAeMode = ANDROID_CONTROL_AE_MODE_ON; mAfMode = ANDROID_CONTROL_AF_MODE_AUTO; mAwbMode = ANDROID_CONTROL_AWB_MODE_AUTO; mAeState = ANDROID_CONTROL_AE_STATE_INACTIVE; @@ -672,7 +672,7 @@ const camera_metadata_t* EmulatedFakeCamera3::constructDefaultRequestSettings( static const uint8_t sceneMode = ANDROID_CONTROL_SCENE_MODE_FACE_PRIORITY; settings.update(ANDROID_CONTROL_SCENE_MODE, &sceneMode, 1); - static const uint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH; + static const uint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON; settings.update(ANDROID_CONTROL_AE_MODE, &aeMode, 1); static const uint8_t aeLock = ANDROID_CONTROL_AE_LOCK_OFF; @@ -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: diff --git a/fstab.goldfish b/fstab.goldfish index 7bfef7a..ffc95d2 100644 --- a/fstab.goldfish +++ b/fstab.goldfish @@ -1,5 +1,8 @@ # Android fstab file. -#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> +#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> # The filesystem that contains the filesystem checker binary (typically /system) cannot # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -/devices/platform/goldfish_mmc.0 /storage/sdcard vfat defaults voldmanaged=sdcard:auto +/dev/block/mtdblock0 /system ext4 ro,barrier=1 wait +/dev/block/mtdblock1 /data ext4 noatime,nosuid,nodev,barrier=1,nomblk_io_submit wait,check +/dev/block/mtdblock2 /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check +/devices/platform/goldfish_mmc.0 /storage/sdcard vfat defaults voldmanaged=sdcard:auto diff --git a/init.goldfish.rc b/init.goldfish.rc index 2eb4e7c..93c6b3e 100644 --- a/init.goldfish.rc +++ b/init.goldfish.rc @@ -60,6 +60,9 @@ on boot # supported, and arbitrary breakage may result if you specify # something else. +on fs + mount_all /fstab.goldfish + service goldfish-setup /system/etc/init.goldfish.sh user root group root |