diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:10 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:10 -0800 |
commit | 9266c558bf1d21ff647525ff99f7dadbca417309 (patch) | |
tree | 1630b1ba80f4793caf39d865528e662bdb1037fe /libs/surfaceflinger/LayerBuffer.cpp | |
parent | b798689749c64baba81f02e10cf2157c747d6b46 (diff) | |
download | frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.zip frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.gz frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.bz2 |
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'libs/surfaceflinger/LayerBuffer.cpp')
-rw-r--r-- | libs/surfaceflinger/LayerBuffer.cpp | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp index 700e4f5..c9cebf4 100644 --- a/libs/surfaceflinger/LayerBuffer.cpp +++ b/libs/surfaceflinger/LayerBuffer.cpp @@ -95,10 +95,9 @@ void LayerBuffer::postBuffer(ssize_t offset) void LayerBuffer::unregisterBuffers() { - sp<Source> source(getSource()); + sp<Source> source(clearSource()); if (source != 0) source->unregisterBuffers(); - // XXX: clear mSource } uint32_t LayerBuffer::doTransaction(uint32_t flags) @@ -172,6 +171,14 @@ sp<LayerBuffer::Source> LayerBuffer::getSource() const { return mSource; } +sp<LayerBuffer::Source> LayerBuffer::clearSource() { + sp<Source> source; + Mutex::Autolock _l(mLock); + source = mSource; + mSource.clear(); + return source; +} + // ============================================================================ // LayerBuffer::SurfaceBuffer // ============================================================================ @@ -477,15 +484,16 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const LayerBuffer::OverlaySource::OverlaySource(LayerBuffer& layer, sp<OverlayRef>* overlayRef, uint32_t w, uint32_t h, int32_t format) - : Source(layer), mVisibilityChanged(false), mOverlay(0), mOverlayHandle(0) + : Source(layer), mVisibilityChanged(false), + mOverlay(0), mOverlayHandle(0), mOverlayDevice(0) { overlay_control_device_t* overlay_dev = mLayer.mFlinger->getOverlayEngine(); - if (overlay_dev == NULL) { // overlays not supported return; } + mOverlayDevice = overlay_dev; overlay_t* overlay = overlay_dev->createOverlay(overlay_dev, w, h, format); if (overlay == NULL) { // couldn't create the overlay (no memory? no more overlays?) @@ -507,14 +515,18 @@ LayerBuffer::OverlaySource::OverlaySource(LayerBuffer& layer, // NOTE: here it's okay to acquire a reference to "this"m as long as // the reference is not released before we leave the ctor. - sp<OverlayChanel> chanel = new OverlayChanel(this); + sp<OverlayChannel> channel = new OverlayChannel(this); - *overlayRef = new OverlayRef(mOverlayHandle, chanel, + *overlayRef = new OverlayRef(mOverlayHandle, channel, mWidth, mHeight, mFormat, mWidthStride, mHeightStride); } LayerBuffer::OverlaySource::~OverlaySource() -{ +{ + if (mOverlay && mOverlayDevice) { + overlay_control_device_t* overlay_dev = mOverlayDevice; + overlay_dev->destroyOverlay(overlay_dev, mOverlay); + } } void LayerBuffer::OverlaySource::onTransaction(uint32_t flags) @@ -543,8 +555,7 @@ void LayerBuffer::OverlaySource::onVisibilityResolved( // we need a lock here to protect "destroy" Mutex::Autolock _l(mLock); if (mOverlay) { - overlay_control_device_t* overlay_dev = - mLayer.mFlinger->getOverlayEngine(); + overlay_control_device_t* overlay_dev = mOverlayDevice; overlay_dev->setPosition(overlay_dev, mOverlay, x,y,w,h); overlay_dev->setParameter(overlay_dev, mOverlay, OVERLAY_TRANSFORM, mLayer.getOrientation()); @@ -555,11 +566,16 @@ void LayerBuffer::OverlaySource::onVisibilityResolved( void LayerBuffer::OverlaySource::serverDestroy() { + mLayer.clearSource(); + destroyOverlay(); +} + +void LayerBuffer::OverlaySource::destroyOverlay() +{ // we need a lock here to protect "onVisibilityResolved" Mutex::Autolock _l(mLock); if (mOverlay) { - overlay_control_device_t* overlay_dev = - mLayer.mFlinger->getOverlayEngine(); + overlay_control_device_t* overlay_dev = mOverlayDevice; overlay_dev->destroyOverlay(overlay_dev, mOverlay); mOverlay = 0; } |