Commit Graph

544 Commits

Author SHA1 Message Date
Igor Murashkin
ab98a0b116 Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev 2013-09-20 23:21:51 +00:00
destradaa
47d620ac28 Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev 2013-09-20 23:18:15 +00:00
destradaa
7f02eb2c84 Ensure access to the map of geofence callbacks is synchronized in all cases
Fix Java reference leak in the JNI layer

Bug: 10624887
Change-Id: I656973653d82c73a7ba2b51f22989ffed144c5df
2013-09-20 15:19:00 -07:00
Igor Murashkin
5c9eaf6796 camera2: Add more camera device states, make #openCamera async.
* Move CAMERA_IN_USE, MAX_CAMERAS_IN_USE to StateListener#onError
* Copy CAMERA_DISABLED to StateListener#onError

Bug: 10360518
Change-Id: Idd8cf42e1511d12682018588b2b413116cf65116
2013-09-19 19:01:32 -07:00
Zhijun He
4e1921fa3d Camera2: Add docs for availableProcessedSizes
Bug: 10745982
Change-Id: Ia240fa6c0dc0485e2b8dcd04c5a87fa515b0d7b0
2013-09-17 12:46:29 -07:00
Igor Murashkin
1e4e38252f Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev 2013-09-16 22:47:07 +00:00
Igor Murashkin
901be0ae33 Merge "camera2: Update Face class." into klp-dev 2013-09-16 22:32:11 +00:00
Zhijun He
68ebc1a7b4 Camera2: Add MAX_CAMERAS_IN_USE error case handling
Throw CAE with reason MAX_CAMERAS_IN when the error code is EDQUOT.

Bug: 10749544
Change-Id: I6820de8b95662a55bb37f099746ea2cbe5056f24
2013-09-15 11:55:44 -07:00
Igor Murashkin
7a36a0fbb0 camera2: Add key enumeration functionality to CameraMetadata
* Add a way to enumerate all currently set keys in CameraMetadata
* Add a way to enumerate all available keys for CaptureRequest
* Add a way to enumerate all available keys for CaptureResult
* No way to enumerate all keys for CameraProperties, since it would be
  identical to all the currently set keys.

Bug: 10360518
Change-Id: I3a90f8cc385db14a675e4ff876ae93d906ff06bf
2013-09-13 19:00:15 -07:00
Igor Murashkin
b779ac1e2e camera2: Update Face class.
- Move Face to be outer class. Enables Parcelable-izing it later.
- Add static public constants for field values.
- Add @hide constructors.
- Rename methods returning Point to have Position suffix.
- Add new key android.statistics.faces (CaptureResult#STATISTICS_FACES)

Bug: 10360518
Bug: 10549293
Change-Id: I067f06f0426114b2c3a3266ca7e00e6cb1d89046
2013-09-13 17:42:26 -07:00
Rachad Alao
4fe6429ba2 Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 2013-09-13 23:44:44 +00:00
Zhijun He
bbae94a02e Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
It collides with HAL ZSL template, rename it to TEMPLATE_ZERO_SHUTTER_LAG and
hide it for now.

Bug: 10690122
Change-Id: I793154849aa7aa4bf4874e2ff3f3890dd05b1f9e
2013-09-13 13:27:03 -07:00
Eino-Ville Talvala
184b17ddef Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 2013-09-12 18:32:29 +00:00
Igor Murashkin
6c62163976 Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 2013-09-12 18:21:15 +00:00
Eino-Ville Talvala
d96748b02a Camera2: Add a missing key for controlling shading map mode
Bug: 10726421
Change-Id: If41e00c921ab493c7427575258fed63cbbc22dc1
2013-09-12 11:11:27 -07:00
Igor Murashkin
9ea4ae67fb camera_metadata: add android.lens.state MOVING enum value
Bug: 10621609
Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2
2013-09-11 21:43:50 -07:00
Alex Ray
03ad7ae1bc Merge "consumer ir: clarify @link in documentation" into klp-dev 2013-09-12 00:40:50 +00:00
Eino-Ville Talvala
ede3eeb72c Merge changes Ia6300c23,Idd2ae8ad into klp-dev
* changes:
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
2013-09-12 00:08:04 +00:00
Alex Ray
1e679441af consumer ir: clarify @link in documentation
Change-Id: Ifebd0b550f5d9860697539646596a0b1cc782949
2013-09-11 15:39:05 -07:00
Eino-Ville Talvala
70c2207c34 Camera2: Immutable metadata
Make all camera metadata immutable once created; requests are
created using CameraRequest.Builder.

- Separate CameraMetadata implementation from interface
- Implement deep copying of metadata
- Requests/results/properties have-a native implementation

Bug: 10360518
Change-Id: Ia6300c237219d39f70c63156fa9ca666d951a36e
2013-09-11 13:18:10 -07:00
Eino-Ville Talvala
4af73c2153 Camera2: Listener rework and other API updates
- Add Handlers to each callback-accepting function
 - Expand CameraDevice ErrorListener to CameraDeviceListener
   - Add idle callback
   - Split out disconnect error to its own callback
 - Add CameraDevice#getId
 - Rename CameraManager's listener to AvailabilityListener
 - Rename CameraManager register/unregister*Listener to
   add/remove*Listener
 - Rename getDeviceIdList to getCameraIdList

Bug: 10549567
Bug: 10549462
Change-Id: Idd2ae8ad8eb126f35a15d765306ada7c1cf74eea
2013-09-11 12:41:27 -07:00
Erik Gilling
51e95df8f2 Add consumer IR framework
Change-Id: I786c00db0cce61ef75e4edc24e90f2cdcba6dbfb
2013-09-11 09:52:47 -07:00
Igor Murashkin
5020936862 Merge "camera2: Don't NPE in onStatusChanged" into klp-dev 2013-09-10 19:29:27 +00:00
Igor Murashkin
7441695049 camera2: Don't NPE in onStatusChanged
Bug: 10360518
Change-Id: Icf70a908581af209b889237ad64a555b7e794b67
2013-09-06 16:03:29 -07:00
Aravind Akella
fcf5809ad4 Merge "Sensor batching APIs for review." into klp-dev 2013-09-06 22:30:19 +00:00
Aravind Akella
d405e0fc82 Sensor batching APIs for review.
Change-Id: I34504e1a0856c2dfeceb69c808abdf3e805c5f1f
2013-09-06 15:11:50 -07:00
Timothy Knight
a2815faad7 Camera2: Minor docs fix.
Bug: 10639270
Change-Id: Ic5b046a8f8e1c8be83f010e05247914c61b3674b
2013-09-06 13:34:30 -07:00
Ruben Brunk
f267dd1d79 Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 2013-09-05 01:23:40 +00:00
Timothy Knight
2629f27362 Camera2: Clarified docs for 3A regions.
Bug: 10545568
Change-Id: I0a76e7d063ceccb68707973abd312a1b909155ec
2013-09-04 21:07:13 +00:00
Ruben Brunk
6462be7fa0 Fix CameraService error flag when running HAL1 with API2.
Bug: 10620944
Change-Id: I72517a25bfe0e891ed150c568c37e04a9d6cc38c
2013-09-04 12:09:23 -07:00
Timothy Knight
23c8809568 Camera2: Updated Rational for denom=0.
Handle NaN and INF using the same semantics as Java floats. No longer
throw an exception if a rational is constructed with a zero-denominator.

This commit is required for the ITS pdk app, since without it, the app
fails when it tries to deserialize rational values that are
(incorrectly) set to 0/0.

Bug: 10337323

Change-Id: I890ec2092f2945abc0f531fc46f9a7f5c71d2dbf
2013-09-04 16:58:58 +00:00
Aravind Akella
1f519d4682 Fix for build breakage. Remove documentation link to hidden registerListener API.
Change-Id: Iba5d623bf12f1b6654f570febcc65d591d309038
2013-09-03 19:37:24 -07:00
Igor Murashkin
979cf8e461 Merge "camera2: Don't NPE when closing the CameraDevice" into klp-dev 2013-09-04 00:44:31 +00:00
Aravind Akella
b4c76b18a3 Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
Bug: 10109508
Change-Id: I6dfdd986bd8c3368cb568fa7d90abf9c03de9aef
2013-09-03 17:02:41 -07:00
Igor Murashkin
2a3eced15e camera2: Don't NPE when closing the CameraDevice
Bug: 10360518
Change-Id: I0154e12490a063adea753c0aa6ae422605ba5ac5
2013-08-28 17:38:39 -07:00
Eino-Ville Talvala
fb3d78118b Merge "Camera2: Add CameraDevice#flush()" into klp-dev 2013-08-27 16:49:04 +00:00
Igor Murashkin
9e680685f9 Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" into klp-dev 2013-08-26 20:22:14 +00:00
Igor Murashkin
57ea59b376 camera2: CameraDevice#configureOutputs now deletes unused streams
Bug: 10461554
Change-Id: I3dc48e434d83b18909d25723cc8855c82e1072bc
2013-08-26 11:09:40 -07:00
Jeff Brown
511cd35fcc Docs changes pursuant to API review feedback.
Change-Id: I74c51791192f7fefad4e299d25c91438cbf6ab73
2013-08-23 17:44:47 -07:00
Chong Zhang
1f3ecaae63 wifi-display: add certification options
When certification mode is enabled:

- Pass wfd session info to wifi display settings

- Allow sink to connect to source

- Add interface in display manager for pausing/resuming session

- Add interface in WifiP2pManager for setting lc, oc and starting
  autonomous GO

Note that we're compliant regardless of certification mode, but
some confusing options (eg. allowing incoming connection from
sink) we want to hide when not being tested.

Bug: 9371882
Change-Id: Icc7dcae4e046453796cfa03f5f197055fabf234b
2013-08-23 16:02:09 -07:00
Eino-Ville Talvala
8ebd52bf41 Camera2: Add CameraDevice#flush()
- For quickly clearing out all pending and in-progress captures

Bug: 9758581
Change-Id: Ie4123fcc4d4b648a11d4a6257c531f07182bab39
2013-08-23 14:20:35 -07:00
Zhijun He
f293627fc2 Merge "Camera2: Send warning when burst request list is empty" into klp-dev 2013-08-22 22:57:24 +00:00
Zhijun He
fc19e2cfe5 Camera2: Send warning when burst request list is empty
Bug: 10360518
Change-Id: I4ab89af9ecb62442ce277d0ad7604298534ff7db
2013-08-22 14:45:24 -07:00
Michael Wright
8e3a41738f Merge "Expose API to query devices for supported keys" into klp-dev 2013-08-22 21:08:02 +00:00
Zhijun He
6b223c6a5b Merge "Camera2: cleanup unused imports" into klp-dev 2013-08-21 19:01:11 +00:00
Zhijun He
e8aae8a122 Merge "Camera2: Update tonemap curve definitions." into klp-dev 2013-08-21 18:44:06 +00:00
Zhijun He
ed255a09ec Camera2: cleanup unused imports
Bug: 10360518
Change-Id: I067a29ac43e7d70f07f45463bee46a8f6d3f31a5
2013-08-21 11:27:03 -07:00
Zhijun He
3ffd70554f Camera2: Update tonemap curve definitions.
This updates android.tonemap.curveGreen and android.tonemap.curveBlue
definitions.
Also update android.sensor.info.physicalSize type.

Bug: 10394966
Change-Id: I23156ad0cd67fa59500a1c803068e392514756d4
2013-08-21 11:12:04 -07:00
Eino-Ville Talvala
0125ba70bb Merge "Camera2: Convert camera device errors to exceptions" into klp-dev 2013-08-21 18:05:49 +00:00
Eino-Ville Talvala
5afd3e91b8 Camera2: Convert camera device errors to exceptions
Bug: 10360518
Change-Id: I1752cecf55269c2c9f22962660c0b3fc236138fa
2013-08-21 10:37:04 -07:00