| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \ \
| |/ /
|/| |
| | | |
lmp-dev
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
| |
Change-Id: I4038f0aff5e82531ca2b6231feee9ade36ddbb75
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It contains:
- Camera2RequestSettingsSet class for storing/unioning CaptureRequest.Builders
- A Camera2CaptureListenerSplitter class for connecting multiple such listeners
- A Camera2CpatureListenerForwarder for relaying callbacks to another Handler
Change-Id: I47381e4a45b4232b86e5498a1cc39cc600b5c5c5
|
| |
| |
| |
| |
| |
| |
| | |
In the move to the portability library, TORCH mode got dropped.
Bug: 16680156
Change-Id: I3878c2399246bdb5cc80311c49533971c0c4c3d2
|
|/
|
|
|
|
| |
Bug: 15116722
Change-Id: Ib843dea27175dece8857359707318323a57f5409
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
This resolves build breakage.
Change-Id: I3cab88fdee5f86d183b1307dac714466336fc476
|
|
|
|
|
|
| |
This resolves a naming clash with a class in the new camera2 framework API.
Change-Id: Id53aa3e0bbe9e9edaa82b0aec695fd835c3d0ef9
|
|
|
|
| |
Change-Id: I5d388402fa2705da3b58595e3a1e4da3f01eef47
|
|
|
|
|
|
|
| |
Some devices won't work well if we pass in an empty list of focusing or metering
areas.
Change-Id: Iff6bfd37a7d551b12c43e88cf8d4934472837257
|
|
|
|
| |
Change-Id: Ibc1ddac509381530e887b7491069e6367e9a6088
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This relocates several components of the implementation class
AndroidCameraManagerImpl to higher levels in the inheritence hierarchy, where
they can be reused by other implementations of the CameraManager interface:
- AndroidCameraManager.DispatchThread is moved into its own file
- The core (history-tracking) pieces of CameraManager.CameraHandler are moved
into their own HistoryHandler class, which the former is made to inherit
- The constants defined in AndroidCameraManagerImpl for use in its nested
CameraHandler class are moved into a separate class called CameraActions
- AndroidCameraManagerImpl.CameraStateHolder is moved into its own file
- Those CallbackForward classes that aren't tied to Android's Camera1 API are
moved directly into the CameraManager interface
Change-Id: I5f3e1eb72039a0018ce2277e3ec6289bfa4ccec3
|
|
|
|
| |
Change-Id: I5b0d2b8c0384d32ed0d870e5db6003991524fc38
|
|
|
|
|
| |
bug:13877028
Change-Id: Iff0353738de3290244092076b2f955f0d7d57408
|
|
|
|
|
|
| |
Bug: 14823111
Change-Id: I524de9a6dd774c3aa8b6c47092657d66447565bc
|
|
|
|
|
|
|
|
|
| |
To get rid of Camera.Parameters, we need to provide our own interfaces.
Camera.Parameters actually consists of 2 parts: capabilities and settings. We'll
provide two interfaces and will just use Camera.Parameters inside of
CameraManager implementations.
Change-Id: I53922b6d740835412d74365374a6a0382129564e
|
|
|
|
|
|
|
|
|
|
| |
Also change the camera closing conditions to force close all camera before
killing the handler thread.
bug:14190951
bug:14441425
Change-Id: Ic752b0678530b34eb3710bd7796cb17d15452013
|
|
|
|
|
| |
bug:14365703
Change-Id: I4b2259e12121cac5b8165f5c5dbacf9cb3a936a6
|
|
|
|
|
| |
Bug: 14220490
Change-Id: Ibf20d169aae9de4eb9c1e2151d9c7335bcf7b3a3
|
|
|
|
| |
Change-Id: I73c69a70736b0b0eb0ef069a7876cf75fee91262
|
|
|
|
|
|
|
|
|
|
|
|
| |
This CL removes compile-time log suppression with a runtim override.
With a runtime override we can custom configure logging with a single
level, not quite as flexible as a boolean per level but should suit
our needs. Compile-time log pruning could be done with proguard if
desired.
Bug: 13737123
Change-Id: I8bdcaca44b4dc5c7eab8ef2f74e5181bcacd2727
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This CL accomplishes the same goal as the compile-time isDebuggable,
with a runtime property check. This is useful so that we opt in to
logging everything at a given level with one setprop line.
Note that either with this new runtime property or with isDebuggable,
the Log proxy wouldn't log if a particular Configuration value is false,
since that level is instead routed to SILENT_LOGGER.
Bug: 13737123
Change-Id: I78ce629620f420a08a2cc013865847674941fb9b
|
|
|
|
| |
Change-Id: I706874c9ea1b03c2fd9f987cda9581f72883c914
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
see http://ag/438423, merge conflicts solved.
1. Change to use com.android.camera.debug.Log instead of android.util.Log.
2. Add DebugCameraProxy to support more detailed debug info.
3. Add CameraErrorCallback in CameraManager.
4. Support posting to a specific handler for CameraErrorCallback.
5. Trim down some TAGs to match the framework tag length limit.
6. Remove some unused codes in CameraSettings.
bug:13324870
Change-Id: I8c20a8a0d11cfd50b6e199b03cbc88d3c4ad2ceb
Conflicts:
src/com/android/camera/data/LocalMediaData.java
src/com/android/camera/data/RotationTask.java
src/com/android/camera/widget/FilmstripView.java
|
|
|
|
|
| |
Bug: 15474402
Change-Id: I4ae86166b5ce99a854c754c8ac6d6c23c683b14a
|
|
|
|
|
| |
Bug: 15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
|
|
|
|
|
|
|
|
| |
- This fixes a race condition where it was possible to wait for a state
transition using #waitForState but without yet the corresponding
proxy callback having been fired.
Change-Id: If521c4e48177d4b0fe5ab6fed3d31ddd74b656af
|
|\ |
|