Commit Graph

1190 Commits

Author SHA1 Message Date
Igor Murashkin
4e5eddff5e Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 2014-09-16 00:58:24 +00:00
Igor Murashkin
89bb63f395 camera2-legacy: Fix jpeg thumbnail quality not being set
Bug: 17472049
Change-Id: I6ce9f2bb07def86bc58b4b2495c58ee6762a65e1
2014-09-15 17:54:09 -07:00
Eino-Ville Talvala
848fe733f3 Camera2: Check for sequence complete sooner.
It's possible, especially with legacy mode, for a last frame for a
sequence to have already arrived when a repeating sequence is stopped.

In that case, need to check for sequence complete as soon as the
requestId, framenumber pair is added to the pending queue of completions.

Bug: 17428716
Change-Id: Ie5c6ea5a43639c812b8441da326c6303e150fce0
2014-09-15 16:28:02 -07:00
Eino-Ville Talvala
5fa15be4e9 Merge "Camera2: Clean up corner case error handling" into lmp-dev 2014-09-15 18:11:11 +00:00
Eino-Ville Talvala
9503785393 Camera2: Clean up corner case error handling
- If a session is closed, and a new session is created immediately
afterwards, but then fails to be configured, the first session sees an
onUnconfigured call which it wasn't expecting, and throws an
exception on an internal thread, leading to app death.
Add a guard against this case.

- If the lower levels skip a frame (illegal per design), be slightly more
robust to that by accepting any successful result as the latest completed
frame, instead of just incrementing the completed frame count. This will
lead to missing results, but should allow shutdown, etc, to complete
cleanly.

- Convert TIMED_OUT error codes to CAMERA_ERROR CameraAccessExceptions.
This is a common error code returned by waitUntilIdle.

Also, improve debug logging to log a session ID with verbose logging,
and add a few verbose logs.

Bug: 16899526
Change-Id: I7a31f0a12effc2611e1f9c2408224ee82c37c912
2014-09-14 14:41:47 -07:00
Eric Laurent
76466c7be3 Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev 2014-09-13 00:21:48 +00:00
Eric Laurent
75b433f737 SoundTrigger: fix KeyphraseRecognitionEvent parceling
Always include the Audioformat in the parcel if not
null.

Bug: 17489186.
Change-Id: I8bea031942b55078e5637959d5bf70961d134733
2014-09-12 15:45:47 -07:00
Yin-Chia Yeh
b086421b41 Camera2: add toString for TonemapCurve
Bug: 16899576
Change-Id: Id7c08afed8606efc880cc75201287cd70a0e301c
2014-09-12 14:12:13 -07:00
Jinsuk Kim
d4a94db1cd CEC: Bug fixes for vendor-specific command handling
- Add sendStandby()
- Respond with <Feature Abort>[INCORRECT_MODE] when the listener
  is not ready

Bug: 17379243
Bug: 17358887
Change-Id: I26a4157a70f11206978763fbbe69e4190e3e1d5c
2014-09-12 16:22:23 +09:00
Jinsuk Kim
68ab6cf0ea Merge "Replace the MHL register name 'scratchpad' with 'vendor'" into lmp-dev 2014-09-12 02:12:36 +00:00
Jinsuk Kim
b3fbf9dbe8 Replace the MHL register name 'scratchpad' with 'vendor'
Bug: 17479050
Change-Id: If6fe2949d17ad2d407df5b797c1915eb0e9bf421
2014-09-12 10:42:14 +09:00
Igor Murashkin
6894f60c9c Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 2014-09-11 21:50:34 +00:00
Igor Murashkin
442395751d camera2.legacy: Add aberration, noisereduction, timestamp source keys
Bug: 17328591
Change-Id: I037908e0db505ace1ef62d5aa0622596d8fa2713
2014-09-11 13:21:37 -07:00
Eino-Ville Talvala
657d30e7f4 Merge "Camera2: Allow captures right after abort" into lmp-dev 2014-09-10 19:48:21 +00:00
Ruben Brunk
a3256cd3e7 Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 2014-09-10 17:11:21 +00:00
Ruben Brunk
059d766e14 camera2: Fix preview stretching in LEGACY mode.
Bug: 17447262
Change-Id: Idf4ba8d3702cf03c5b01045e2e3efe380b503002
2014-09-09 19:04:45 -07:00
Yin-Chia Yeh
8544c7da86 Merge "camera2: make 3A regions null when not available" into lmp-dev 2014-09-09 22:24:49 +00:00
Eino-Ville Talvala
ee7ea85340 Camera2: Allow captures right after abort
Since implementation is still largely synchronous, this is safe.
For the future full-asynchronous implementation, this is the behavior
we want in any case.

Bug: 17345630
Change-Id: Ib54a3441b21fa8cb42bcc6548e5639d9db7ec193
2014-09-09 12:38:12 -07:00
Eino-Ville Talvala
e8df3093f5 Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
Otherwise, cannot reliably match up capture progressed and failure callbacks
with the start callback.

Bug: 17421092
Change-Id: I91d92be70a15536b215bac330370ce37e426ec26
2014-09-09 12:38:11 -07:00
Yin-Chia Yeh
808150f066 camera2: make 3A regions null when not available
Bug: 17346456
Change-Id: If8e1611614622e7eef6f77e03ef55375650f1c51
2014-09-09 07:56:18 -07:00
Eric Laurent
39fcca0a50 SoundTrigger: fix capture format in recognition event
Also include capture format in recognition event
if capture is available for streaming. It was only
included if trigger was contained in event.

Bug: 17409062
Bug: 16731718
Change-Id: I5bf566e6bda57f23c870b4a1293e9b6d15d51e5a
2014-09-05 18:56:33 -07:00
Aravind Akella
b67d7e2345 Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 2014-09-05 20:58:53 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
Eino-Ville Talvala
fd887436bd Camera2: Final API revisions
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
  while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.

Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
2014-09-05 12:43:11 -07:00
Ruben Brunk
8eca9e0f0b Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 2014-09-05 18:52:54 +00:00
Eino-Ville Talvala
48980da14d Merge "Camera2: Document supported target combinations for a session." into lmp-dev 2014-09-05 17:54:01 +00:00
Ruben Brunk
b68dd5c8b9 camera2: Undo mirror for front camera in legacy mode.
Bug: 16637957

- In Camera1 API, front facing camera preview is always mirrored across
  the vertical axis.  Undo this flip in the legacy mode Camera2 API
  sampling operation when copying from the texture drawn to with the
  Camera1 API preview buffers.

Change-Id: Ib8ae4fa97f4ad62a3e55ae7da7d474a8655e747d
2014-09-04 21:23:42 -07:00
Jungshik Jang
2e8f1b6399 CEC: Revamp volume control action.
Here is a list of changes
1. Change volume control into event base not level base
2. Hide volume ui if volume change is triggered by CEC
3. Report volume change triggered by CEC in OSD message
4. Revamp HdmiLogger so that normal class uses static method only.
5. Apply format message to HdmiLogger's helper methods.

Bug: 17367215

Change-Id: I9f3cd41f7c66f76919059b463df956ed5176b054
2014-09-05 08:30:19 +09:00
Aravind Akella
e57676baaa Documentation fix for Sensor.getMaxDelay()
Change-Id: Ibec32f098b2036ec1f9795ec8155dac47b5df4fd
2014-09-04 16:24:41 -07:00
Ruben Brunk
3968a31099 camera2: Fix Nakasi crash-on-start when using Camera2 API.
Bug: 17252693

- WAR to ensure setMeteringAreas and setFocusAreas is never called
  if the max areas is 0.
- Fix AF handling for when there are no AF modes that support
  Camera#autoFocus being called.

Change-Id: Id2517b76e1be51f8adeeee30dc2032e03debed01
2014-09-03 17:32:43 -07:00
Eino-Ville Talvala
f3621f3a5c Camera2: Document supported target combinations for a session.
Since most camera devices cannot support all combinations of target
sizes given the maximum stream counts, enumerate a set of guaranteed
configurations that can be used to create a session.

Also fix minor docs formatting in StreamConfigurationMap

Bug: 16899526
Change-Id: Ic7c94051dd47964f2be98343163ebd242b19bd24
2014-09-03 11:04:56 -07:00
Michael Wright
02aa75a083 Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 2014-09-02 17:54:45 +00:00
Michael Wright
75ee9fcde4 VirtualDisplay.Callbacks -> Callback
Also, rename methods to be onPaused instead of onDisplayPaused, etc.

Bug: 17008630
Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
2014-09-01 23:49:57 -07:00
Ruben Brunk
6293217929 Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 2014-08-30 00:27:43 +00:00
Yin-Chia Yeh
3e294e9921 Merge "Camera2: Remove spurious warnings" into lmp-dev 2014-08-29 18:02:50 +00:00
Igor Murashkin
0d1227d8b9 Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 2014-08-29 18:00:39 +00:00
Yin-Chia Yeh
d47699a47a Camera2: Remove spurious warnings
It is valid if all compenents of a synthetic key are null.
Don't warn in that case.

Bug: 17300101

Change-Id: Ifacf2fb56d1272b33a2b1ae377a85c9011e22b24
2014-08-29 17:39:30 +00:00
Terry Heo
97bf45464c Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 2014-08-29 05:12:57 +00:00
Ruben Brunk
ff99a0add9 camera2: Add HDR vendor tag for legacy mode.
Bug: 17072609

Change-Id: Iebb97d12fc62986ad389460c253cfc504a68ad7f
2014-08-28 18:42:35 -07:00
Igor Murashkin
1e854c5fc8 camera2: Implement TotalCaptureResult#getPartialResults
No longer throws NPE. Returns a list of all partial results that were
observed by a listener's #onCaptureProgressed

Bug: 16876347
Change-Id: I80335a8533ab082ac4d5dcd2597e4181ef49f19c
2014-08-28 16:45:51 -07:00
Terry Heo
959d2db12c CEC: Implement dump() of HdmiControlService
In addition, use hexadecimal address representation in HdmiPortInfo.toString()

Bug: 17310007
Change-Id: Iaba8f718f86a18a23b50f983053c7589dcdcfaf8
2014-08-28 19:07:59 +09:00
Eino-Ville Talvala
c346bbf748 Camera2: Make sure aborting captures on an idle device works.
Check if device is already idle, and if so, don't actually flush,
just fire the busy/idle callbacks to the session.

Bug: 17306157
Change-Id: I7ba416c6014c7bc1edcad07910aa0aff232af8b0
2014-08-27 17:05:29 -07:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
2014-08-27 11:08:18 -07:00
Jungshik Jang
339227da7c Fix several bugs in HdmiControlService.
1. Fix HdmniLogger null pointer exception
2. Should check arc enabled port for arc requests
3. Disallow ARC action coming from indirect AVR device.
4. Check original opcode of feature action
5. Add bitmasking to all parameters of cec message.

Bug: 17243701, Bug: 17238394, Bug: 17241401
Change-Id: Iff0da78b0de9a29fb00e683c261528e0baea66af
2014-08-26 14:13:57 +09:00
Sandeep Siddhartha
a54cd53366 Fix an issue with locale for managing intent
Bug: 17187528
Change-Id: I254d838b6b37934ce81dd1fcd5a047b50d593887
2014-08-22 18:34:59 -07:00
Sandeep Siddhartha
dcf3068fcb Fix the Locale story in the hotword API
Tighten the API by taking in a locale rather than a string tag.
Tighten the checks when reading the enrollment metadata, bail out if any
attribute is missing or invalid.
Add missing recycle call for a TypedArray

Stop recognition when sound model(s) change. This is needed during
un-enrollment/re-enrollment.

Bug: 17187528
Bug: 17205230
Change-Id: Idb00b51ef8c4ea0a8f8993decea582223181fa3d
2014-08-22 17:23:13 -07:00
Jungshik Jang
f424932cfb Implement interfaces for MHL scratchpad command
1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.

2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.

Bug: 17146522

Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15
2014-08-22 11:45:50 +09:00
Eino-Ville Talvala
2d9a18e02e Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 2014-08-22 00:46:41 +00:00
Yin-Chia Yeh
6fc6748ffb Merge "Camera2: add toString for two params classes" into lmp-dev 2014-08-22 00:20:06 +00:00
Igor Murashkin
b68654ce84 Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 2014-08-21 22:33:29 +00:00