summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Camera2: Synchronize mode changes and triggersEino-Ville Talvala2012-10-0412-66/+259
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Make sure that changes to various parameters have reached the HAL before triggering asynchronous events like autofocus or precapture metering. Bug: 7107220 Change-Id: I3c50038de1671968eb32004ce538435121934e7e
| * | am e68eb9b8: am 9942f62d: Merge "Camera2: Include JPEG settings in ZSL ↵Eino-Ville Talvala2012-10-045-34/+75
| |\ \ | | |/ | | | | | | | | | | | | | | | requests." into jb-mr1-dev * commit 'e68eb9b82d0371324add708e2b2eb45a99ddbd70': Camera2: Include JPEG settings in ZSL requests.
| | * Camera2: Include JPEG settings in ZSL requests.Eino-Ville Talvala2012-10-045-34/+75
| | | | | | | | | | | | | | | Bug: 7287743 Change-Id: I1aba81b228451c3df712ce1f42b7aab79cac575f
| * | am d6e8c5b1: am f66cc52c: Merge "Camera2: Fix deadlock while zooming during ↵Igor Murashkin2012-10-041-11/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | record" into jb-mr1-dev * commit 'd6e8c5b187225c55a279bc40f262fe137f2ef508': Camera2: Fix deadlock while zooming during record
| | * Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-devIgor Murashkin2012-10-041-11/+11
| | |\
| | | * Camera2: Fix deadlock while zooming during recordIgor Murashkin2012-10-031-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acquired SharedParameters before mMutex in StreamingProcessor, this avoids any potential deadlocks since Camera2Client code would always acquire SharedParameters first before invoking StreamingProcessor. Bug: 7275259 Change-Id: Ia741162c455300378bee049f063590ece5328b95
| * | | am a9438d09: am ce953ce4: Merge "Camera2: Properly update FPS range when FPS ↵Eino-Ville Talvala2012-10-031-0/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | is set." into jb-mr1-dev * commit 'a9438d09fb44f6c95a558accd05711600cc4b2bf': Camera2: Properly update FPS range when FPS is set.
| | * | Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-devEino-Ville Talvala2012-10-031-0/+4
| | |\ \ | | | |/ | | |/|
| | | * Camera2: Properly update FPS range when FPS is set.Eino-Ville Talvala2012-10-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise a getParameters followed by setParameters will trigger an incorrect reversion in FPS parameters. Bug: 7279267 Change-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832
| * | | am b08633fc: am c2063056: Camera2: Fix prematurely clearing stream requestAlex Ray2012-10-032-7/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b08633fc95947173ba3f68627728a8c5f12ef72f': Camera2: Fix prematurely clearing stream request
| | * | Camera2: Fix prematurely clearing stream requestAlex Ray2012-10-032-7/+8
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Zsl handling was clearing the stream request before a capture request was ready to be sent to the HAL, which would cause capture delays and timeouts in certain conditions. Bug: 7259520 Change-Id: Idde8bc4fc58b8b426c6985feac87759740e338ea
| * | am 7fd4e2a8: am b3e97b34: Camera2: Fix trying to release HAL stream twiceIgor Murashkin2012-10-031-3/+11
| |\ \ | | |/ | | | | | | | | | * commit '7fd4e2a8f4d57d20e679e5321f34cc09245d82a1': Camera2: Fix trying to release HAL stream twice
| | * Camera2: Fix trying to release HAL stream twiceIgor Murashkin2012-10-031-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we fail to disconnect the native window, StreamAdapter::release would fail and remain in the old (ALLOCATED) state, thus it thinks that we haven't released the HAL stream yet. With this change, ignore DEAD_OBJECT native window disconnect failures, so the state transitions to RELEASED and we don't double release HAL streams. Bug: 7258314 Change-Id: I524893e4b4d6463d7b0a7ce32fb6f658afba8e11
| * | am 5f49d702: am ecf17e82: Camera2: Handle client processes dying by closing ↵Igor Murashkin2012-10-0311-28/+121
| |\ \ | | |/ | | | | | | | | | | | | | | | camera resources * commit '5f49d702fe25fe3a6752be438db6bf006840e41f': Camera2: Handle client processes dying by closing camera resources
| | * Camera2: Handle client processes dying by closing camera resourcesIgor Murashkin2012-10-0311-28/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | CameraService now subscribes to binder death notifications for each client, and disconnects the client if the death happened without cleanly shutting down the client first. Bug: 7258314 Change-Id: I7803836b589fd8f0dfe00f6c28a707b82012e751
| * | am ad93604d: am 22d58d37: Camera2: Don\'t change state when reconnect is calledIgor Murashkin2012-10-032-3/+10
| |\ \ | | |/ | | | | | | | | | * commit 'ad93604d802c7f726f3bdb83ed14412b26a5c809': Camera2: Don't change state when reconnect is called
| | * Camera2: Don't change state when reconnect is calledIgor Murashkin2012-10-032-3/+10
| | | | | | | | | | | | | | | Bug: 7252802 Change-Id: Ibed4f59a96bef75bf84b1aaf1235fb87e94102ef
| * | am db6ead4f: am 1bac8972: Merge "Camera2: Use ZSL format quirk." into jb-mr1-devEino-Ville Talvala2012-10-034-2/+40
| |\ \ | | |/ | | | | | | | | | * commit 'db6ead4fd0d8bbe3df6ede6727927830727cfa30': Camera2: Use ZSL format quirk.
| | * Camera2: Use ZSL format quirk.Eino-Ville Talvala2012-10-024-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch service to using HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, unless ZSL quirk is set. This is important for compatibility across multiple implementations. Bug: 6243944 Change-Id: Iea74671cbb44890a07e4f99cd757b0a5423d447a
| * | resolved conflicts for merge of 9bf263b2 to masterEino-Ville Talvala2012-10-024-47/+261
| |\ \ | | |/ | | | | | | Change-Id: I28da6f16a1d044864c81d5f1dcf6543169c09460
| | * Camera2: Use scene mode override parameterEino-Ville Talvala2012-10-024-47/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Read in SCENE_MODE_OVERRIDES static parameter if available. Use it to select AF/AE/AWB modes when a scene mode is set. - Add quirks structure to parameters; not yet used - Fix desynchronization between range and single FPS value. Still need to sort out best way to convert from one to another. Bug: 7259959 Bug: 7159577 Bug: 7172543 Change-Id: I0d07c31d5f21fbc4b0ec2fa23f7f778073d2d6e0
| * | am 700a4cdc: am 73bbd1f1: Camera2: Refactor preview/recording management to ↵Eino-Ville Talvala2012-10-017-533/+794
| |\ \ | | |/ | | | | | | | | | | | | | | | separate class. * commit '700a4cdc50b07dc75bb8103e55cc227b6cfa1fc7': Camera2: Refactor preview/recording management to separate class.
| | * Camera2: Refactor preview/recording management to separate class.Eino-Ville Talvala2012-09-287-533/+794
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Untangle preview/recording management from main class to simplify callpaths; in preparation for fixing several HAL/app interactions bugs. Bug: 7172543 Bug: 7159577 Bug: 7107220 Change-Id: Iab5503f66b35d88a1524111536a484c9e33fd934
| | * DO NOT MERGE: Remove experimental parameters for burst modeJames Painter2012-09-282-17/+0
| |/ | | | | | | | | Bug: 7248756 Change-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d
| * Merge "Camera2: Use new JPEG transport header" into jb-mr1-devAlex Ray2012-09-282-38/+15
| |\
| | * Camera2: Use new JPEG transport headerAlex Ray2012-09-272-38/+15
| | | | | | | | | | | | | | | | | | | | | | | | Check for new JPEG transport header at the end of the stream buffer instead of at the beginning. Bug: 7108816 Change-Id: I26c52267cb406dae50c9d0ee01e6c26359ba84aa
| * | Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-devAlex Ray2012-09-281-1/+7
| |\ \ | | |/ | |/|
| | * Camera2: Re-entering preview state on v2 DeviceAlex Ray2012-09-261-1/+7
| | | | | | | | | | | | | | | Bug: 7240891 Change-Id: I6a01b27197b4ee89a68f06f4375d315a716b67ae
| * | 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