Commit Graph

954 Commits

Author SHA1 Message Date
Ruben Brunk
ed81ebc3c5 Merge "camera2: Fix frame ID returned by legacy mode shim." 2014-06-20 21:00:34 +00:00
Ruben Brunk
53284d5816 camera2: Fix frame ID returned by legacy mode shim.
Bug: 15116722
Change-Id: I59e9ac43b192c41f83fe350a93aa860b2619dfe5
2014-06-23 11:36:10 -07:00
Ruben Brunk
91b9aabc9f camera2: Switch to using YV12 for ImageReader.
Bug: 15116722

- Also fixes incorrect frame number for single captures.

Change-Id: I8552124d18ad176e6724f089a1e3a3f49a5eeec4
2014-06-20 15:59:00 -07:00
Ruben Brunk
5776aafc7e camera2: Add AE antibanding + fps range metadata.
Bug: 15116722
Change-Id: I627748e162f26c42f6bbcfc21ee4b1081e1f25ad
2014-06-19 19:20:36 -07:00
Igor Murashkin
49b2b13510 camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass
* Also fixes configureOutputs to allow it to unconfigure
* Adds IAE checks in a few spots to validate surfaces aren't null

Bug: 15116722
Change-Id: I9ec88bccb3600eb12747d84436ead27952e87646
2014-06-19 17:36:07 -07:00
Jungshik Jang
ea67c183fe Add for System Audio Mode
Note that this is skeleton change and do not merge
till get full review from outside of CEC team.

This change introduce four apis for System Audio Mode

1. boolean canChangeSystemAudioMode()
  -  Whether to change system audio mode or not.

2. setSystemAudioMode(boolean enabled, IHdmiControlCallback callback);
  - Change system audio mode.

3. add/removeSystemAudioModeChangeLister.
  - Register/deregister listner for AudioModeChange.

4. getSystemAudioMode()
  - Whether to system audio is enabled or not.

Change-Id: I1e82365155a9f7f6c3ac5d9db4871cf6bad46865
2014-06-23 13:32:43 +09:00
Ruben Brunk
5e6421bd8f Merge "camera2: Switch to using YV12 for ImageReader." 2014-06-20 20:43:34 +00:00
Igor Murashkin
60679f6b7d Merge "camera: Get detailed error reporting from api1 Camera if open fails" 2014-06-20 18:26:34 +00:00
Igor Murashkin
a1d662716b camera: Get detailed error reporting from api1 Camera if open fails
* Also maps camera2 open errors the same for shim/nonshim paths

Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
2014-06-20 11:26:39 -07:00
Eino-Ville Talvala
15d0f97473 Merge "Camera2: Call onCaptureSequenceAborted when appropriate" 2014-06-20 02:04:45 +00:00
Igor Murashkin
1788b0466b camera2: Shim fix hwLevel and minimumFocusDistance
Change-Id: Ie4ab330a738ac4c8e465eacade1bbc39bdb776fe
2014-06-20 13:45:46 -07:00
Eino-Ville Talvala
ee37e30c22 Camera2: Call onCaptureSequenceAborted when appropriate
Bug: 15524101
Change-Id: I4615d0b4ae3cae80609586f7dfa8373691a9e384
2014-06-20 17:24:40 +00:00
Zhijun He
6e335c44c6 Merge "Camera: Implement HAL1 and higher HAL API coexistence" 2014-06-19 20:37:59 +00:00
Zhijun He
4c91380114 Camera: Implement HAL1 and higher HAL API coexistence
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.

Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
2014-06-19 15:46:02 -07:00
Ruben Brunk
3e4fed203f camera2: Add shim frame duration and stall characteristics.
Bug: 15116722
Change-Id: Ief8b05d46fa12f63cf6a5d41e312c94d5a033553
2014-06-19 14:50:45 -07:00
Jinsuk Kim
a062a9339a Implement portSelect/sendKeyEvent for HdmiControlService
TIF (TV Input Framework) uses these API to switch inputs, send
keys for selected device on CEC bus. Also renamed getActiveInput
to getActivePortId to use a unified term for port/input.

Change-Id: I8196825c0d960988cc1c0bb58a628ccd8ab1957e
2014-06-18 03:53:16 +00:00
Ruben Brunk
d85e1a6ced camera2: Adding legacy mode support for teeing to Video.
Bug: 15116722

- Select intermediate GL texture size based on available
  preview dimensions.
- Fixes for configure deadlock.
- Fixes for jpeg capture.

Change-Id: I3f665230defdad718de40494dd67fda5ea432bfb
2014-06-17 22:56:36 +00:00
Igor Murashkin
4961bc88d7 camera2: Map camera characteristics in the managed layer
Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
2014-06-17 22:55:16 +00:00
Jinsuk Kim
0d3985a977 Added an argument isPressed to HdmiControlService#sendKeyEvent
sendKeyEvent requires additional argument isPressed to handled
both up/down key event.

Change-Id: I0080adc72920dd7ae4e4dae041781f76a6658f9b
2014-06-16 17:26:10 +09:00
Jinsuk Kim
6d97f5b91c A few more APIs for HdmiControlService
Added following APIs in HdmiControlService:

- portSelect
- sendKeyEvent
- getPortInfo
- addDeviceEventListener

Some are not fleshed out yet. Will work on it in a follow up CL.

Change-Id: Ia8c635176c0378f6e8db589bf714d82bf21ce85d
2014-06-16 14:01:45 +09:00
Zhijun He
5eaf6d2161 Merge "Camera2: Add timestampCalibration tag" 2014-06-13 21:09:46 +00:00
Zhijun He
45fa43a181 Camera2: Add timestampCalibration tag
Also update the video/optical stabilization docs.

Change-Id: I444cc8d46c0a460bc4311e58bf6166b5c6dbfd14
2014-06-13 18:29:37 -07:00
Eino-Ville Talvala
5ae1ca5b69 camera2 docs: Fix instructions for using SurfaceView.
Bug: 15597178
Change-Id: I802369e61725451ddd8df855c384608c80e12693
2014-06-12 17:02:17 -07:00
Sol Boucher
b8cee5175d camera2: Remove stray </p> in CameraDevice#createCaptureSession
This was causing strange indentation.
The change also clarifies how to get the supported output sizes in the
ImageReader flow: Although the doc (correctly) instructed the developer to use
StreamConfigurationMap#getOutputSizes(int) with an ImageReader, this instruction
appeared after the bulleted list of output types. Since all other items in that
list specify that getOutputSizes(Class<?>) should be used, the reader shouldn't
be expected to read beyond the list only in this specific case.

Bug: 15574400
Change-Id: Id952b46ae52322d75abbcaffea678d5ba50b22a5
2014-06-12 17:39:11 +00:00
Zhijun He
0cb41fd5ad Merge "Camera2: Add rollingShutterSkew tag" 2014-06-13 21:09:46 +00:00
Zhijun He
0bda31afe0 Camera2: Add rollingShutterSkew tag
Change-Id: Icbedaeda9fc64a9dda509493ad9d14569c56cd18
2014-06-13 14:38:39 -07:00
Eino-Ville Talvala
c5c363f0ff am 14b5f131: Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev
* commit '14b5f131c7118d58a6215e1f6d877d5cd31de54c':
  camera2 docs: Fix instructions for using SurfaceView.
2014-06-13 00:35:59 +00:00
Aravind Akella
221748039c Merge "Add java APIs for Sensor reportingMode." 2014-06-12 03:30:50 +00:00
Jinsuk Kim
0340bbc89f RoutingControlAction for HdmiControlService
Routing control action is initiated in various cases, such as manual
TV input port switching, routing change of a different CEC switch,
and so on. The action determines the device to be a new active source.

Change-Id: I1efcd6ff1919dd94d6fa0e0ffa6e430c48d4e9c6
2014-06-12 23:40:05 +00:00
Jinsuk Kim
a6ce7708d6 DeviceSelectAction for HdmiControlService
DeviceSelectAction is the main handler for the API deviceSelect() which is
used to choose a new active source among logical devices on the bus.

Change-Id: I77582a1f873423fc316d89f67a89a867461a76b2
2014-06-12 23:06:29 +00:00
Sol Boucher
a13697f68d am 85d82c70: camera2: Remove stray </p> in CameraDevice#createCaptureSession
* commit '85d82c70e1766c5a38c65fdfda8304aefcaa6576':
  camera2: Remove stray </p> in CameraDevice#createCaptureSession
2014-06-12 22:31:01 +00:00
Eino-Ville Talvala
bb373e601f am e941070b: Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev
* commit 'e941070bd7ab910b558bbace38e2ff813fa0327c':
  Camera2: Misc + enum value documentation updates
2014-06-12 16:53:54 +00:00
Eino-Ville Talvala
486ed08899 Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev 2014-06-11 08:41:11 +00:00
Eino-Ville Talvala
e600d6ad60 Camera2: Misc + enum value documentation updates
- Update enum values for many entries
- Reword various sections of documentation for clarity.

Bug: 15475465
Change-Id: I2b03cac8d478e945c7d93717845a9ae44b97639b
2014-06-10 15:12:46 -07:00
Eino-Ville Talvala
ac4dcf6d90 am bc4b6859: Merge "Camera2: Many docs updates" into lmp-preview-dev
* commit 'bc4b6859cb12564d7dfe37abffd77465b4be75d0':
  Camera2: Many docs updates
2014-06-11 17:03:11 +00:00
Eino-Ville Talvala
73b1d94baf Merge "Camera2: Many docs updates" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Ruben Brunk
937c4dbb1f Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Ruben Brunk
d8c21e8bd0 DO NOT MERGE: camera2: Disallow shim usage for preview.
Bug: 15515564
Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710
2014-06-10 19:45:43 +00:00
Igor Murashkin
f1d758867a am 69729adf: Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev
* commit '69729adf04bddb2e5b67d625412151b4bcbc1ca4':
  camera2: Fix session-related CTS test failures
2014-06-10 17:22:22 +00:00
John Reck
1a2f7a1e29 resolved conflicts for merge of 2d2aa0cc to master
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
2014-06-10 07:53:03 -07:00
Igor Murashkin
3721cbaf01 Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev 2014-06-10 04:02:28 +00:00
Igor Murashkin
e1442204c1 camera2: Fix session-related CTS test failures
Bug: 15474402
Change-Id: I4ae86166b5ce99a854c754c8ac6d6c23c683b14a
2014-06-09 17:51:24 -07:00
Aravind Akella
27900358f2 Add java APIs for Sensor reportingMode.
Change-Id: Iba6bb11f990d9966b86bf02d70ced7312f3e64a8
2014-06-09 16:56:29 -07:00
Jinsuk Kim
66d1eb285b Tag HdmiControlService API classes with @hide/@SystemApi
Bug: 15516329, Bug: 15516710
Change-Id: Ie814513a642660b6c5fdc9e891ad1eec1b2d689b
2014-06-09 23:49:21 +00:00
Eino-Ville Talvala
b67a3b36fd Camera2: Many docs updates
- Improve CameraManager.AvailabilityListener docs
- Fix references to createCaptureSession immediately returning a session
- Remove most docs from deprecated methods, to minimize confusion.
- Remove references to deprecated methods from non-deprecated methods.
- Improve acronym use in metadata keys, and other minor metadata doc fixes.
- Improve package-level docs.

Bug: 15394187
Bug: 15394241
Bug: 15394242
Bug: 15394526

Change-Id: I48de626a33ef9b834578f7bb890de9b98d3122d2
2014-06-09 11:45:55 -07:00
Ed Heyl
5adb67d4ce merge 4ce22057, regen api/current.txt
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
2014-06-09 10:41:21 -07:00
Jinsuk Kim
3f48068d78 Remove HdmiCecService
The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
2014-06-09 07:55:47 +09:00
Aravind Akella
acbf10ce5c Merge "Hide Sensor.getRequiredPermission API." into lmp-preview-dev 2014-06-06 01:57:25 +00:00
Sol Boucher
fca5f52347 am af9a77d6: camera2: Fix ordering issue between #onOpened and createCaptureSession
* commit 'af9a77d64912985a3fa9f91cd0e372316e790b9f':
  camera2: Fix ordering issue between #onOpened and createCaptureSession
2014-06-06 01:51:25 +00:00
Sol Boucher
4b3f800438 camera2: Fix ordering issue between #onOpened and createCaptureSession
This resolves an issue where the CameraDevice.StateListener callbacks were
erroneously called before the CameraCaptureSession.StateListener ones,
preventing e.g. creating a capture session from the
CameraDevice.StateListener#onOpened() callback.
It also explicitly ignores CameraDevice.StateListener#onUnconfigured() calls
occurring before the first call to #close .

Bug: 15449190
Change-Id: Ic0094d53a65e42108201d7bb50734d17290fa9bf
2014-06-06 01:43:00 +00:00