diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-24 16:50:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-24 16:50:45 -0700 |
| commit | 1a0a26a27a60b0379ff80b156100bacff4aad42a (patch) | |
| tree | bb1cffbd52ddc871395ef8f35b7e0a0c87b9966f | |
| parent | 344c6c8f9fbcb919eed771486d02596f150ccbaf (diff) | |
| parent | 87ce3426077d16b6bd5b613bcacb209edfc35481 (diff) | |
| download | android_device_generic_goldfish-1a0a26a27a60b0379ff80b156100bacff4aad42a.tar.gz android_device_generic_goldfish-1a0a26a27a60b0379ff80b156100bacff4aad42a.tar.bz2 android_device_generic_goldfish-1a0a26a27a60b0379ff80b156100bacff4aad42a.zip | |
am 87ce3426: am 30717de9: camera3: Make front cameras limited mode, back cameras full mode
* commit '87ce3426077d16b6bd5b613bcacb209edfc35481':
camera3: Make front cameras limited mode, back cameras full mode
| -rw-r--r-- | camera/EmulatedFakeCamera3.cpp | 14 | ||||
| -rw-r--r-- | camera/EmulatedFakeCamera3.h | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp index a321218..ae4716c 100644 --- a/camera/EmulatedFakeCamera3.cpp +++ b/camera/EmulatedFakeCamera3.cpp @@ -129,6 +129,12 @@ EmulatedFakeCamera3::EmulatedFakeCamera3(int cameraId, bool facingBack, for (size_t i = 0; i < CAMERA3_TEMPLATE_COUNT; i++) { mDefaultTemplates[i] = NULL; } + + /** + * Front cameras = limited mode + * Back cameras = full mode + */ + mFullMode = facingBack; } EmulatedFakeCamera3::~EmulatedFakeCamera3() { @@ -1323,6 +1329,14 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { info.update(ANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES, availableVstabModes, sizeof(availableVstabModes)); + // android.info + const uint8_t supportedHardwareLevel = + mFullMode ? ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL : + ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED; + info.update(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL, + &supportedHardwareLevel, + /*count*/1); + mCameraInfo = info.release(); return OK; diff --git a/camera/EmulatedFakeCamera3.h b/camera/EmulatedFakeCamera3.h index e9ef184..0889813 100644 --- a/camera/EmulatedFakeCamera3.h +++ b/camera/EmulatedFakeCamera3.h @@ -159,6 +159,9 @@ private: /* Facing back (true) or front (false) switch. */ bool mFacingBack; + /* Full mode (true) or limited mode (false) switch */ + bool mFullMode; + /** * Cache for default templates. Once one is requested, the pointer must be * valid at least until close() is called on the device |