Commit graph

671 commits

Author SHA1 Message Date
Igor Murashkin
7e38f5faac Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
Change-Id: If5c922a0c0139b90c4781f022d80f7b9a0932e9e
2013-01-10 11:45:38 -08:00
Mathias Agopian
48697f6dc2 Fix HWC documentation.
Specify more clearly the behavior of compositionType
and hints.

Change-Id: I9abdccedd904b2fba783381bf9e2f8975ede8d67
2012-11-20 15:23:25 -08:00
The Android Open Source Project
bdcf82513c Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ibadcd642e060d8b828b13f7c748f0dfddf751906
2012-11-06 12:17:39 -08:00
The Android Automerger
c55d7ac337 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-31 18:34:07 -07:00
Jean-Michel Trivi
90b0fbd13f Shutdown audio pipe when closing input stream
Writing to the audio pipe for the remote submix is blocking, unless
 the audio output pipe is in shutdown mode. The playback thread
 could stay blocked on the write if the input stream has already
 been closed.
The change consists in shutting down the pipe also when the input
 stream gets closed. When the pipe is in this state, simulate
 timing in the write operation so we don't drain the output faster
 than realtime.

Bug 7424646

Change-Id: I5feb3be642b0ee7eef10dee0141308684ee9c811
2012-10-30 19:03:22 -07:00
The Android Automerger
c2805849c5 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-11 08:19:20 -07:00
The Android Automerger
b97ae066d5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 07:03:53 -07:00
Jean-Michel Trivi
20c7f50cd5 Support querying active record sources
Add support for querying whether there is currently a recording
 underway from the specified audio source.

Bug 7314859

Change-Id: I270f27eff4dcf1cc179089859a4c690140825ad1
2012-10-10 12:23:17 -07:00
The Android Automerger
4ba4655ec3 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:55:55 -07:00
The Android Automerger
41ef60e365 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:31 -07:00
The Android Automerger
97e4ca0df0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 16:07:22 -07:00
The Android Automerger
a644b63403 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 15:39:04 -07:00
Jamie Gennis
c7545189c8 hwcomposer: Specify set() call error behavior.
Bug: 7308829
Change-Id: Ibab6f0d2929860f02c17d6ffadb326fc0c333c4d
2012-10-08 19:25:20 -07:00
The Android Automerger
e037cfb1bc merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-02 06:59:45 -07:00
Martijn Coenen
3fb2be64ff Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev 2012-10-01 14:02:07 -07:00
The Android Automerger
96e003e0da merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 18:17:45 -07:00
Jean-Michel Trivi
4d7640ae51 Merge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev 2012-09-30 11:56:23 -07:00
Jean-Michel Trivi
d44130339c bug 7253033 Add "exiting" state to remote audio submix module
Support receiving a parameter that sets the remote audio submix
 module in a state where the audio pipe will unblock any current
 write operation and not block anymore.

Change-Id: Ia3119cd79972afff0de24187dae627855a468ebf
2012-09-30 11:12:28 -07:00
Martijn Coenen
442752aecd NFC HAL: Use a separate callback for data.
Bug: 7258325
Change-Id: I02d8ea1bdcb8ea6a9430e3dc286f5c2647277f72
2012-09-30 11:08:49 -07:00
The Android Automerger
67dde9aca9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 06:59:43 -07:00
Alex Ray
cecacd4e71 Camera2: Change JPEG transport header
The way buffers are passed to JPEG encoders makes it difficult to
account for a header offset.  This explains moving the header to
the end, and clarifies the required header packing.

Bug: 7108816
Change-Id: I569cd0cde37bd6fd7110fbc95d7fced9a55cff9c
2012-09-27 22:08:55 -07:00
The Android Automerger
6d3ab64432 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-22 09:42:02 -07:00
Eino-Ville Talvala
3a90d5964b Merge "Camera2: Add JPEG transport header" into jb-mr1-dev 2012-09-21 18:33:51 -07:00
The Android Automerger
4af49c64f7 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-21 06:59:54 -07:00
Jesse Hall
919e1c45b7 Merge "Document reentrancy and error conditions" into jb-mr1-dev 2012-09-20 14:13:07 -07:00
Jesse Hall
d91697ab8f Document reentrancy and error conditions
The hotplug callback is non-reentrant. The display config functions
return an error if called for a disconnected display type.

Change-Id: I52d11a53f9b30a7c39e98b0a9b07eb97a3d2becd
2012-09-19 22:53:30 -07:00
Eino-Ville Talvala
ada3a97820 Camera2: Add JPEG transport header
To simplify passing compressed JPEG data between the HAL and the
camera service, add a transport header for use with JPEG streams.

Bug: 7108816
Change-Id: I91060051f59032e66eaaab3ee9f651badd1f2ac0
2012-09-19 11:42:40 -07:00
The Android Automerger
9ffeb1522b merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-19 07:01:39 -07:00
Andre Eisenbach
05f49546a9 Initial Bluetooth open source release
Change-Id: I27bb95db854806d7deedaf6c622b17cb09f62f16
2012-09-18 12:52:41 -07:00
The Android Automerger
3612753a41 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-18 06:59:53 -07:00
Jean-Michel Trivi
97c262fc84 Remote submix: fix sink/source reference count handling
The reference count on the strong pointers to the audio sink and
 source should be done on the object retrieved from the device
 structure, not by accessing the corresponding fields, as they
 can be cleared while reading or writing audio data.

Change-Id: I446a2c7bdcb0758b4013b0ad75450a15203fb9da
2012-09-17 18:27:56 -07:00
Jean-Michel Trivi
35a2c167b4 Turn off logs in remote submix audio module
Change-Id: I61cd15534b1cd764b06f615569cdf02edbba909c
2012-09-17 10:13:26 -07:00
Jean-Michel Trivi
eec87706d2 Remote audio submix: blocking writes and sleeping reads.
Change how the remote audio submix is handling piping audio
 through the pipe:
 - use a MonoPipe as audio sink for blocking writes,
 - use a MonoPipeReader as audio source for non blocking reads,
  and keep track of when recording started to align the
  time at which the in_read() call should return with the
  projected time of the recording duration.

Change-Id: I8b0f8c56a0486806101e272dfbf9c6d2d1c11112
2012-09-17 09:59:42 -07:00
The Android Automerger
61edfe31be merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-16 06:59:50 -07:00
Jean-Baptiste Queru
4fbd199696 Delete headers that have been moved
Change-Id: I72e81a3ea789fe15d5a6cea281ebe43f82220669
2012-09-15 09:24:58 -07:00
Mathias Agopian
7f9067f0fc Merge "Layer flags won't change between prepare and set" into jb-mr1-dev 2012-09-14 17:41:14 -07:00
Jesse Hall
6b01e2eaf7 Layer flags won't change between prepare and set
Change-Id: I0f25766976e4f783066e5b6fd917d1769906e43e
2012-09-14 17:21:22 -07:00
The Android Automerger
a5c667d347 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 14:10:33 -07:00
Martijn Coenen
1c970f1a49 Initial NFC HAL for NCI controllers.
Bug: 7123942
Change-Id: Ic64aa6477f2eb65b489b3be5d49ad21ccce63e2d
2012-09-14 13:56:58 -07:00
The Android Automerger
e6152a5304 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 07:11:57 -07:00
Eino-Ville Talvala
9633d506b7 Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
Until all HAL implementations move to the new gralloc format selection
scheme, define FORMAT_ZSL for indicating ZSL streams.

Bug: 6243944
Change-Id: I90249beaaca5da80c9464eedd6aa9d3648bb56cc
2012-09-13 16:32:14 -07:00
Jean-Michel Trivi
1df8c7a52b Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev 2012-09-13 13:36:13 -07:00
Jean-Michel Trivi
6acd966320 Remote submix audio module: sleep less, log errors
Neither write nor read are blocking, but write simulates
 timing by checking the clock between two writes and
 computing how long the next sleep should last.

Change-Id: I495ae6d44b0cf75a24fe4b70662cfac679049c67
2012-09-13 12:23:43 -07:00
The Android Automerger
2a379b39e4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-13 06:59:54 -07:00
Jesse Hall
7cb03d79b3 Add outbuf fields for HWC 1.2 virtual displays
Also rename HWC_DISPLAY_RESOLUTION_* to HWC_DISPLAY_WIDTH and
HWC_DISPLAY_HEIGHT for consistency.

Change-Id: Iabe6db0816f6f6eaaac24c3c9ae554177bcabf1d
2012-09-12 09:41:57 -07:00
The Android Automerger
ff5f0fb501 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-11 06:59:42 -07:00
Eric Laurent
5d85c537fc update audio remote submix API revision
Update remote submix audio HAL API revision to 2.0
(new audio device enums).

Change-Id: I61d5faf498144002929e570ee50375b059fb17c5
2012-09-10 10:36:09 -07:00
The Android Automerger
53657f44d2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-09 07:00:36 -07:00
Eric Laurent
43110fa5e5 Merge "audio: new audio devices enums" into jb-mr1-dev 2012-09-07 14:52:28 -07:00
Jean-Michel Trivi
416d37b37b Audio remote submix in hardware modules
Change-Id: I878c6f36685eff48a3cd51acceec812b61994945
2012-09-07 11:25:59 -07:00