summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 843aba43: am 2458d482: Merge "Camera2: Always disconnect in the client ↵Eino-Ville Talvala2012-10-081-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | destructor" into jb-mr1-dev * commit '843aba43ef85f5a40db03e0f384ed096b03592d0': Camera2: Always disconnect in the client destructor
| * | | Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-devEino-Ville Talvala2012-10-081-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Camera2: Always disconnect in the client destructorIgor Murashkin2012-10-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Camera2Client failed to initialize, it would skip disconnect step, and thus the camera would be forever marked as busy. By always calling disconnect it will always call free. It also adds a new guarantee that Client::disconnect is idempotent Bug: 7298182 Change-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5
* | | | am 4a4253b9: am 82edd543: Camera2: isSmoothZoomSupported should return FALSEIgor Murashkin2012-10-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4a4253b979586c9de21425f5e3cb34da9f1e57de': Camera2: isSmoothZoomSupported should return FALSE
| * | | Camera2: isSmoothZoomSupported should return FALSEIgor Murashkin2012-10-081-1/+1
| |/ / | | | | | | | | | | | | Bug: 7308024 Change-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d
* | | am 9ea63b3b: am 6f854608: Camera2: Set default flash mode to FLASH_OFFAlex Ray2012-10-081-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '9ea63b3bfd696bcce9cb28e86218a3449dd699d8': Camera2: Set default flash mode to FLASH_OFF
| * | Camera2: Set default flash mode to FLASH_OFFAlex Ray2012-10-081-2/+2
| | | | | | | | | | | | | | | Bug: 6970090 Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c
* | | am a761686d: am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 ↵Igor Murashkin2012-10-081-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | validation error" into jb-mr1-dev * commit 'a761686d14ff8abd704a4802ca6ea0b801a9a32d': Camera2: Fix Parameters#setZoom off by 1 validation error
| * | Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into ↵Igor Murashkin2012-10-081-1/+2
| |\ \ | | | | | | | | | | | | jb-mr1-dev
| | * | Camera2: Fix Parameters#setZoom off by 1 validation errorIgor Murashkin2012-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | Bug: 7298683 Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d
* | | | am c7ee4fda: am b8f0090a: Merge "Camera2: On stopping preview, wait until ↵Eino-Ville Talvala2012-10-084-44/+57
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | captures are completed." into jb-mr1-dev * commit 'c7ee4fda96539815e877cf035c9984f6009c4875': Camera2: On stopping preview, wait until captures are completed.
| * | | Merge "Camera2: On stopping preview, wait until captures are completed." ↵Eino-Ville Talvala2012-10-084-44/+57
| |\ \ \ | | |/ / | |/| | | | | | into jb-mr1-dev
| | * | Camera2: On stopping preview, wait until captures are completed.Eino-Ville Talvala2012-10-074-44/+57
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If preview is stopped while a still capture or a video snapshot is underway, wait until the capture completes before stopping preview. Also use the same behavior for disconnect - do not shut down the camera device until captures are complete. This works around HAL implementations which report to be done (get_in_progress_count returns 0) even when a capture is still outstanding. Bug: 7276954 Change-Id: I66290acf1740cc330eadecbcded0c59fa9c5d2fd
* | | am 97f00a6b: am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for ↵Igor Murashkin2012-10-082-7/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | fixed focus cameras" into jb-mr1-dev * commit '97f00a6b6cde4837e0ab3751d7cfd2921c11f9b4': Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras
| * | Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into ↵Igor Murashkin2012-10-082-7/+25
| |\ \ | | |/ | |/| | | | jb-mr1-dev
| | * Camera2: Report getMaxNumFocusAreas 0 for fixed focus camerasIgor Murashkin2012-10-052-7/+25
| | | | | | | | | | | | | | | Bug: 7298805 Change-Id: I7499b80a9416bf454c8ea80c31ea4fdd3c4ee2d7
* | | am 6f45866e: am c8823995: audioflinger/resampler: add build source for ↵ty.lee2012-10-071-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | libaudio-resampler * commit '6f45866e8a942b2a8a21c75708a717b0c8a8f120': audioflinger/resampler: add build source for libaudio-resampler
| * | audioflinger/resampler: add build source for libaudio-resamplerty.lee2012-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | | Bug: 7229644 Change-Id: I93bde36be1c3ec84174a4c98423e28f8b3d8782f Signed-off-by: ty.lee <ty.lee@lge.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | am 3576742a: am 4d410ede: Camera2: Fix off-by-one error in ZSL selection.Eino-Ville Talvala2012-10-071-3/+6
|\ \ \ | |/ / | | | | | | | | | * commit '3576742a2bb3dc10bf8256579d600d85f17c3835': Camera2: Fix off-by-one error in ZSL selection.
| * | Camera2: Fix off-by-one error in ZSL selection.Eino-Ville Talvala2012-10-061-3/+6
| | | | | | | | | | | | | | | Bug: 7258126 Change-Id: Ie6da4645c46a7bb0dbd11d7c6183e904f41f74fd
* | | am 4d85afad: am f6e09d20: Camera2: Unconditionally shut down streams on ↵Eino-Ville Talvala2012-10-051-1/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | disconnect. * commit '4d85afad335ded1019ec7697b9f37241a839efa1': Camera2: Unconditionally shut down streams on disconnect.
| * | Camera2: Unconditionally shut down streams on disconnect.Eino-Ville Talvala2012-10-051-1/+10
| |/ | | | | | | | | | | | | | | | | | | stopPreviewL may do nothing in certain states. Stop streams directly to avoid those failures, so that we always maintain the HAL interface invariant that streams referenced by in-flight requests are never deleted. Bug: 7276954 Change-Id: Ic4cffc43036f4944684d941981a43d6dd1dce7af
* | am de434d89: am 7373cbe8: Camera2: Fix metering regions to take into account ↵Igor Murashkin2012-10-053-10/+150
|\ \ | |/ | | | | | | | | | | the current zoom/crop region * commit 'de434d8969bd02ffd7cdfdd39577dd59f6a71e9d': Camera2: Fix metering regions to take into account the current zoom/crop region
| * Camera2: Fix metering regions to take into account the current zoom/crop regionIgor Murashkin2012-10-053-10/+150
| | | | | | | | | | | | | | Also adds a quirk to disable this fix to work around for incompliant HALs Bug: 7246065 Change-Id: I80bad25e56ba59149270238e5639bb33cae495ae
* | am 9be4d65d: am af3d2887: Camera2: Change policy for calculating ↵Igor Murashkin2012-10-052-15/+105
|\ \ | |/ | | | | | | | | | | previewFpsRange from previewFps * commit '9be4d65d73bb8db98bf1f53e8c47ff3e3546a144': Camera2: Change policy for calculating previewFpsRange from previewFps
| * Camera2: Change policy for calculating previewFpsRange from previewFpsIgor Murashkin2012-10-052-15/+105
| | | | | | | | | | Bug: 7259959 Change-Id: I759a559d7115201264f88db1f23edc2d6aef6c43
* | am 7ca6460d: am becb0bc4: Merge "Camera2: Don\'t promote weak IBinder ptrs ↵Igor Murashkin2012-10-052-12/+14
|\ \ | |/ | | | | | | | | | | to strong ones" into jb-mr1-dev * commit '7ca6460d06144d76460c8d43128bd338839d9501': Camera2: Don't promote weak IBinder ptrs to strong ones
| * Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-devIgor Murashkin2012-10-052-12/+14
| |\
| | * Camera2: Don't promote weak IBinder ptrs to strong onesIgor Murashkin2012-10-052-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Binder driver does not support promoting weak pointers into strong pointers. Occassionally the system would lock up when trying to do this (when closing the camera app). Bug: 7289040 Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
* | | am e5f4024b: am 95069fef: Camera2: Use the triggerAfWithAuto quirkEino-Ville Talvala2012-10-053-0/+26
|\ \ \ | |/ / | | | | | | | | | * commit 'e5f4024bad9875e96cefbe3fe81172d166d52154': Camera2: Use the triggerAfWithAuto quirk
| * | Camera2: Use the triggerAfWithAuto quirkEino-Ville Talvala2012-10-043-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | When this quirk is set, and a scene mode is enabled, do AF calls with AF mode AUTO instead of whatever the scene more override AF mode is. Bug: 7159577 Change-Id: I3ea6b8386abc0968047fc9bba3a35c5db5bdcfd3
* | | am 577ac8a7: am 4865c526: Camera2: Synchronize mode changes and triggersEino-Ville Talvala2012-10-0512-66/+259
|\ \ \ | |/ / | | | | | | | | | * commit '577ac8a74e8af7fcc7bc714874b8da21f57989b5': Camera2: Synchronize mode changes and triggers
| * | 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.
| * Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-devEino-Ville Talvala2012-10-045-34/+75
| |\
| | * Camera2: Include JPEG settings in ZSL requests.Eino-Ville Talvala2012-10-045-34/+75
| | | | | | | | | | | | | | | Bug: 7287743 Change-Id: I1aba81b228451c3df712ce1f42b7aab79cac575f
* | | resolved conflicts for merge of f12b1c81 to masterGlenn Kasten2012-10-047-124/+270
|\ \ \ | |/ / | | | | | | Change-Id: I914a11706bd01a198e2137e0c12af0fc92ffa02b
| * | Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-devGlenn Kasten2012-10-047-124/+270
| |\ \ | | |/ | |/|
| | * Integrate improved coefficient sinc resampler: VHQGlenn Kasten2012-10-047-124/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: Very high quality is enabled only for 44.1 -> 48 or 48 -> 44.1, and uses low quality for all other use cases. Track estimated CPU load and throttles the quality based on load; as currently configured it should allow up to 2 instances of very high quality. Medium quality and high quality are currently disabled unless explicitly requested. Details: Only load .so the first time it is needed. Cleanup code style: formatting, indentation, whitespace. Restore medium quality resampler, but it is not used (see next line). Fix memory leak for sinc resampler. Check sample rate in resampler constructor. Add logs for debugging. Rename DEFAULT to DEFAULT_QUALITY for consistency with other quality levels. Renumber VERY_HIGH_QUALITY from 255 to 4. Use enum src_quality consistently. Improve parsing of property af.resampler.quality. Fix reentrancy bug - allow an instance of high quality and an instance of very high quality to both be active concurrently. Bug: 7229644 Change-Id: I0ce6b913b05038889f50462a38830b61a602a9f7
* | | 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