| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Add frame number to CaptureCallback#onCaptureStarted
Bug: 17421092
Change-Id: I8ffc0c7c22a5f3a25e923aaf1ecf166c7a264508
|
|\ \
| | |
| | |
| | | |
into lmp-dev
|
| | |
| | |
| | |
| | |
| | | |
Bug: 17403384
Change-Id: I2f452f79ffb4c0c3327ea5bf7db3f9d26e98ff51
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When device is locked in portrait, JPEG orientation and preview
orientation might be different.
Bug: 17360176
Change-Id: I16ee937c4d930e5f02a3e703dffd3bdd63e0e367
|
|\ \ \
| |_|/
|/| | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There is some evidence that we may be getting null parameters on N10.
Specfically, AndroidCameraProxyImpl.getParameters is returning null,
and from analysis the only two options are that the API1 returns null,
or our synchronous waiting for threads is compromised and we are returning
without error too fast. The latter would presumably show up on many
devices, but we are only seeing an issue on N10, so I suspect an API/HAL
issue. Adding logging and a thrown exception, and cleaning up
GET_PARAMETERS message creation slightly to make more consistent with
other invocations.
Bug: 17109801
Change-Id: I1705345d03ed16ef22b170a11fcaf0c6fb2a2c4d
|
|\ \ \
| | | |
| | | |
| | | | |
lmp-dev
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 17405119
Change-Id: Ic4828b5ddee2b11fa9886506e48c640a4c5ad3ef
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- Listener -> Callback
- add/remove callbacks -> register/unregister
Bug: 17389922
Change-Id: I6e162ae18447b5a4fcabc17d17b1341f341fc47d
|
| |_|/
|/| |
| | |
| | |
| | | |
Bug: 17353543
Change-Id: I31448687a69afc66e93f4360e8a3186ff8ad6235
|
|\ \ \ |
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
Bug: 17072609
Change-Id: Iebb97d12fc62986ad389460c253cfc504a68ad7f
|
|\ \ \
| | | |
| | | |
| | | | |
into lmp-dev
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes the calculation of API 2 focus and metering rectangles to account for
the effective crop region (after the framework has performed automatic cropping
to match the requested output aspect ratio). It also guards against and prints
warnings when changing the resolution after having configured the session and
surfaces; before, this was merely a silent no-op.
Bug: 17187095
Change-Id: I3243bea24d6936d1bba5d556b3846d172ad0defe
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 17286539
Change-Id: Id75bfc594f9fb6a08bb187d053ae99a85e7d9d42
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Because the camera2 API doesn't play shutter sounds at all, the portability
layer does it directly. Consequently, it is trivial to skip that step.
Bug: 17303595
Change-Id: I303696906902c2d8af58baedf27f6e20f34772f1
|
|\ \ \
| | | |
| | | |
| | | | |
lmp-dev
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The numeric state codes defined by the camera2 implementation were incompatible
with the StateHolder class's wait interface; thus, blocking operations didn't
always behave as expected.
Bug: 17300466
Change-Id: I54f462d5de876c9dcf99b2a4c7ae79879cc0eca2
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a regression introduced by 984a086412a94ebea1bd9af8cd8bbf4afab38034
that resulted in captures sometimes hanging until the AE state changed. It
includes explanatory comments to guard against this sort of error in the future.
Bug: 17302778
Change-Id: I668f5a5470a0ae7712f62c7574d18360d47e410b
|
|\ \ \ |
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Cache the last valid CameraSettings object
The camera2 implementation of CameraProxy#getSettings() now returns the most
recent valid CameraSettings object that was provided to it (or the template if
no valid cached instance is available). This more closely mimics the camera1
implementation's behavior, and resolves issues where the app relies on finding
recent settings there in corner cases.
Bug: 17016658
Change-Id: I057feec3f857428dd210300a05f22cafa9f5ba34
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
If it's already converged and the flash isn't being forced on, there's no need
to force the precapture routine, which would delay our capture significantly.
Also use onCaptureProgressed() instead of onCaptureCompleted() when possible.
Change-Id: I0bb7956498b0070382cd5b39b7ccdc0cc0765913
|
|\ \ |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
This eliminates the deprecated index-based CameraSettings zoom methods in favor
of floating-point ratio based versions, and includes the plumbing to make those
work for both the camera1 and camera2 underlying framework APIs.
Bug: 17016658
Change-Id: I0567a53cd57bfa6d53604e3c5457a39ef49e3cb4
|
|\ \ |
|
| |/
| |
| |
| |
| | |
Bug: 17027000
Change-Id: I311028b9df4d74268fb415c163f7e6a2d2505dff
|
|\ \ |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
The validation routine now changes the focus mode to FIXED if the requested one
is unsupported. This is to work around devices whose templates erroneously
specify unsupported focus modes.
Bug: 17177436
Change-Id: If9b679510e0c232453dd0a77dbdd2e0ec713ac12
|
|/
|
|
|
| |
Bug: 17109582
Change-Id: I73321cdbb2972b2d1e9bc2de93192fbb506347e7
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
camera1 CameraAgent returns null CameraDeviceInfo if the underlying
camera device is broken. see b/16982203, this caused issues but was
invisible in logs. Adding logging to document true root cause of
any device info failures stemming from an underlying failure.
Bug: 16982203
Change-Id: I8a48714e1ddbde8b8eac35f149136d19efce5fb8
|
|\| |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The existing implementation of the AndroidCameraAgentImpl uses
a 'mParamsToSet' upon which is projects requested settings
changes in applySettings(). But, this mParamsToSet is initialized
only upon camera open! So 'hidden' parameters like video-size are
stuck in the value upon open. Instead, they should be current to
the last call to refreshSettings. To simplify, removed this and
another copy of parameters (mParameters), introduced one cache
class, and use it throughout the agent. Tested and app seems to
work OK in general with the change, and specifically confirmed that
video size parameters are not reverted after start, as was
observed before the change.
Bug: 16991558
Change-Id: I8f2749b8ab2ccc2cb858b8cd844330c5a482f79c
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Applying this transform to the Surface on which the stream is displayed results
in a correctly rotated image. For API 1, the rotation is actually performed by
the Camera class and the returned matrix is an identity matrix; however, for API
2, the transformation is responsible for proper orientation.
Bug: 16875535
Change-Id: I044ffbd1095bd1a9792c899b792129cc94c7c916
|
|\ \ \
| | | |
| | | |
| | | | |
lmp-dev
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This allows apps using the library to decide whether to jump to the new API.
Users of the library may choose to use the Camera class, the camera2 API, or
have the choice made automatically based on the device's API level. The choice
may also be globally overridden by means of a system property.
Bug: 16875535
Change-Id: I92e4be96fbd04057be61ceb8a0c58935770022f6
|
|\ \ \ \
| |_|_|/
|/| | |
| | | | |
into lmp-dev
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
This makes it harder for unexpected nulls in CaptureRequest templates to cause
exceptions while unboxing Integer wrappers. Such crashes were observed on some
devices while running on the legacy layer, especially with scene modes.
Change-Id: I0cae95534f138e97f2c589d15e81f77b4f2141f7
|
|/ /
| |
| |
| |
| |
| |
| | |
This reports JPEG capture sizes instead of YUV ones, and ensures that preview
sizes match TextureView, not SurfaceView.
Change-Id: I2963ee1741156cc2a29e2e65308bd14dd145e4c8
|
|\ \
| | |
| | |
| | | |
into lmp-dev
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
These fields are deprecated but while we have them, should copy them in the
constructor. This contributes to a zoom bug in the app, since ratios and indices
are dropped upon copy.
Bug: 16527845
Change-Id: I008384faa77e0c13a2790e095fa311909c1e9b44
|
|/
|
|
|
|
|
|
|
|
|
| |
This implements JPEG capture, including an autoexposure precapture sequence.
There are many changes to AndroidCamera2Capabilities and AndroidCamera2Settings
to support the representation of modes (e.g. flash modes) whose flags do not
map trivially between the API implementations. Part of this work is the
conversion of AndroidCamera2AgentImpl to use and store a
Camera2RequestSettingsSet instead of a bare API 2 CaptureRequest.Builder.
Change-Id: I03f9f98c954a7b0c140ac8d80161878c92ef65d2
|
|
|
|
|
|
|
| |
In the move to the portability library, TORCH mode got dropped.
Bug: 16680156
Change-Id: I3878c2399246bdb5cc80311c49533971c0c4c3d2
|
|
|
|
|
|
|
|
|
| |
This implements focus locks very simply using only camera2 API requests: the
lens is locked on autoFocus() and unlocked on cancelAutoFocus(), as with the
existing legacy API--backed implementation. Both passive and active focus modes
ares supported, with and without positional focusing.
Change-Id: I26b1866539807fd3d64189923871443056a166af
|
|
|
|
|
|
|
| |
The base class still (redundantly) defined states, and AndroidCameraStateMachine
was overriding methods with a verbatim copy of their implementations.
Change-Id: I0e6361417edb159f91b89409058ee9a73b1101d9
(cherry-picked from commit dbc457417c581c21b5d49539325b1b152dc1baba)
|
|
|
|
|
|
|
| |
At the moment, only SurfaceTextures (and not SurfaceViews/SurfaceHolders) are
supported. The tests still only cover Stringifier and IntegralStringifier.
Change-Id: Ie643c58f8383cd3b9f59c16e0b79239df0ca068d
|
|
|
|
|
|
|
|
|
| |
This removes the CameraDevice#getCameraInfos() call that provided direct access
to this API 1 type, replacing it with another accessor returning individual
instances of the new wrapper type CameraDevice.BasicCharacteristics .
It also gives CameraProxy a method for getting instances of this wrapper.
Change-Id: I0c72ffe71817b8acf1cc5a01f1565ec4e0e97e7d
|
|
|
|
|
|
|
|
|
|
| |
1. View angles in capabilities.
2. Preview formats setting.
3. Photo formats setting.
4. Recording hint for video recording preview setting.
5. JPEG thumbnail size setting.
Change-Id: Ib8e33cf838859ae76a662fffcc496250ad85c203
|