Commit Graph

52295 Commits

Author SHA1 Message Date
Dan Stoza 6b1066e4d0 am c795dc00: (-s ours) am 1ca558f7: (-s ours) am f44d13e7: (-s ours) Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums."
* commit 'c795dc007f779103a8fae707e135827d185d943b':
  DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
2015-03-22 00:40:36 +00:00
Mathieu Chartier a290b4b912 am b4cf4d7d: am 6dad1713: Merge "Use verify-at-runtime if debug.usejit is true"
* commit 'b4cf4d7d94c54a9fc49329aa891144f87f53602e':
  Use verify-at-runtime if debug.usejit is true
2015-03-21 17:07:45 +00:00
Mathieu Chartier b4cf4d7d94 am 6dad1713: Merge "Use verify-at-runtime if debug.usejit is true"
* commit '6dad1713040a46ec6e2ca1b0df2cbe4240e9e2e9':
  Use verify-at-runtime if debug.usejit is true
2015-03-21 15:29:35 +00:00
Mathieu Chartier 6dad171304 Merge "Use verify-at-runtime if debug.usejit is true" 2015-03-21 00:14:27 +00:00
Mathieu Chartier d4a7b459f4 Use verify-at-runtime if debug.usejit is true
Bug: 19735273
Change-Id: Ib65b50dbde00184544a1341f351a0fe0ef504d32
2015-03-20 16:05:18 -07:00
Dan Stoza 1c87e474d8 DO NOT MERGE libgui: Remove IGBC::BufferItem
Removes IGraphicBufferConsumer::BufferItem. Depends on the
following changes:
    I187b3a7d05196b6289596afac8fb9a9d4aebff76
    I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc

Cherry-pick of Id1fa56d092188f2cb712768d5d2fc6a9027fb73c

Change-Id: I3edf0db8fba656fd78e18a5a7f1137f0fb6b237d
2015-03-20 12:29:04 -07:00
Dan Stoza da3b1e7ff2 am 23707911: (-s ours) am 701473cf: (-s ours) Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem"
* commit '237079112d245f8415970bd219cb174dae21ac3b':
  DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
2015-03-20 19:13:33 +00:00
Dan Stoza c6fdc017fe am 355d8118: (-s ours) am 7d89f5b6: (-s ours) Merge "DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal"
* commit '355d81184ea6b423e6fa514797e3529b9062c9cd':
  DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
2015-03-20 19:09:47 +00:00
Dan Stoza 237079112d am 701473cf: (-s ours) Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem"
* commit '701473cf9bb1d1da2a0f55d9732d3016e1f33d59':
  DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
2015-03-20 19:09:07 +00:00
Dan Stoza 701473cf9b Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem" 2015-03-20 18:56:05 +00:00
Dan Stoza 355d81184e am 7d89f5b6: (-s ours) Merge "DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal"
* commit '7d89f5b6562da8bb316f04f91dd7cc9fce33d7fd':
  DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
2015-03-20 18:54:28 +00:00
Dan Stoza c795dc007f am 1ca558f7: (-s ours) am f44d13e7: (-s ours) Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums."
* commit '1ca558f79861f3c652b5b0726532518aa7c92ef1':
  DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
2015-03-20 18:51:22 +00:00
Dan Stoza 7d89f5b656 Merge "DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal" 2015-03-20 18:47:47 +00:00
Dan Stoza 1ca558f798 am f44d13e7: (-s ours) Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums."
* commit 'f44d13e7e574f181750fa37f439ab50cf05ab3df':
  DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
2015-03-20 18:40:55 +00:00
Dan Stoza f44d13e7e5 Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums." 2015-03-20 18:36:19 +00:00
Ronghua Wu 2d13afdfa1 binder: add uint64 support to Parcel.
Bug: 19620911
Change-Id: Ifce5319e4e35afd344dead67ab7ba1cd399476a3
2015-03-19 16:45:04 -07:00
Dan Stoza 11611f9be5 DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
Switches all uses of IGraphicBufferConsumer::BufferItem (and
BufferQueue::BufferItem) to the BufferItem in libgui. Depends on
frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9.

Cherry pick of I187b3a7d05196b6289596afac8fb9a9d4aebff76

Change-Id: I5bc79fb96b6cba6021af64b20890967aa3b7fcbf
2015-03-19 13:59:12 -07:00
Dan Stoza cf3834db10 DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
Currently, there are two instances of BufferItem: one inside of
IGraphicBufferConsumer, and a standalone one inside of libgui. They
only differ in the name of one of the fields, and we want to remove
the IGBC version. This changes things so that client code may be
incrementally switched over to the libgui version.

This is a squashed commit containing the following changes:
    I64f495105f56cbf5803cea4aa6b072ea29b70cf5
    I1394e693314429ada93427889f10b7b01c948053
    I9c3bc8037fa9438d4d9080b8afb694219ef2f71f
    I699ed0a6837076867ca756b28d1ffb2238f7a0d9
    Iac8425e1241774304a131da2fb9dec6e82922f13

Change-Id: Ic4d51f5df6dbc70b376d13fceba2335b9bae4f3d
2015-03-19 13:58:07 -07:00
Eino-Ville Talvala 82c6bcc970 DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
- Wire up new dataSpace parameter through buffer queue stack
- Update tests to include the parameter
- Switch eglApi to using dataSpace to indicate sRGB gamma/linear
  difference
- Remove RAW_SENSOR in favor of RAW16
- Remove use of sRGB format enums
- Add default dataspace to buffer queue core
- Add query for default dataspace

Cherry pick of I070bd2e7c56506055c419004c29e2e3feac725df

Change-Id: I461952389c18051176c6b75e664f20ad369f5760
2015-03-19 13:56:00 -07:00
Nick Kralevich 4796bc3b27 am 4b9d0b9b: am f3201498: Merge "dumpstate: add O_CLOEXEC"
* commit '4b9d0b9b676afec086bf579015b2f74623b357fd':
  dumpstate: add O_CLOEXEC
2015-03-19 19:11:11 +00:00
Nick Kralevich 4b9d0b9b67 am f3201498: Merge "dumpstate: add O_CLOEXEC"
* commit 'f320149886ba8ab8849c8b8f3df256e3789f3905':
  dumpstate: add O_CLOEXEC
2015-03-19 19:02:53 +00:00
Nick Kralevich f320149886 Merge "dumpstate: add O_CLOEXEC" 2015-03-19 18:48:08 +00:00
Nick Kralevich cd67e9f059 dumpstate: add O_CLOEXEC
Add O_CLOEXEC to various file descriptor calls, to avoid
leaking file descriptors to dumpstate's child processes.

Bug: 18342188
Change-Id: I74c47a98dfddc29c618067ad53d879b98ed1d87a
2015-03-19 11:32:02 -07:00
Dan Stoza 1a309eba79 libgui: Fix bad merge in Surface.h
Fixes a bad merge from AOSP.

Change-Id: Idb69b34787e8f4e76fb64130573168e5fde6a87c
2015-03-19 11:26:45 -07:00
Dan Stoza be4ccdcdd5 am 663eaf42: am ad36432d: Merge "Surface: Permit an IProducerListener on connect"
* commit '663eaf422d325768808b416d66ecd4648bb14799':
  Surface: Permit an IProducerListener on connect
2015-03-19 18:04:45 +00:00
Dan Stoza 663eaf422d am ad36432d: Merge "Surface: Permit an IProducerListener on connect"
* commit 'ad36432de81c4c88d726680b7c52e8357df98455':
  Surface: Permit an IProducerListener on connect
2015-03-19 17:56:44 +00:00
Dan Stoza 4927d3a492 am 42f0ce10: am c1930630: Merge "libgui: Only allow one return from useFenceSync"
* commit '42f0ce10757e9a1dbf9c997fd0db0eee93c15984':
  libgui: Only allow one return from useFenceSync
2015-03-19 17:54:00 +00:00
Dan Stoza 42f0ce1075 am c1930630: Merge "libgui: Only allow one return from useFenceSync"
* commit 'c193063050e6be193838527fb8bc7a4588bfdc22':
  libgui: Only allow one return from useFenceSync
2015-03-19 17:49:34 +00:00
Dan Stoza ad36432de8 Merge "Surface: Permit an IProducerListener on connect" 2015-03-19 17:45:26 +00:00
Dan Stoza c20729bfc9 am 5bebe7e1: am 55466b48: Merge "GLConsumer: Fix unsigned subtraction during crop"
* commit '5bebe7e14d645b02602f0d8a1e19db2f8ebec35d':
  GLConsumer: Fix unsigned subtraction during crop
2015-03-19 17:43:55 +00:00
Dan Stoza 5bebe7e14d am 55466b48: Merge "GLConsumer: Fix unsigned subtraction during crop"
* commit '55466b48504f9a904c54f3cae4fc1a43dec73a6c':
  GLConsumer: Fix unsigned subtraction during crop
2015-03-19 17:36:49 +00:00
Dan Stoza 4b02a79066 am e31591ba: am f87d1bcd: Merge "Update maxNumber to be smaller."
* commit 'e31591baf0a9d9e269e388fdc707057b11009c95':
  Update maxNumber to be smaller.
2015-03-19 17:36:09 +00:00
Dan Stoza c193063050 Merge "libgui: Only allow one return from useFenceSync" 2015-03-19 17:35:57 +00:00
Dan Stoza 744fc02fe8 libgui: Only allow one return from useFenceSync
An #ifdef was causing multiple returns in this function, which was
triggering an unreachable code error on some build targets. This
adds an #else to ensure that only one return is exposed in any given
build.

Cherry pick of I9ed7c3e769bc9094ad31d810944227d1d8302886

Change-Id: Ibddc5706159d168031d1805fcce3eedc068296cf
2015-03-19 10:32:51 -07:00
Dan Stoza 417b93ae38 am 7ab0d37d: (-s ours) am 3d5efd55: Merge "libgui: Enable -Weverything and -Werror"
* commit '7ab0d37dbfd9a8777e7c67043c523c6419ed170b':
  libgui: Enable -Weverything and -Werror
2015-03-19 17:32:15 +00:00
Dan Stoza e31591baf0 am f87d1bcd: Merge "Update maxNumber to be smaller."
* commit 'f87d1bcd65f1889b78a8f5db6526e91216eaeb5d':
  Update maxNumber to be smaller.
2015-03-19 17:29:11 +00:00
Dan Stoza 55466b4850 Merge "GLConsumer: Fix unsigned subtraction during crop" 2015-03-19 17:22:23 +00:00
Dan Stoza 7ab0d37dbf am 3d5efd55: Merge "libgui: Enable -Weverything and -Werror"
* commit '3d5efd553ea433e81464b0b817b3455716884bb0':
  libgui: Enable -Weverything and -Werror
2015-03-19 17:19:28 +00:00
Dan Stoza f87d1bcd65 Merge "Update maxNumber to be smaller." 2015-03-19 17:16:15 +00:00
Dan Stoza 3d5efd553e Merge "libgui: Enable -Weverything and -Werror" 2015-03-19 17:06:40 +00:00
Dan Stoza 48245f0c6d Merge "libgui: Plumb attach/detach through Surface" 2015-03-19 16:48:30 +00:00
Dan Stoza 966b98bd86 Surface: Permit an IProducerListener on connect
This change allows clients of Surface to provide an IProducerListener
callback object to Surface::connect, which will be passed down to the
underlying IGraphicBufferProducer.

Cherry pick of I5ea5229bf3a329bf02c6bd20e7247039c75d136b

Change-Id: I6f8f52c72654e4cee649721383819bafe378f964
2015-03-18 16:01:20 -07:00
Dan Stoza 2632350ac8 GLConsumer: Fix unsigned subtraction during crop
Since some variables had been switched from signed to unsigned, there
was a section of code that was guaranteed to be incorrect because it
effectively did 'if (a < b) { c = a - b; }'. This change fixes it.

Cherry pick of I9cdd6c9a0179801addebb5d6dc1fbaddf8f53c62

Bug: 19346631
Change-Id: Id13a46f74c9ae7278463ce22b586f4dc21b5e453
2015-03-18 16:00:44 -07:00
Michael Lentine c168b8a5a9 Update maxNumber to be smaller.
There shouldn't be more than 4096 fds (probably signficantly smaller) and
there shouldn't be more than 4096 ints.

Cherry pick of I3a3e50ee3078a4710e9737114e65afc923ed0573

Bug: 18076253
Change-Id: I82a883572b401f115d252dcd3d00aa7252b49b0e
2015-03-18 16:00:05 -07:00
Dan Stoza 3be1c6b60a libgui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.

Cherry pick of I034abec27bf4020d84af60d7acc1939c59986dd6 plus a
couple of minor changes to CpuConsumer.cpp to make it work with a
prior change:
    Uncomment CC_LOGV on line 46
    Change C-style cast to static_cast on line 71

Change-Id: Iaec610477ea0122317b0578fb74caf2383d4cf08
2015-03-18 15:57:27 -07:00
Dan Stoza 20c5672883 libgui: Plumb attach/detach through CpuConsumer
Adds CpuConsumer::{detachNextBuffer,attachAndReleaseBuffer}, which
can be used to more carefully manage the ownership of GraphicBuffers.

Bug: 19628705
Change-Id: Ia7a7e30da6d81eb2367241998f14988db0afc3bf
2015-03-17 19:37:15 -07:00
Dan Stoza 724768f916 Revert "libgui: Plumb attach/detach through CpuConsumer"
This reverts commit 43078e2827.

Change-Id: Ifef774d9922bb90450384e810e4767b56cc29de3
2015-03-17 15:54:50 +00:00
Jeff Tinker 06a8cd6d19 Report key request message type for unprefixed EME
bug: 19771299
Change-Id: I0cc790a2c91a9b515e11b36c0a2c81e64c855fe7
2015-03-16 14:18:39 -07:00
Dan Stoza c14ecb9de2 libgui: Plumb attach/detach through Surface
Exposes the attachBuffer and detachNextBuffer calls from
IGraphicBufferProducer to the public Surface interface. Also moves
the version of connect that takes a producer callback from protected
to public.

Bug: 19628705
Change-Id: I9ebc3013c4d9c84c4e8ef150c00e03f8af80319e
2015-03-16 13:02:01 -07:00
Dan Stoza 43078e2827 libgui: Plumb attach/detach through CpuConsumer
Adds CpuConsumer::{detachNextBuffer,attachAndReleaseBuffer}, which
can be used to more carefully manage the ownership of GraphicBuffers.

Bug: 19628705
Change-Id: Ia7aa1ac59c2f768f2d8a0f35ad23067936a7427c
2015-03-16 12:58:45 -07:00