summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* BufferQueue: clean up buffer countingJamie Gennis2012-08-292-27/+30
| | | | | | | | This change is a clean up of some of the handling of the maximum number of buffers that are allowed at once. It mostly renames a few member variables and methods, but it includes a couple small refactorings. Change-Id: I9959310f563d09583548d4291e1050a7bbc7d87d
* Merge "initial checkin of a preliminary HDCP API for vendors to implement." ↵Andreas Huber2012-08-291-0/+85
|\ | | | | | | into jb-mr1-dev
| * initial checkin of a preliminary HDCP API for vendors to implement.Andreas Huber2012-08-291-0/+85
| | | | | | | | Change-Id: If98277efdec1bc8f1e9f4af1ca73324e4c3d469b
* | A vendor ril depends on a native screen shot code.Wink Saville2012-08-281-0/+5
|/ | | | | | | Add a temporary shim until the vendor fixes the ril. Bug: 7073467 Change-Id: Ia95a58bd90677c03406c988d1c29ae785f8662f2
* Eradicate DisplayID.Mathias Agopian2012-08-271-6/+0
| | | | | | | | DisplayDevices are now keyed of the wp<IBinder> the client uses. DisplayID has now become DisplayType which is just used to identify physical displays (as opposed to virtual displays such as wifi displays). Change-Id: I0c5968f2c902dcd699a7e0afacf833ff070c12ea
* Compatibility work around for bad graphics driver dependency.Jeff Brown2012-08-271-0/+5
| | | | | | | | | | | This is a compatibility shim for one product whose drivers are depending on SurfaceComposerClient::getDisplayInfo( int, DisplayInfo*) when it really shouldn't. Revert this patch when the problem has been resolved. Bug: 7065398 Change-Id: I6542691b81fd1b1e1d79500a62e82d40a3d51db7
* Merge "Remove unused "layer" argument from show()." into jb-mr1-devJeff Brown2012-08-272-2/+2
|\
| * Remove unused "layer" argument from show().Jeff Brown2012-08-272-2/+2
| | | | | | | | Change-Id: I8944a9f4a27c330b11e5e837c69b88c8f84145ba
* | Merge "Banish DisplayID from the SurfaceFlinger API." into jb-mr1-devJeff Brown2012-08-274-25/+23
|\ \ | |/
| * Banish DisplayID from the SurfaceFlinger API.Jeff Brown2012-08-274-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use only display tokens in the API to refer to new displays. Don't require the caller to specify the display when creating a surface (since in general a surface could be shown on any display). This is intended to be a minimum change just to update the API. Note that SurfaceFlinger still uses DisplayID in a few places internally that might cause some features not to work properly when there are multiple displays (LayerScreenshot, for example). Change-Id: I3d91eec2da406eefd97bcd53655d403ad865a7e6
* | am 9801575a: am 908c8ff5: Merge "Fixed clang build error for libgui"Jean-Baptiste Queru2012-08-271-2/+2
|\ \ | |/ |/| | | | | * commit '9801575a65f2f9d0bdc924ec0a4bbfb6ef071bbe': Fixed clang build error for libgui
| * am 908c8ff5: Merge "Fixed clang build error for libgui"Jean-Baptiste Queru2012-08-271-2/+2
| |\ | | | | | | | | | | | | * commit '908c8ff55482b723eddec54c6308e54a136a3e49': Fixed clang build error for libgui
| | * Fixed clang build error for libguiTareq A. Siraj2012-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the order of the statements in ANDROID_SINGLETON_STATIC_INSTANCE macro so that the templated static member variable initialization comes before the instantiation of the Singleton class. This fixes the clang compile error. Change-Id: Ic47d17e152b657f2dff3191ccc3770753fdf002b Author: Tareq A. Siraj <tareq.a.siraj@intel.com> Reviewed-by: Edwin Vane <edwin.vane@intel.com>
* | | Revert "put back the unused virtuals in Vector<>"Mathias Agopian2012-08-241-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1648d4c13ba2eff3ea14cd87ee94028458a39f97. Bug: 6977192 Change-Id: Idbb6b239aaed4fb1c054ce943f6ba06ede3492bb
* | | Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-devJamie Gennis2012-08-242-123/+69
|\ \ \
| * | | SurfaceTexture: inherit from ConsumerBase (try 2)Jamie Gennis2012-08-212-123/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceTexture inherit from ConsumerBase. It removes all of the functionality from SurfaceTexture that is now provided by the base class. This includes fixes for two bugs that were found after checking this change in the first time and then reverting it. Change-Id: Ie2d9f4f27cfef26fdac341de3152e842b01a58d2
* | | | ui/Fence: change the TIMEOUT_NEVER value to -1Jamie Gennis2012-08-211-2/+1
| | | | | | | | | | | | | | | | Change-Id: I3ef0a4c06f80990b53a8bf2eda6edbfcbefd0f34
* | | | Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-devEino-Ville Talvala2012-08-212-1/+94
|\ \ \ \
| * | | | Add BufferItemConsumer, a simple BufferQueue consumer.Eino-Ville Talvala2012-08-212-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BufferItemConsumer allows for acquiring BufferQueue's BufferItems, which contain all the data and metadata the BufferQueue has for a given graphics buffer. This consumer is useful when direct access to the native buffer_handles is needed by the client. Also includes a minor cleanup of CpuConsumer's use of 'virtual'. Bug: 6243944 Change-Id: If7dc4192b15ac499555f1eda42a85140f2434795
* | | | | put back the unused virtuals in Vector<>Mathias Agopian2012-08-201-0/+20
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some binaries are using these private APIs and broke (as they should!) with this change. Temporarily restore the virtuals to work around this. Bug: 6977550 Change-Id: I7c37f24b16e4d586b89205c493db5169cf87e024
* | | | Merge "get rid of mirrorItemAt() which isn't used anywhere" into jb-mr1-devMathias Agopian2012-08-202-22/+0
|\ \ \ \
| * | | | get rid of mirrorItemAt() which isn't used anywhereMathias Agopian2012-08-202-22/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id6f2dbeed21cabc127d39538c0ff464077ada83f
* | | | | Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-devEino-Ville Talvala2012-08-201-47/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | CpuConsumer: inherit from ConsumerBaseEino-Ville Talvala2012-08-201-47/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I55178b1d673ffa0fbc6e63ef47642c64d4d03228
* | | | | Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-devJamie Gennis2012-08-202-28/+93
|\ \ \ \ \
| * | | | | Revert "SurfaceTexture: inherit from ConsumerBase"Jamie Gennis2012-08-202-28/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ed059a8d754770c3cf28b78dba30f7a6ba475dbe Change-Id: I72542c2595771a40c2c88251e0d6eb54e305b99b
* | | | | | Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"Jamie Gennis2012-08-201-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f8d33c652b930abbfb0722f3a2928cbc2ea71078 Change-Id: I1ff2e1cc85824a8fac1051f573d2931db81af511
* | | | | SurfaceTexture: call ConsumerBase::freeBufferLockedJamie Gennis2012-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes SurfaceTexture::freeBufferLocked so that it calls the base class implementation. Change-Id: I45d76fb2eb02c1fa6e4e917823ead83e2086bd15
* | | | | Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-devJamie Gennis2012-08-172-93/+28
|\ \ \ \ \ | |/ / / /
| * | | | SurfaceTexture: inherit from ConsumerBaseJamie Gennis2012-08-162-93/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceTexture inherit from ConsumerBase. It removes all of the functionality from SurfaceTexture that is now provided by the base class. Change-Id: I4a881df42810a14ee32d4ef7c8772a8f2510f4c7
* | | | display states can't share the dirty flagsMathias Agopian2012-08-161-3/+5
|/ / / | | | | | | | | | Change-Id: Ifade9f2f1a0df9a36aede77a6cf5eee4be534f98
* | | Merge "Add a very simple helper function to log slow functions." into jb-mr1-devJeff Brown2012-08-131-0/+38
|\ \ \
| * | | Add a very simple helper function to log slow functions.Jeff Brown2012-08-101-0/+38
| | | | | | | | | | | | | | | | Change-Id: I2e2e072206d02b572a330dd25857c161b5b563bf
* | | | improve [un]marshalling of non-binder objectsMathias Agopian2012-08-136-19/+132
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this change introduces a new class LightFlattenable<> which is a protocol to flatten simple objects that don't require binders or file descriptors; the benefit of this protocol is that it doesn't require the objects to have a virtual table and give us a consitant way of doing this. we also introduce an implementation of this protocol for POD structures, LightFlattenablePod<>. Parcel has been update to handle this protocol automatically. Sensor, Rect, Point and Region now use this new protocol. Change-Id: Icb3ce7fa1d785249eb666f39c2129f2fc143ea4a
* | | make multi-display more realMathias Agopian2012-08-103-24/+61
| | | | | | | | | | | | | | | | | | | | | - displays are represented by a binder on the client side - c++ clients can now create and modify displays Change-Id: I203ea5b4beae0819d742ec5171c27568f4e8354b
* | | libgui includes refactoringMathias Agopian2012-08-103-75/+64
| | | | | | | | | | | | Change-Id: I1d24ec17f5003ec2abab5f7472daaff4cc4cc2d3
* | | improve Vector<> safety checksMathias Agopian2012-08-104-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make errors that will always cause a memory corruption always fatal (for eg: KeyedVector<>::editValue{For|At}() failure) - make other errors fatal in debug mode, those that can be caught by the caller. - fix typos Change-Id: I65cc7d81035c37ce2906fc4500c50e5d5b5c49eb
* | | Merge changes Ic3d35a93,I46ec942d into jb-mr1-devJamie Gennis2012-08-062-4/+209
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: SurfaceTexture: fix an out of bounds array access surfaceflinger: refactor FrambufferSurface
| * | | surfaceflinger: refactor FrambufferSurfaceJamie Gennis2012-08-062-4/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change refactors the FramebufferSurface class to inherit from the new ConsumerBase class. Bug: 6620200 Change-Id: I46ec942ddb019658e3c5e79465548b171b2261f2
* | | | libutils cleanup: remove unused or seldom used code from misc.{cpp|h}Mathias Agopian2012-08-051-39/+1
|/ / / | | | | | | | | | Change-Id: I72206f16619d81887e3b85603494563faab3b445
* | | screen-off animation won't be handled by SF anymoreMathias Agopian2012-08-031-13/+0
| | | | | | | | | | | | Change-Id: Idc41386804ae7d7eb981c36e1bc55c270870c8d0
* | | We now have a real list of displays.Mathias Agopian2012-08-021-1/+15
| | | | | | | | | | | | | | | | | | | | | displays can be dynamically added or removed, and the list is part of the SF's transaction. Change-Id: I4186ea39f1317c0e7c044f869004017738968fab
* | | Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-devEd Heyl2012-07-282-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/media/hardware/CryptoAPI.h Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e
| * | | Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGEEdwin Wong2012-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36 Change-Id: Ic2a28663d25e3007c95e15ecbb0d44b820045f85 related-to-bug: 6732061
| * | | libs/ui: Add support for triple framebuffersNaseer Ahmed2012-07-091-2/+3
| | | | | | | | | | | | | | | | Change-Id: I90dd38deeeda9a3785b87286cc7d252c6f948750
| * | | Add vendor specific color format to OMX_IVCommon.hHaynes Mathew George2012-06-211-0/+1
| | |/ | |/| | | | | | | | | | | | | - Add Qualcomm specific color format to OMX_IVCommon.h Change-Id: I77a7196307d079348a50d7bb67c80cd2642a72df
* | | get rid of the shared-memory control blockMathias Agopian2012-07-255-85/+16
| | | | | | | | | | | | Change-Id: If814060aca1d2ff2619d4adcd57296983d207f7f
* | | add a layerStack attribute to Layers.Mathias Agopian2012-07-243-1/+4
| | | | | | | | | | | | | | | | | | | | | this attribute can be set through a regular transaction using SurfaceComposerClient (just like any other attribute, eg: position or size) Change-Id: I701a47c677ea6442ca713728a93335328cd2b172
* | | update SF binder protocol to support setting display attributesMathias Agopian2012-07-242-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | no change of functionality -- the old behavior is implemented on top of this new protocol. this new protocol will allow, eventually, to pass informations about displays and layer stacks. Change-Id: Ic6c2295e61ec8ecbc8ce01ab7664e35d928202fc
* | | Add elapsedRealtimeNano(), and use CLOCK_BOOTTIME where possible.Nick Pelly2012-07-192-2/+4
| | | | | | | | | | | | Change-Id: I4231c8ca32663e6e2cb5b7c126d091f837373807
generated by cgit v1.1 at 2025-01-27 12:44:19 +0000