summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Camera2: Improve quirks focusing behavior.Eino-Ville Talvala2012-10-162-2/+9
| | | | | | | | | | | - When scene mode is set and the AF quirk is in use, don't change AF mode and then cancel when AF cancel is received. Just change mode since that also implies a cancel. - Only trigger quirks switch when a focusing area is set. Bug: 7318812 Change-Id: I28d8755553bd78052e774701210cb94d84ee2046
* Camera2: Don't touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
| | | | | Bug: 7357069 Change-Id: I9cd0cdcc23959bfecced5f47bb9e8c59c997dade
* Camera2: When focus is already locked in CAF mode, do not trigger HAL.Eino-Ville Talvala2012-10-163-4/+41
| | | | | | | | | | | | In HAL2 CAF modes, once focus is locked by an AF trigger, additional triggers will not cause AF notifications, since the state will not change again until a cancelAutofocus call. Since the old API still expects to see a notification, short-circuit this at the service and send an immediate success notification. Bug: 7318298 Change-Id: Ib209a24eaf2a35a247d06aea671efe80a33d751e
* Fix some missing checks against missing codecsJames Dong2012-10-111-14/+14
| | | | | | o related-to-bug: 6971073 Change-Id: Ia6d926663231f9a9ef31c82c85c70595c4a30ebe
* Camera2: Don't error out of startPreview when already recording.Eino-Ville Talvala2012-10-101-4/+7
| | | | | Bug: 7327474 Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53
* Merge "Support querying active record sources" into jb-mr1-devJean-Michel Trivi2012-10-106-0/+42
|\
| * Support querying active record sourcesJean-Michel Trivi2012-10-106-0/+42
| | | | | | | | | | | | | | | | | | Add support for querying whether there is currently a recording underway from the specified audio source. Bug 7314859 Change-Id: I986b231a10ffd368b08ec2f9c7f348d28eaeb892
* | Camera2: Don't let unlocks happen during recording.Eino-Ville Talvala2012-10-101-2/+6
| | | | | | | | | | Bug: 7309020 Change-Id: I6e66809b868d2e8f47f71e6f8752b44ec06dfb17
* | Camera2: Do not set auto-white-balance regions from metering regions.Eino-Ville Talvala2012-10-101-3/+0
| | | | | | | | | | | | | | Per API documentation, metering regions are only for AE, not also for AWB. Bug: 7312720 Change-Id: I39bcf33e4c81e80022f45e8fca77ea6cf9ba115e
* | Camera: Limit valid caller PIDs for camera clients.Eino-Ville Talvala2012-10-102-20/+11
| | | | | | | | | | | | | | | | | | Narrow down on PID checks to avoid cases where service can access the camera even though it shouldn't be able to, per API semantics. Bug: 6970469 Change-Id: Ic468a31949c28ef978b6ed48a70e4601c7ced684
* | Merge "Camera: Clear Hardware device pointer when initialization fails" into ↵Eino-Ville Talvala2012-10-091-0/+1
|\ \ | | | | | | | | | jb-mr1-dev
| * | Camera: Clear Hardware device pointer when initialization failsIgor Murashkin2012-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When disconnecting, don't try to call device functions if the initialization fails since this can lead to internal HAL segfaults. Bug: 7317107 Change-Id: Ib65db7eb6556ee10d844959934b1bfd7bb08d0ff
* | | Merge "Switch audio mode based on dongle's capabilities" into jb-mr1-devAndreas Huber2012-10-092-8/+93
|\ \ \ | |_|/ |/| |
| * | Switch audio mode based on dongle's capabilitiesAndreas Huber2012-10-092-8/+93
| | | | | | | | | | | | | | | | | | | | | properly parse rtp port and use it to setup session. Change-Id: Ic7521cb867143278196c3ce4b19a74ecc2703d8e related-to-bug: 7318719
* | | Merge "Camera2: Fix uninitialized parameters." into jb-mr1-devEino-Ville Talvala2012-10-091-0/+8
|\ \ \ | |_|/ |/| |
| * | Camera2: Fix uninitialized parameters.Eino-Ville Talvala2012-10-091-0/+8
| |/ | | | | | | | | | | | | | | | | Some parameters were not being set to default values, causing strange flakiness in any app that wasn't calling setParameters. This includes many CTS tests. Bug: 6970468 Change-Id: If91635afc000e23862e7b039292a55349274c5ee
* | Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into ↵Igor Murashkin2012-10-091-0/+15
|\ \ | | | | | | | | | jb-mr1-dev
| * | Camera2: Call onAutoFocus immediately for fixed-focus camerasIgor Murashkin2012-10-091-0/+15
| |/ | | | | | | | | Bug: 7311578 Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee
* | Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-devEino-Ville Talvala2012-10-092-5/+12
|\ \
| * | Camera2: Move non-ZSL shutter sound firing to be later.Eino-Ville Talvala2012-10-082-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of firing shutter sound when capture request is submitted for non-ZSL captures, fire it when the metadata frame is received. This guarantees that the shutter sound fires after picture capture is completed by the sensor. Bug: 7259900 Change-Id: I4a1eeed89ed0400bf80b0f0cc2d5799c3d9bb9e3
* | | Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-devEric Laurent2012-10-091-4/+0
|\ \ \ | |_|/ |/| |
| * | audio policy: deprecate ro.camera.sound.forcedEric Laurent2012-10-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is now controlled by AudioService. Do not read ro.camera.sound.forced is not needed anymore. Bug 7032634. Change-Id: Ic0a6396fc4b6efb91cdb4dffe0c8eb035d0440bd
* | | 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
* | | Camera2: isSmoothZoomSupported should return FALSEIgor Murashkin2012-10-081-1/+1
|/ / | | | | | | | | Bug: 7308024 Change-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d
* | Camera2: Set default flash mode to FLASH_OFFAlex Ray2012-10-081-2/+2
| | | | | | | | | | Bug: 6970090 Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c
* | 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
* | | 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
* | 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
* | 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>
* | Camera2: Fix off-by-one error in ZSL selection.Eino-Ville Talvala2012-10-061-3/+6
| | | | | | | | | | Bug: 7258126 Change-Id: Ie6da4645c46a7bb0dbd11d7c6183e904f41f74fd
* | 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
* 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
* Camera2: Change policy for calculating previewFpsRange from previewFpsIgor Murashkin2012-10-052-15/+105
| | | | | Bug: 7259959 Change-Id: I759a559d7115201264f88db1f23edc2d6aef6c43
* 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
* | 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
* | 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
* 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
* | Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" ↵Andreas Huber2012-10-047-27/+200
|\ \ | | | | | | | | | into jb-mr1-dev
| * | Optionally emit LPCM audio instead of using AAC in wifi display codeAndreas Huber2012-10-047-27/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 7248248 May decrease power usage at the cost of significantly increasing audio bitrate. Use "adb shell setprop media.wfd.use-pcm-audio true" to turn it on (must be done before connecting). Change-Id: I7ebeadf3209e01522a2644948287b23d7c383c7e
* | | Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-devGlenn Kasten2012-10-049-127/+272
|\ \ \ | |_|/ |/| |
| * | Integrate improved coefficient sinc resampler: VHQGlenn Kasten2012-10-049-127/+272
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | 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
* | Merge "Enable hdcp for WiFi display" into jb-mr1-devJames Dong2012-10-031-1/+1
|\ \