Commit Graph

860 Commits

Author SHA1 Message Date
Eino-Ville Talvala
5b02e9f65f am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
* commit 'a4aad3d0e5c258d6bbf6254ec5ab80a470b1b529':
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:35:58 +00:00
Ruben Brunk
574936894d camera2: Update native/managed key mappings.
Switches to using managed value classes for the following keys:
- android.sensor.info.sensitivityRange
- android.sensor.info.exposureTimeRange
- android.jpeg.gpsCoordinates
- android.jpeg.gpsTimestamp
- android.jpeg.gpsProcessingMethod
- android.statistics.lensShadingMap
- android.lens.info.shadingMapSize
Also fixes a minor bug in LensShadingMap

Bug: 14628001
Change-Id: Ia0f541242f529ab9ba3111db799306b198f2b40b
2014-05-28 10:26:21 -07:00
Jinsuk Kim
b0674f0f7c Fix a couple of bugs in CEC services
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-05-28 09:30:39 +00:00
Yin-Chia Yeh
8490ace76f Camera2: switch API interface to java classses
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve

Bug: 14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
2014-05-28 01:36:54 -07:00
Eino-Ville Talvala
2bb91a7a68 Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
Also fix a minor bug in ColorSpaceTransform copying validation.

Affected keys:
  android.colorCorrection.transform
  android.colorCorrection.gain
  android.control.aeAvailableAntibandingModes
  android.control.aeAvailableModes
  android.control.afAvailableModes
  android.control.availableEffects
  android.control.availableSceneModes
  android.control.availableVideoStabilizationModes
  android.control.awbAvailableModes
  android.edge.availableEdgeModes
  android.hotpixel.availableHotPixelModes
  android.lens.info.availableOpticalStabilization
  android.noiseReduction.availableNoiseReductionModes
  android.sensor.calibrationTransform1
  android.sensor.calibrationTransform2
  android.sensor.colorTransform1
  android.sensor.colorTransform2
  android.sensor.forwardTransform1
  android.sensor.forwardTransform2
  android.statistics.info.availableFaceDetectModes
  android.tonemap.availableToneMapModes

Bug: 14628001
Change-Id: Ic0a3ff0aaa6bfe872cf8fb740870618c3eee3008
2014-05-28 01:36:53 -07:00
Igor Murashkin
78712a8bd7 camera2: Add new metadata keys, change types for existing range keys
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling

Changes the following keys' type
generations:
* android.control.aeTargetFpsRange
* (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges
* (Range<Integer>[])
* android.control.aeCompensationRange
* (Range<Integer>)
* android.lens.focusRange
* (Range<Float>)

Bug: 14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
2014-05-28 01:36:53 -07:00
Yin-Chia Yeh
817f8933ee Camera2: Replace int[] by MeteringRectangle
Bug: 14628001
Change-Id: I8ae4efa24d41043046a84b04e5209259a8a21063
2014-05-28 01:36:53 -07:00
Igor Murashkin
5fe5bcaeaa am dc0230fc: Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev
* commit 'dc0230fc450e8880fb640cd476f2248bf0a401e4':
  camera2: Add partial results to the capture listener (API change)
2014-05-27 23:57:36 +00:00
Aravind Akella
1a68f24ab7 Merge "Adding wakeup sensors, maxDelay to java SDK." 2014-05-27 19:25:41 +00:00
Igor Murashkin
db075afc85 camera2: Add partial results to the capture listener (API change)
* Also adds capture sequence aborted callback

Bug: 12492876
Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
2014-05-27 11:25:24 -07:00
Etienne Le Grand
ef0b88181e am 7326defe: am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev
* commit '7326defe2de7ace86236bf0c5353fe0687c3f99c':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
2014-05-27 18:10:52 +00:00
Etienne Le Grand
7326defe2d am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev
* commit 'd7439d8c59e4c5a82ad94a5080436cc94f72e0be':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
2014-05-27 18:06:13 +00:00
Yuncheol Heo
1178cd29b2 Merge "Add the constants for the callback result of SendCecCommand()." 2014-05-26 02:45:40 +00:00
Yuncheol Heo
ece603b795 Add the constants for the callback result of SendCecCommand().
- Move the send failure warning messages into HdmiCecController.sendCommand()
  from each Actions.
- Stringfy with more detail messages for some opcodes.

Change-Id: Ib7ce24dd2a1f290e6c3a0b26738772ef1d4a9630
2014-05-26 11:35:09 +09:00
Etienne Le Grand
af80510e85 Add confidence to the heart rate monitor definition and clarify onAccuracyChange
Change-Id: I686d07dcd603bf3c3be3c1471de8be3b4e240855
2014-05-23 19:14:33 -07:00
Ruben Brunk
c371be303b Merge "camera2: Remove CameraAccessException throw for vendor tag setup." 2014-05-24 02:03:51 +00:00
Aravind Akella
2f8b91449e Adding wakeup sensors, maxDelay to java SDK.
Change-Id: I6da09b146e2b1c90efea7faf40a0503a89542cb0
2014-05-24 02:01:39 +00:00
Ruben Brunk
b6a781066e camera2: Remove CameraAccessException throw for vendor tag setup.
Bug: 15108304
Change-Id: Ieeb3f4b7b8bda9fc0ea1a3fc13be21668a0bbafd
2014-05-23 18:47:15 -07:00
Ruben Brunk
94ecb5506a am a7c97c55: Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev
* commit 'a7c97c552a280ed3a2ff3535a5085f8601f45820':
  camera2: Move DngCreator to hardware/camera2.
2014-05-24 00:30:06 +00:00
Ruben Brunk
0bfa56e766 Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev 2014-05-24 00:25:59 +00:00
Zhijun He
2f6da3e739 am 0eb2fa3c: Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev
* commit '0eb2fa3cf88d037f645555e3a1c4644cdf0a67c9':
  Camera2: Mark the under-specified tags for FUTURE
2014-05-23 22:48:08 +00:00
Zhijun He
8949225294 Camera2: Mark the under-specified tags for FUTURE
Also clean up the tag ids.

Bug: 15168075
Change-Id: I57fb6fb37e512c224370c72d806a4b702360f29f
2014-05-23 13:49:59 -07:00
Igor Murashkin
e48fb064ac am 31771fd6: Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-preview-dev
* commit '31771fd63b8d08207012c4877a08679fa9b9d539':
  camera2: Refactor CameraMetadata.Key out into 3 key classes
2014-05-23 20:13:38 +00:00
Ruben Brunk
db67ffd62b Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev 2014-05-23 20:02:01 +00:00
Ruben Brunk
5e3c3aa44d DO NOT MERGE: Javadoc fix.
Bug: 15189630

Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2
(cherry picked from commit 0a03a2ab50b665d382f92a1219177c3bd6fc568b)
2014-05-23 19:04:47 +00:00
Igor Murashkin
d6d65154e5 camera2: Refactor CameraMetadata.Key out into 3 key classes
Before:
* CameraMetadata.Key<T>

After:
* CameraCharacteristics.Key<T>
* CaptureResult.Key<T>
* CaptureRequest.Key<T>

CameraMetadata#get has been removed (each metadata subclass has
its own #get now) due to java generic limitations (in particular
a type bound <T1<T2> extends Key<T2>> is an illegal bound).

CameraMetadataNative gets a new #dumpToLog function to dump the native
metadata to logcat.

Bug: 15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
2014-05-23 11:55:29 -07:00
Zhijun He
500c2341d3 am 02d13364: Camera2: Add croppingType tag
* commit '02d133644511dbc14deb833c05713a531100e5d4':
  Camera2: Add croppingType tag
2014-05-23 10:16:20 +00:00
Zhijun He
1498615d56 Camera2: Add croppingType tag
This is to indicate if the camera supports arbitrary cropping.

Bug: 15168075
Change-Id: Ib75f7af629be816229cc686c89980fec101301c0
2014-05-22 21:58:48 -07:00
Zhijun He
db0f573386 am 76be7fc6: Merge "Camera2: Raw is not croppable" into lmp-preview-dev
* commit '76be7fc69daea6b9118ad5b4eccdd5e940ca401b':
  Camera2: Raw is not croppable
2014-05-23 00:47:03 +00:00
Zhijun He
83e214ecd6 am 920e79b6: Merge "Camera2: Clarify shading map spec" into lmp-preview-dev
* commit '920e79b680e7329dbbd107da8c9118a763d43f87':
  Camera2: Clarify shading map spec
2014-05-23 00:39:36 +00:00
Eino-Ville Talvala
0324a95052 am 7e01420b: Merge "Camera2: New capture session interface" into lmp-preview-dev
* commit '7e01420b8e532694369fc885f83838fc527708dd':
  Camera2: New capture session interface
2014-05-23 00:11:05 +00:00
Zhijun He
9e6d1880c2 Camera2: Raw is not croppable
Update spec doc to clarify that raw stream is not croppable.

Bug: 15168075
Change-Id: I4ffa8e2a06acd17913426ba37744bb9df1bc7330
2014-05-22 16:47:35 -07:00
Zhijun He
fa7c755a92 Camera2: Clarify shading map spec
The existing spec is unclear about shading map calculation for both application
developer and hal implementers, need more clarification.

Also fix a typo in tonemap.mode.

Bug: 15168075
Change-Id: I7f38ccf6aa6938fdac9f64e95deddc0188025d08
2014-05-22 16:36:02 -07:00
Ruben Brunk
b6079005ed camera2: Move DngCreator to hardware/camera2.
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
2014-05-22 22:57:11 +00:00
Eino-Ville Talvala
cca00c614c Camera2: New capture session interface
- Add CameraCaptureSession for all operations that require a
  valid camera configuration
- Deprecate methods in CameraDevice that are moving to CameraCaptureSession
- Document new semantics

Bug: 14964443
Change-Id: I53b2b71ed2b746cfcf76a01483f499765eb5047b
2014-05-22 20:52:36 +00:00
Aravind Akella
94e4d29eff Merge "Hide Sensor.getRequiredPermission API." 2014-05-22 19:11:53 +00:00
Ruben Brunk
3e7fe434d0 Javadoc fix.
Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2
2014-05-22 06:30:16 -07:00
Ruben Brunk
94520c7460 Merge "camera2: Add HAL1 compatibility shim skeleton." 2014-05-22 06:08:56 +00:00
Jinsuk Kim
9302a733b0 Fix broken build
Change-Id: Icff98663842482149d8c5c5371327121a1adff3d
2014-05-22 04:35:08 +00:00
Jinsuk Kim
78d695d8ba Add feature actions for HDMI-CEC playback device
- OneTouchPlayAction
- DevicePowerStatusAction
- addHotplugEventListener
- removeHotplugEventListener

Change-Id: Ia7f31507ca62127efbacbbfe07ab43ba1f9bd4cf
2014-05-22 11:15:51 +09:00
Ruben Brunk
feb50af361 camera2: Add HAL1 compatibility shim skeleton.
This adds basic support for running the Camera2 API on a device running
a camera HAL version lower than CAMERA_MODULE_API_VERSION_2_0.

This CL includes support for:
- N-way preview output streams
- N-way jpeg output streams
- CameraDevice emulation at the binder interface
- Basic camera metadata querying in the CameraManager

Bug: 15117269
Bug: 15116722

Change-Id: I8322955034c91f34bb348d4b28c2b774dbef38f6
2014-05-21 16:37:59 -07:00
Aravind Akella
b613dba173 Hide Sensor.getRequiredPermission API.
Change-Id: Ia0f4e64a563ca409849cf53721b4836abbb0be68
2014-05-21 14:14:45 -07:00
Mike Lockwood
5633e37ec1 Merge "USB: Minor cleanup from API council review" 2014-05-20 18:58:35 +00:00
Mike Lockwood
fa2b3fc6cd USB: Minor cleanup from API council review
Bug: 15089961
Change-Id: I8a22fad94d2a52d2270c89240b2a47bd1cef17b5
2014-05-20 11:14:58 -07:00
Jinsuk Kim
91120c541a HdmiControlManager with HdmiPlaybackClient API definition
This is a rewrite of HdmiCecManager that exposes API for CEC Playback
device control. HdmiCecManager will be removed together with
HdmiCecService once the migration is completed.

Replaced direct access to CEC commands with the following 2 API:
- oneTouchPlay
- queryDisplayStatus

Each method requires communication with other device on CEC bus,
hence might take some time to finish. The result at the end of
protocol exchange is reported through a callback provided as a
parameter to the method.

The callback is based on interface not abstract class since
it has only one method 'onComplete'.

Change-Id: I41e9d4571f890303282a79a803c86530d0b46974
2014-05-19 07:46:26 +09:00
Ruben Brunk
f967a5486a camera2: Plumb DngCreator to native library.
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
2014-05-16 23:25:51 -07:00
Igor Murashkin
9d08a93b2d Merge "camera2: Move parameters around to different packages" 2014-05-16 18:08:41 +00:00
Jungshik Jang
b0650e8ff3 Merge "Add ARC commands" 2014-05-16 06:49:18 +00:00
Jungshik Jang
be9cd8eb3f Add ARC commands
ARC, Audio Return Channel is newly introduced in HDMI CEC 1.4.
Here is a list of new command
<Initiate ARC>
<Report ARC Initiated>
<Report ARC Terminated>
<Request ARC Initiation>
<Request ARC Termination>
<Terminate ARC>

Along with it replaced <Get OSD Name> with <Give OSD Name>
which is renamed in CEC 1.4.

Change-Id: If4a7aedef839c8413a8e3b5f66f3df0c7234104b
2014-05-15 20:21:43 +09:00
Igor Murashkin
72f9f0a96e camera2: Move parameters around to different packages
* Camera-specific params to android.hardware.camera2.params
* Remove android.hardware.camera2.Size
* Move Rational to android.util

Bug: 14628001
Change-Id: Ie7a82bf9f4a0d8c18e0dc3a1581123c0d95da3f0
2014-05-14 18:24:58 -07:00