Eino-Ville Talvala
0cbc4dfdb4
am 13e8b51d: am 3a90d596: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
...
* commit '13e8b51d5b1be40d95b7515ac291cd665ec8ae09':
Camera2: Add JPEG transport header
2012-09-24 08:49:03 -07:00
Eino-Ville Talvala
13e8b51d5b
am 3a90d596: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
...
* commit '3a90d5964bc17ace1097e06a62d0410241c6c99c':
Camera2: Add JPEG transport header
2012-09-24 08:25:53 -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
a962f928fe
am 5c1bafdb: am 919e1c45: Merge "Document reentrancy and error conditions" into jb-mr1-dev
...
* commit '5c1bafdbce676af17d08ba4d0412edda8baecf56':
Document reentrancy and error conditions
2012-09-20 15:46:11 -07:00
Jesse Hall
5c1bafdbce
am 919e1c45: Merge "Document reentrancy and error conditions" into jb-mr1-dev
...
* commit '919e1c45b77b99c0215a53ab93d8032abb6d8c26':
Document reentrancy and error conditions
2012-09-20 14:13:53 -07:00
Jesse Hall
919e1c45b7
Merge "Document reentrancy and error conditions" into jb-mr1-dev
2012-09-20 14:13:07 -07:00
The Android Open Source Project
dde4ef39fb
am 1c63e86f: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1c63e86f16aa01f2ef48747cc494bf8f9bba108a':
2012-09-20 12:46:03 -07:00
The Android Open Source Project
1c63e86f16
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If425346af9f905a95bbcdcc41035ce937280528c
2012-09-20 10:36: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
989ae15317
am b53b4389: am 05f49546: Initial Bluetooth open source release
...
* commit 'b53b4389c0fc2ea40d31aade956c5210ef8ab503':
Initial Bluetooth open source release
2012-09-18 15:33:25 -07:00
Andre Eisenbach
b53b4389c0
am 05f49546: Initial Bluetooth open source release
...
* commit '05f49546a9c70805cbd77e71c7998652f91ec535':
Initial Bluetooth open source release
2012-09-18 15:14:35 -07:00
Andre Eisenbach
05f49546a9
Initial Bluetooth open source release
...
Change-Id: I27bb95db854806d7deedaf6c622b17cb09f62f16
2012-09-18 12:52:41 -07:00
Jean-Michel Trivi
cf64fb97ff
am ddc36b20: am 97c262fc: Remote submix: fix sink/source reference count handling
...
* commit 'ddc36b203ea0dc5a1f2ab42e6eb14cfcdb549708':
Remote submix: fix sink/source reference count handling
2012-09-18 10:36:09 -07:00
Jean-Michel Trivi
ddc36b203e
am 97c262fc: Remote submix: fix sink/source reference count handling
...
* commit '97c262fc848c407f316fd7fe2b468a540f3bc38f':
Remote submix: fix sink/source reference count handling
2012-09-18 10:33:21 -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-Baptiste Queru
b936c6257c
Merge
...
Change-Id: I1582b595c49de5f235cd7f92eb66dad2bbff81be
2012-09-17 11:14:10 -07:00
Jean-Michel Trivi
fe91a19f42
am 35a2c167: Turn off logs in remote submix audio module
...
* commit '35a2c167b4ee090b5dd9779ecb40f82cdaf1c74d':
Turn off logs in remote submix audio module
2012-09-17 10:20:07 -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
c73112fc4a
am eec87706: Remote audio submix: blocking writes and sleeping reads.
...
* commit 'eec87706d21fc0ac4ad10ede86943770b2533564':
Remote audio submix: blocking writes and sleeping reads.
2012-09-17 10:03:01 -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
6a20c64a7c
Merge
...
Change-Id: I97bfe9115ce354aeff0cd4cb46ff667103e25021
2012-09-15 10:04:11 -07:00
Jean-Baptiste Queru
c0cea2b5cf
Merge
...
Change-Id: I627bfcffe33110e091c6fa8d23d195c67d92156f
2012-09-15 10:00:12 -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
ef2cc1c348
am 5404f9da: Initial NFC HAL for NCI controllers.
...
* commit '5404f9daaf2dabef5a650dd9947ad6991ab316cd':
Initial NFC HAL for NCI controllers.
2012-09-14 13:59: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
Eino-Ville Talvala
ea9404cefe
am f3b13810: Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
...
* commit 'f3b13810776cf5ecf070cf386977d1baab99b810':
Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
2012-09-14 11:33:33 -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
82f163d102
am c320a71e: am 41dd7314: Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev
...
* commit 'c320a71e7655772ef2c8865d9de025333e3ca263':
Remote submix audio module: sleep less, log errors
2012-09-13 14:13:16 -07:00
Jesse Hall
a902dd5f80
am 3f76e6e1: am ea569c6f: Add outbuf fields for HWC 1.2 virtual displays
...
* commit '3f76e6e1be87d8938148fc253ff7e44985f26442':
Add outbuf fields for HWC 1.2 virtual displays
2012-09-13 14:10:22 -07:00
Jean-Michel Trivi
c392d19630
am 41dd7314: Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev
...
* commit '41dd73140ef8e6a2408a1d45190cbb82f380d720':
Remote submix audio module: sleep less, log errors
2012-09-13 13:38:03 -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
83e10601a5
am ea569c6f: Add outbuf fields for HWC 1.2 virtual displays
...
* commit 'ea569c6f94c83dcbd08f6ebd8ac7603b3f6a2048':
Add outbuf fields for HWC 1.2 virtual displays
2012-09-12 20:20:01 -07:00
The Android Open Source Project
b0cab83b8c
am a86c4ad7: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a86c4ad7ea2443e6af75c99038903f78d51d3803':
2012-09-12 16:58:53 -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 Open Source Project
ec2deda6e3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I190165deaba5ac670791cca5ab2da7d4aefd1d5f
2012-09-12 07:41:05 -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
fe92291580
am ba1c18f4: am 9b1abaab: update audio remote submix API revision
...
* commit 'ba1c18f4263376e2f97235867463bf1ef3a0c68c':
update audio remote submix API revision
2012-09-10 17:15:16 -07:00
Eric Laurent
e3af820030
am e5d37588: am 8f59ea8d: Merge "audio: new audio devices enums" into jb-mr1-dev
...
* commit 'e5d3758880a67ff12fb537a9fc70b617afcfa7e1':
audio: new audio devices enums
2012-09-10 17:06:56 -07:00
