summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice
Commit message (Collapse)AuthorAgeFilesLines
...
* | Camera2: Only _some_ FPS values in the old API are scaled.Eino-Ville Talvala2012-09-272-3/+6
| | | | | | | | | | | | | | The (deprecated) single-FPS parameter is not scaled by 1000. Bug: 7230239 Change-Id: I5664cce90f9cb01e57e39f1a1f7c8eb730501da3
* | Camera2: Fix FPS value scaling between HAL2 and APIEino-Ville Talvala2012-09-272-7/+12
|/ | | | | | | | | | | API assumes FPS values are in fixed-point with LSB 0.001; HAL2 just uses ints with no fractional part. HAL should probably use floats or something similar, but for now, fix scaling so the two agree on FPS values. Bug: 7230239 Change-Id: Ie18a4f11fc9d17d9ae2d04781511a273213eda55
* Camera2: Fix JPEG Transport Header offsetAlex Ray2012-09-261-3/+7
| | | | | | | Use offset into start of buffer after transport header Bug: 7108816 Change-Id: I6f9778db313856eaeee31f6999e4e55678b09b26
* Camera2: Make sure to clean out reprocess streams on shutdown as well.Eino-Ville Talvala2012-09-251-0/+1
| | | | | | | Otherwise, streams may persist past expected lifetime. Bug: 6243944 Change-Id: I901971b78baf9d577ea3812588dec3885232e7ef
* Camera2: Debug and logging fixes.Eino-Ville Talvala2012-09-2511-20/+81
| | | | | | | | | | - Fix LOG_TAGs to work with standard logcat filtering. - Add ATRACE to Camera2Device - Shorten thread names to fit in 16 characters - Remove some ATRACEs to avoid flooding trace unnecessarily Bug: 7220520 Change-Id: Ief8d677b5c8bb35d94e0f21b11b86505e83169ea
* Merge "Camera2: Emit ShutterCallback/RawCallback events after takePicture" ↵Igor Murashkin2012-09-242-7/+34
|\ | | | | | | into jb-mr1-dev
| * Camera2: Emit ShutterCallback/RawCallback events after takePictureIgor Murashkin2012-09-242-7/+34
| | | | | | | | | | Bug: 7176692 Change-Id: I50e8f9511f1770d97a42d1fa208c04b1bbcfba6b
* | Camera2: Fix cropRegion sometimes exceeding the sensor array sizeIgor Murashkin2012-09-242-24/+117
|/ | | | | | Bug: 7155264 Bug: 7120431 Change-Id: I92a9c695b97ec40acf26dbdaa877964e41a9fd4c
* Camera2: Truncate JPEG imagesAlex Ray2012-09-242-7/+172
| | | | | | | | Check for JPEG size hint from HAL, use if applicable. Otherwise read until end of JPEG image to find appropriate file size. Bug: 7108816 Change-Id: Idfd194133eb6c293ab08c9466f59606e62ba56b6
* Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-devEino-Ville Talvala2012-09-211-1/+2
|\
| * Camera2: Don't use ZSL when flash is on force fire mode.Eino-Ville Talvala2012-09-211-1/+2
| | | | | | | | | | Bug: 7213907 Change-Id: I120b187c1886d85f4b2b5d3a6f28a28936424e8e
* | Merge "Camera2: Emit FaceDetection events for all except repeating 0-face ↵Igor Murashkin2012-09-212-5/+25
|\ \ | |/ |/| | | frames" into jb-mr1-dev
| * Camera2: Emit FaceDetection events for all except repeating 0-face framesIgor Murashkin2012-09-212-5/+25
| | | | | | | | | | Bug: 7205311 Change-Id: I570209445acf3a26f2246c3fe886d56bb63bd2f8
* | Merge "Camera2: Clean up startup/shutdown sequences." into jb-mr1-devEino-Ville Talvala2012-09-203-37/+85
|\ \
| * | Camera2: Clean up startup/shutdown sequences.Eino-Ville Talvala2012-09-203-37/+85
| |/ | | | | | | | | | | | | | | | | | | - Close camera device on startup errors - Make sure all threads are shut down and the device is closed before returning from ICamera::disconnect. Bug: 7172680 Change-Id: I98611448ec5f2311e6604fa8ee5f9dde7bfdd988
* | Camera2: Erase ZSL queue after each use.Eino-Ville Talvala2012-09-203-1/+32
|/ | | | | | | | | Since preview stops after a capture is submitted, need to clear out the ZSL queue to avoid using stale buffers when the preview starts up again. Bug: 7189765 Change-Id: I9ae2382d0af132208aca5ccba49b5464d18a263e
* Camera2: State must be STOPPED before JPEG callback is fired.Eino-Ville Talvala2012-09-203-31/+39
| | | | | | | | | Move handling of JPEG callback to CaptureSequencer instead of JpegProcessor, so that we can be sure the camera state is updated to STOPPED before the JPEG callback is sent to the application layer. Bug: 7172743 Change-Id: Ie8752d946d3eb8254230c77f10e5c38a83dc5371
* Camera2: ZSL captures should also make some noise.Eino-Ville Talvala2012-09-191-0/+5
| | | | Change-Id: If7aff7223db41b4b7edeeb4c32e40ef3197b180b
* Camera2: Increase max timeout for the precapture sequence.Eino-Ville Talvala2012-09-191-1/+1
| | | | | | | Increase maximum duration of the precapture sequence (final metering + preflash + redeye reduction) to 2 seconds before timing out. Change-Id: Ie1de4e96d46599eb53e1def9052b211e684f1fbc
* Merge "Camera2: Increase capture timeout." into jb-mr1-devEino-Ville Talvala2012-09-181-1/+1
|\
| * Camera2: Increase capture timeout.Eino-Ville Talvala2012-09-181-1/+1
| | | | | | | | | | | | | | Low-light modes may take longer to capture a picture, so increase the timeouts. Change-Id: Id50b1e4fd3186da4e75b2cc1c226ced2f8d394ac
* | Camera2: Enable ZSL by default.Eino-Ville Talvala2012-09-181-4/+4
| | | | | | | | | | Bug: 6910087 Change-Id: Ie774f28fbb943b2ac2c856872fd4cae68b40430c
* | Merge "Camera2: ZSL: Do regular capture if AE is not satisfied." into jb-mr1-devEino-Ville Talvala2012-09-184-12/+80
|\ \
| * | Camera2: ZSL: Do regular capture if AE is not satisfied.Eino-Ville Talvala2012-09-184-12/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Check the AE state of the selected ZSL buffer; if it's not reporting as CONVERGED or LOCKED, fall back to normal capture sequence - Add more debugging for the ZSL queue. Bug: 6910087 Change-Id: I77a4287580aa9ddbd58438477c40ce829555d0ca
* | | Camera2: Don't be bothered by lack of faces.Eino-Ville Talvala2012-09-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes, people might want to photograph scenes with no faces. And not have their log fill with errors when they do. Bug: 7078231 Change-Id: Ibe5c08d51b49a3ea14203416fe7803a58de08dda
* | | Camera2: Filter out faces with 0 confidence.Eino-Ville Talvala2012-09-171-1/+7
| | | | | | | | | | | | | | | Bug: 7078231 Change-Id: I559f1281359835e0489456091a5409ebc8f73479
* | | Camera2: Change face detect/scene mode priority.Eino-Ville Talvala2012-09-171-2/+5
|/ / | | | | | | | | | | | | | | Explicit scene modes should override the implicit face priority scene mode from enabling face detection, to match application/API expectations. Change-Id: I6f0f44fadeacfdc0594dd2fdc280e294d2d87df6
* | Camera2: Don't play shutter sound when doing a video snapshotEino-Ville Talvala2012-09-151-1/+2
|/ | | | | Bug: 7171820 Change-Id: I11ec0900aff3cdf4b57ae1bfc75f7acfecf95098
* Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc ↵Eino-Ville Talvala2012-09-141-1/+1
| | | | | | | | | | scheme."" The changes this commit depends on are now submitted. This reverts commit f54b1459cda7f585b4896671643b33bab8290964 Change-Id: If7f146ab7968d50fffd2174c2c5792bdc9d7724c
* Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."Igor Murashkin2012-09-141-1/+1
| | | | | | This reverts commit 8a3016613dc684a6be11fdf643f9cc5cad817e8f Change-Id: I3f1d4e9c13df838b8b6aa5696a6494140eac3e04
* Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.Eino-Ville Talvala2012-09-131-1/+1
| | | | | | | | Until all HAL implementations move to the new format negotiation scheme, use CAMERA2_HAL_PIXEL_FORMAT_ZSL to indicate ZSL mode. Bug: 6243944 Change-Id: Idf5d9f42e203903ba906d5df156100646b27404c
* Camera2: Fix ZSL bugs.Eino-Ville Talvala2012-09-123-24/+52
| | | | | | | | | | | | The ZSL processor was discarding buffers too often, and waiting for new buffers with mutexes held. Also adds basic fallback to regular capture in case the ZSL queue doesn't contain a suitable buffer. Bug: 7147043 Change-Id: I5721267ef08dbc87ef9d8ec47f333db5f67e41c1
* Merge "Camera2: Use full pixel array for ZSL stream" into jb-mr1-devEino-Ville Talvala2012-09-111-3/+4
|\
| * Camera2: Use full pixel array for ZSL streamEino-Ville Talvala2012-09-111-3/+4
| | | | | | | | | | | | | | | | For efficiency, use full pixel array size for the ZSL output/input streams, instead of the final picture size. Bug: 7139362 Change-Id: I98ad4f5a1ca283efe87ae60bf0cf39573e22d2f3
* | Merge "Camera2: Configure ZSL at the right time." into jb-mr1-devEino-Ville Talvala2012-09-112-10/+9
|\ \ | |/
| * Camera2: Configure ZSL at the right time.Eino-Ville Talvala2012-09-112-10/+9
| | | | | | | | | | | | | | | | ZSL enable was too early in the camera startup sequence, resulting it being turned off most of the time. Bug: 7148012 Change-Id: Ie144dd960d018a34b0bc77c88208ca22b7112772
* | Merge "Camera1: Fix enable shutter sound command error handling." into ↵Eino-Ville Talvala2012-09-111-4/+2
|\ \ | |/ |/| | | jb-mr1-dev
| * Camera1: Fix enable shutter sound command error handling.Eino-Ville Talvala2012-09-111-4/+2
| | | | | | | | | | | | | | Return the error codes from calls to enableShutterSound to the caller, and don't call the HAL with the enable shutter sound command. Change-Id: Ibe4943bd1cd0fcd1832fd904f12dd2f78fec06a5
* | Camera2: Temporarily stop pre-allocation of recording stream.Eino-Ville Talvala2012-09-101-7/+2
| | | | | | | | | | | | | | | | When recordingHint is set, don't pre-allocate recording stream on preview start. Bug: 7137947 Change-Id: I06b5f6d7dbb21d4d0747974ba001b0c8929a0b02
* | Camera2: Clean up the right streams.Eino-Ville Talvala2012-09-101-3/+16
|/ | | | Change-Id: I780c3e8e255f6a185e0edf1d76f35afdc74dff48
* Camera2: Use face priority scene mode when face detect is enabled.Eino-Ville Talvala2012-09-101-10/+14
| | | | | | | | Per API specs, enabled face detection implies that metering, etc is done based on faces. Bug: 6243944 Change-Id: Ie35162226d70cc0f437e92e37be138e71e45e738
* Camera2: Sanity check inputs better.Eino-Ville Talvala2012-09-101-0/+16
| | | | | Bug: 7132141 Change-Id: I866a65dfe47464070a6ef4ac60be4801cb68327b
* Fix buildJames Painter2012-09-071-0/+1
| | | | Change-Id: Ia4bebc4ecc850b42ebd4edd1ffed07e9bc2ec300
* Camera2: Add a burst mode skeleton.James Painter2012-09-0710-7/+636
| | | | | Bug: 6243944 Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
* Merge "Camera2: Increase zoom steps." into jb-mr1-devAlexander Ray2012-09-071-1/+1
|\
| * Camera2: Increase zoom steps.Eino-Ville Talvala2012-09-061-1/+1
| | | | | | | | | | | | | | 10 is too low for smooth zoom; increase number to improve smoothness. Bug: 7120794 Change-Id: I178cd3890ef37beeff97cadb9e92ceab6d2cad06
* | Camera2: Use the recordingHint parameter.Eino-Ville Talvala2012-09-072-22/+49
| | | | | | | | | | | | | | | | | | Use recordingHint to create recording and still capture streams up front, and to use the recording template when doing preview. Bug: 6243944 Change-Id: Ifeb624794849f734784b53a1a10ff2bfe8f1a357
* | Camera2: Delete all streams and stop all threads during shutdown.Eino-Ville Talvala2012-09-074-0/+24
| | | | | | | | | | Bug: 6243944 Change-Id: If13a1f91e8a07c1ec4f91183d1a4b261ec4f6d52
* | Camera2: Play shutter and recording sounds.Eino-Ville Talvala2012-09-063-0/+13
|/ | | | | | Bug: 6987540 Change-Id: Icd441a757c4b68fc4988b3bfbef428adb8d1ba28
* Camera2: Move locked states out of AE/AWB modeEino-Ville Talvala2012-09-061-5/+12
| | | | | | Bug: 6243944 Change-Id: I7b609cc6c04c957d1f48c1a996263fa9c7b94000