Jesse Hall
8c79c08578
Add HWC 1.4 with support for sideband video layers
...
Change-Id: Ie40668a8667e26f1d570a2f756f1178d0dcbbf5c
2014-03-11 12:02:11 -07:00
Mike J. Chen
d35b818e4f
am a043baa9: am 57ac9a9e: Merge "Add handshake_callback to bt_hh" into klp-modular-dev
...
* commit 'a043baa9c8ad46abb8708136d653d2a5f8d96359':
Add handshake_callback to bt_hh
2014-03-07 20:33:47 +00:00
Mike J. Chen
a043baa9c8
am 57ac9a9e: Merge "Add handshake_callback to bt_hh" into klp-modular-dev
...
* commit '57ac9a9e96fb50dba33b05e9ffac1c9f5a1ada8f':
Add handshake_callback to bt_hh
2014-03-07 18:44:24 +00:00
Mike J. Chen
57ac9a9e96
Merge "Add handshake_callback to bt_hh" into klp-modular-dev
2014-03-07 18:40:57 +00:00
Glenn Kasten
0538a3e4ab
NBAIO::Format_from_SR_C requires audio_format_t parameter
...
Change-Id: I8bdfbd227dbfd4a46eb7ffc82ec7064582a626d0
2014-03-07 08:26:16 -08:00
Amit Shekhar
84625d92cd
am 9c19b548: am ee4e28c9: am 1482406b: usbaudio: fix for out->dev->lock remains locked in error case
...
* commit '9c19b5480f7921e62d2a102abafe0c159b7679b8':
usbaudio: fix for out->dev->lock remains locked in error case
2014-03-07 03:02:47 +00:00
Jesse Hall
92dfde2525
am 8a90666c: am 282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"
...
* commit '8a90666cccac19314216ab1ff8b99ecb854ccf04':
gralloc: dont hardcode 32bpp as RGBX
2014-03-07 03:02:21 +00:00
Greg Hackmann
a34eaccfe3
am b3d1dda5: am b342abb6: Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
...
* commit 'b3d1dda5130ae1ae4eab6cb4fe56f5793bc66042':
gralloc: make private_handle_t layout consistent on 32/64-bit
2014-03-07 03:02:20 +00:00
Amit Shekhar
9c19b5480f
am ee4e28c9: am 1482406b: usbaudio: fix for out->dev->lock remains locked in error case
...
* commit 'ee4e28c9ebc7f26a1a25d1042d5a941139055447':
usbaudio: fix for out->dev->lock remains locked in error case
2014-03-06 22:41:21 +00:00
Amit Shekhar
ee4e28c9eb
am 1482406b: usbaudio: fix for out->dev->lock remains locked in error case
...
* commit '1482406b70a254fc85d153a7066d7f90d724d195':
usbaudio: fix for out->dev->lock remains locked in error case
2014-03-06 21:02:36 +00:00
Jesse Hall
8a90666ccc
am 282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"
...
* commit '282ab1b6b1a92b8cb2650c111bfab02916f8715d':
gralloc: dont hardcode 32bpp as RGBX
2014-03-06 20:04:55 +00:00
Greg Hackmann
b3d1dda513
am b342abb6: Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
...
* commit 'b342abb6902a698963bb9d2108000da895845985':
gralloc: make private_handle_t layout consistent on 32/64-bit
2014-03-06 20:04:54 +00:00
Jesse Hall
282ab1b6b1
Merge "gralloc: dont hardcode 32bpp as RGBX"
2014-03-06 19:04:07 +00:00
Greg Hackmann
b342abb690
Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
2014-03-06 18:24:48 +00:00
Amit Shekhar
1482406b70
usbaudio: fix for out->dev->lock remains locked in error case
...
out->dev->lock remains locked in error case in out_write()
Added pthread_mutex_unlock() in the error case
Bug: 12824374
Change-Id: Id467e3122008eb8128b42dfc0e9103600c1eef2d
Signed-off-by: Glenn Kasten <gkasten@google.com >
2014-03-06 08:56:51 -08:00
Greg Hackmann
f5811ba2df
gralloc: make private_handle_t layout consistent on 32/64-bit
...
private_handle_t's memory layout must be consistent between the 32-bit
and 64-bit gralloc, in case buffers are passed between processes.
Replace the (variably sized) uintptr_t base with a fixed size uint64_t,
and enforce 8-byte alignment for architectures where uint64_t alignment
varies between 32-bit and 64-bit.
Change-Id: I06cb31d4b9620ea18e5b50d3a3142b5adb2d2a14
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2014-03-03 13:37:11 -08:00
Glenn Kasten
3f56a10cc3
Rename setStreamOutput to invalidateStream
...
And simplify by removing the unused I/O handle parameter 'output'.
Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
2014-02-28 11:55:58 -08:00
Mike J. Chen
753c442217
Add handshake_callback to bt_hh
...
Change-Id: I505b1e56ee10c955eedff2e4d142cb7caa6b9fb2
Signed-off-by: Mike J. Chen <mjchen@google.com >
2014-02-25 19:25:55 -08:00
Elliott Hughes
631785fbcb
am abd0a90b: am b96f1083: Merge "Move libhardware of <asm/page.h>."
...
* commit 'abd0a90bc02b2f574ea62a457d3302b1ce7cf7c8':
Move libhardware of <asm/page.h>.
2014-02-25 00:14:42 +00:00
Elliott Hughes
abd0a90bc0
am b96f1083: Merge "Move libhardware of <asm/page.h>."
...
* commit 'b96f1083b8d10f3e33b64f0da943dedfdb25b557':
Move libhardware of <asm/page.h>.
2014-02-25 00:06:51 +00:00
Elliott Hughes
b96f1083b8
Merge "Move libhardware of <asm/page.h>."
2014-02-25 00:01:48 +00:00
Elliott Hughes
6caa78dc37
Move libhardware of <asm/page.h>.
...
Change-Id: I7cf9d04828f19b8d7d1d3b8948bef580b101b10c
2014-02-24 15:50:34 -08:00
Bernhard Rosenkraenzer
5e3ac6bc71
gralloc: dont hardcode 32bpp as RGBX
...
Not every 32bpp is in RGBX format.
Change-Id: Ic3c6a0cbf475bff2fe2fc4b023c6bc58e4fc295e
Signed-off-by: Amit Pundir <amit.pundir@linaro.org >
2014-02-21 19:28:56 +05:30
Jinsuk Kim
e920fe632c
am 055c209a: am 5f9a7907: Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev
...
* commit '055c209a15788ead2043e9fe162169df460d3a53':
Header file for HDMI-CEC HAL interface definition
2014-02-21 13:54:29 +00:00
Jinsuk Kim
055c209a15
am 5f9a7907: Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev
...
* commit '5f9a7907844ba5319957dd9913ef951d78709afb':
Header file for HDMI-CEC HAL interface definition
2014-02-21 01:30:35 +00:00
Jinsuk Kim
5f9a790784
Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev
2014-02-21 01:27:30 +00:00
Jinsuk Kim
62195dc9ac
Header file for HDMI-CEC HAL interface definition
...
Added here is the header file that defines HDMI-CEC HAL interface.
Its main purpose is to support major CEC features such as 'one touch
play', 'standby' for playback device. But basic skeleton for supporting
other kinds of devices(like TV) is also in place.
Change-Id: Iccbbec398bc675d69cb78ad6848ec57ac727cb8d
2014-02-20 18:44:27 +09:00
Colin Cross
23e41654e2
am 6c8ad5aa: am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
...
* commit '6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62':
Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
2014-02-16 18:47:57 +00:00
Colin Cross
6c8ad5aa80
am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
...
* commit '80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26':
Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
2014-02-16 18:42:54 +00:00
Colin Cross
80d4eced69
Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
2014-02-16 18:40:01 +00:00
Dan Willemsen
86389d1080
Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
...
Change-Id: Ib905e079b1e88977fb3408671301904c58f35d3c
2014-02-16 10:07:15 -08:00
David Turner
8ef59807d4
am b1d5760b: am f77bd7d0: Merge "Try using goldfish_pipe as the device name"
...
* commit 'b1d5760b08c0116f3e5cf33e21a4ff710cd3d7a4':
Try using goldfish_pipe as the device name
2014-02-14 17:35:53 +00:00
David Turner
b1d5760b08
am f77bd7d0: Merge "Try using goldfish_pipe as the device name"
...
* commit 'f77bd7d005e27364e233c92ac7f6c06a18d1f128':
Try using goldfish_pipe as the device name
2014-02-14 17:27:21 +00:00
David Turner
f77bd7d005
Merge "Try using goldfish_pipe as the device name"
2014-02-14 16:34:25 +00:00
Greg Hackmann
178f0503d5
am f6d2142d: am f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"
...
* commit 'f6d2142d93063a02b1eab75f8f46b172da772f6b':
AArch64: Calculate private_handle_t's numInts
2014-02-13 20:52:18 +00:00
Greg Hackmann
f6d2142d93
am f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"
...
* commit 'f4c46752df57be558773a056d6545877ef65c844':
AArch64: Calculate private_handle_t's numInts
2014-02-13 20:46:21 +00:00
Greg Hackmann
f4c46752df
Merge "AArch64: Calculate private_handle_t's numInts"
2014-02-13 20:41:18 +00:00
Eino-Ville Talvala
d3dead483c
Merge "camera3: Docs updates to line up with metadata changes"
2014-02-11 17:53:40 +00:00
Eino-Ville Talvala
c5bff0d955
camera3: Docs updates to line up with metadata changes
...
Change-Id: I3065c9f1d905a4e7d0bb6eef2b4556c81a0788fe
2014-02-10 16:43:26 -08:00
Zhijun He
06da1b3745
camera3: fix typo in camera open KPI
...
Change-Id: Ieefdc5a0f5159a3053e141075e71d268499746ed
2014-02-10 16:04:23 -08:00
Simon Wilson
bda5e3f226
am 7ad4534e: am 907b20aa: Initial version of the MCU HAL
...
* commit '7ad4534e1ee6ec9744392d23199049c16ed18159':
Initial version of the MCU HAL
2014-02-10 20:44:38 +00:00
Simon Wilson
7ad4534e1e
am 907b20aa: Initial version of the MCU HAL
...
* commit '907b20aa7475a91a148bb655b0d80cecabb130f6':
Initial version of the MCU HAL
2014-02-10 20:38:51 +00:00
Simon Wilson
907b20aa74
Initial version of the MCU HAL
...
Change-Id: Ic88da7e825b67ed64cde4eed3055022daabe9830
2014-02-07 18:07:39 -08:00
Zhijun He
ceac9e3651
camera3: Add input buffer field in capture result
...
For HAL3.2 or above, the HAL must return the input buffer in capture result
rather than capture request.
Change-Id: I0108cda1cdf51556d7273b2c3cfbaf0e6ecd1d76
2014-02-07 14:47:25 -08:00
Ashok Bhat
d2be74aa57
AArch64: Calculate private_handle_t's numInts
...
A constant sNumInts with a value of 6 was being assigned to the numInts
attribute in the private_handle_t constructor, and was also used in the
validate method. That constant value is appropriate for 32-bit systems
but is not appropriate for a 64-bit system where uintptr_t used for
base attribute will be 64-bit.
sNumInts is now changed to a static inline function that calculates
numInts.
Change-Id: I482ddb5915c9ff55fb2e2a87887a0ec2dc2299ed
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com >
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com >
2014-02-07 17:52:08 +00:00
Zhijun He
46c28a4638
Merge "camera3: update BIDIRECTIONAL and INPUT stream specs"
2014-02-06 19:03:01 +00:00
Colin Cross
d39b2a8a98
am 5dbc98ff: am 037335eb: Merge "gralloc: fix warnings"
...
* commit '5dbc98ff2c6714d66a1377ed9c9030d130ed7ebb':
gralloc: fix warnings
2014-02-06 03:11:39 +00:00
Colin Cross
5dbc98ff2c
am 037335eb: Merge "gralloc: fix warnings"
...
* commit '037335ebe826289445fd2ba14e95ff41d57ad928':
gralloc: fix warnings
2014-02-06 03:03:12 +00:00
Colin Cross
037335ebe8
Merge "gralloc: fix warnings"
2014-02-06 02:25:32 +00:00
Colin Cross
febaaa937f
gralloc: fix warnings
...
Fix LP64 pointer casting warnings, unused parameters, and
turn off missing initializer warnings.
Change-Id: Idb70f4534282fed64ae81cb1e154d3f5b93091b0
2014-02-05 18:21:09 -08:00