summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CameraHal: Reduces Camera logcat printsEmilian Peev2012-02-114-12/+18
| | | | | Change-Id: Id32ad1b882a76f091866583b15ae0ca2929bacef Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* CameraHal: Various AF related fixesEmilian Peev2012-02-113-30/+24
| | | | | | | | | | | | | - In case of AF timeout the focus callback was being disabled. This callback will not get re-enabled again until preview is restarted. - Cancel AF is not working properly. Depending on the timing the off status event might not reach 'doAutoFocus()'. - This change also replaces the 'mDoAFSem' semaphore with a condition variable. Change-Id: I2ab7d87a05d97435aa6e67a122cc37a975794fc2 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* CameraHal: Avoid possible segfaults in 'setExtraData()'Emilian Peev2012-02-111-1/+2
| | | | | | | | | | | - There is a chance that the OMX component could get released while 'startImageCapture()' is still waiting for the shutter callback. In this case we should omit the extra data configuration. - Should fix bug: 5911295 Change-Id: I82344573e56d7b58f119f68905e2fa1eaa3d69fe Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* CameraHal: Implementation for CAF status callbacksTyler Luu2012-02-018-46/+141
| | | | | | | | | | | | | | | | | | 1. Remove internal handling of CAMERA_MSG_FOCUS. Before we were enabling CAMERA_MSG_FOCUS only when application calls autoFocus(). No longer needed since the CAMERA_MSG_FOCUS can come just during preview now. 2. Add handling of unregistered focus callbacks. Since OMXCamera will send callbacks even when we are not waiting for one, add some handling. Signed-off-by: Tyler Luu <tluu@ti.com> Change-Id: I457e67b33b2561dd0b1ce3863ce807a8c27f79f6 Conflicts: camera/OMXCameraAdapter/OMXFocus.cpp
* CameraHal: Fix timing issue with focus msg disableTyler Luu2012-02-011-2/+2
| | | | | | | | | | Disable focus message before sending notification because client can immediately call focus again after receiving notification and before we get a chance to disable the message. This will result in the focus notificiation for the subsequent focus call to be missed. Change-Id: I1367cdcebe490c32251e992b87ada3edf6b28036 Signed-off-by: Tyler Luu <tluu@ti.com>
* am c8ff5cfc: am 365552e5: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ | | | | | | * commit 'c8ff5cfca0c4724474d3fe33cab1d7b096a8252d':
| * am 365552e5: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ | | | | | | | | | * commit '365552e56ba53d0d4a870bc6cd7438200aa46d4e':
| | * Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I122d6683d3d0f84fcf9ac97e67d3bed9f1c1c6a7
* | | | fix a misspelled symbol nameJames Dong2012-01-311-1/+1
| | | | | | | | | | | | | | | | Change-Id: I4959e46173b7a5ddc656630cdcb652f5159fa2b6
* | | | don't vsync after swap since SF now is vsync'edMathias Agopian2012-01-241-9/+0
| | | | | | | | | | | | | | | | Change-Id: I2e0636c3a386203e0aaee8c97b1affa4ee96f699
* | | | Prevent duplicate DateTime tags in EXIF.Angus Kong2012-01-192-6/+4
| | | | | | | | | | | | | | | | | | | | bug:5766177 Change-Id: Ib60030374ffca8e27c814503621cc545f9132360
* | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0814-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I7d131473964d92c62a495d082a1207867f435885
* | | | Merge "Add a MODULE_LICENSE for the security subdir"Kenny Root2012-01-062-0/+0
|\ \ \ \
| * | | | Add a MODULE_LICENSE for the security subdirKenny Root2012-01-062-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6ff0478e34b0782265474bc2d0ddc0b80cf185dd
* | | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-052-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I71aea6795e3ed22beacb9a8f5774499e96c69a4d
* | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib3b6ce6a89755e29aa9f830e9185064c25dd138e
* | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-036-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I551e5a040249a8908251cd8c8d7131287f1f53de
* | | | am 1a99df36: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-200-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '1a99df369de18be732f99829ee3f38ef5c207a89':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-200-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I362f8b5a537784565d3212cfd76584f9f0971801
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-160-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am e1d6fcd8: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit 'e1d6fcd8ea172e239ef7397feeb0a393aad93556':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I997155ad9c7d9f96117f609a7bf2ce91b248f366
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-150-0/+0
| | |\ \
| | | * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-140-0/+0
| | | |\ \ | | | |/ / | | |/| / | | | |/
* | | | am 3500401f: am 82a05e51: Use local time in EXIF.Angus Kong2011-12-141-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3500401fabe4e4ce8f9e6e1cc503fdc87b3a2222': Use local time in EXIF.
| * | | am 82a05e51: Use local time in EXIF.Angus Kong2011-12-141-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '82a05e51a21a093bab579f8af8b4b8bec0542f90': Use local time in EXIF.
| | * | Use local time in EXIF.Angus Kong2011-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | UTC is only used in GPS time stamp and local time is used in other date/time field. bug: 5757809 Change-Id: I8c728dca9db003c6a750df300d993e3615ef71c8
* | | | am 10834dac: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '10834dacafd365431691d73bded10a5ce4d8d31b':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I3069de18c99d79dc23d36524e57d87cceaf60ece
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 40e6beac: am 449e98a9: hwc: set FB z-order when there are no hwc layersLajos Molnar2011-12-131-2/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '40e6beac1e9977ff2ca763e6e8abcc2463fa76cf': hwc: set FB z-order when there are no hwc layers
| * | | am 449e98a9: hwc: set FB z-order when there are no hwc layersLajos Molnar2011-12-131-2/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '449e98a958753e6ae8f16b923596af0c6783ff8a': hwc: set FB z-order when there are no hwc layers
| | * | hwc: set FB z-order when there are no hwc layersLajos Molnar2011-12-131-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are no layers passed to hwc, FB is still used, and z-order must be set. Change-Id: I7e45f56468b47712f7686b78ba0650943037c64a Signed-off-by: Lajos Molnar <lajos@ti.com>
* | | | am c7bdd444: am 0aead355: hwc: added static image supportLajos Molnar2011-12-132-3/+169
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c7bdd44463cd9b32a3d6a5647beaff541a5e29f7': hwc: added static image support
| * | | am 0aead355: hwc: added static image supportLajos Molnar2011-12-132-3/+169
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0aead355133c2a087cb369c5eb62a07cbd4a13be': hwc: added static image support
| | * | hwc: added static image supportLajos Molnar2011-12-132-3/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display static image if connected to portrait dock and there are no dockable layers. Change-Id: I572cf9ef5bf66ac194c3a83920a8de3be1e6d4e4 Signed-off-by: Lajos Molnar <lajos@ti.com>
* | | | am 252f905d: am 12c821db: hwc: update to new addressing mode handlingErik Gilling2011-12-131-4/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '252f905d197c5f385d21686a4368ab1114b84e39': hwc: update to new addressing mode handling
| * | | am 12c821db: hwc: update to new addressing mode handlingErik Gilling2011-12-131-4/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '12c821dbf70ee94bd9702e7cb60c66c8156c83d6': hwc: update to new addressing mode handling
| | * | hwc: update to new addressing mode handlingErik Gilling2011-12-131-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify Post2 and cloned layers. Fix potential overflow in zorder of cloned (dock) layer. Change-Id: I534fe30e6b90415070824ceb7abff65e9b93c9ec Signed-off-by: Lajos Molnar <lajos@ti.com> Conflicts: hwc/hwc.c
* | | | am d67c10c5: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-120-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit 'd67c10c5c9bede30dc9937cce2cea8b7813cf944':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I2df8e825cb35142b0964aa9fb1b13517d7387ccf
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| | |\ \ | | | |/ | | |/|
* | | | CameraHal: Add missing null check in OMX3ATyler Luu2011-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for null before strcmp b/5639860 Change-Id: I552213c9894679eeb64cd06419f3f430276b273e Signed-off-by: Tyler Luu <tluu@ti.com>
* | | | am 04a0e38d: am 2b86fd0c: hwc: add support for forced docking (in the dock)Lajos Molnar2011-12-121-7/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '04a0e38d7c4d8a94fbc84eac36cb6d06412cd7b7': hwc: add support for forced docking (in the dock)
| * | | am 2b86fd0c: hwc: add support for forced docking (in the dock)Lajos Molnar2011-12-081-7/+30
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2b86fd0cbeb42123fc20b1f646ee81299e831d16': hwc: add support for forced docking (in the dock)
| | * | hwc: add support for forced docking (in the dock)Lajos Molnar2011-12-081-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the dock switch is set high, mirroring is disabled and docking transformation is set to 0. Change-Id: Ief0f14874459f3ff435e6b43088f524af322524f Signed-off-by: Lajos Molnar <lajos@ti.com>
* | | | am 5119962c: am e14d5293: hwc: extract HDMI mode scoring functionLajos Molnar2011-12-121-24/+49
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5119962cd2520a3e4d3f2a2a15d6596c28fba04f': hwc: extract HDMI mode scoring function
| * | | am e14d5293: hwc: extract HDMI mode scoring functionLajos Molnar2011-12-081-24/+49
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e14d52936107e390e2464df1e6653efde5409096': hwc: extract HDMI mode scoring function
| | * | hwc: extract HDMI mode scoring functionLajos Molnar2011-12-081-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate HDMI mode scoring function so that it is easier to modify. Also changed scoring function to be cumulative instead of absolute, so that priorities of the sub-scores can be easily changed. Change-Id: I3f803c13c1482653b8a3fb26a47a8fefecc51b4b
* | | | am 20e79c05: am 3837de4f: hwc: refactor prepare: extract out hdmi cloning ↵Lajos Molnar2011-12-121-92/+108
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | methods * commit '20e79c05615092da8f48d8ca41745d0c9c5479ce': hwc: refactor prepare: extract out hdmi cloning methods