summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-03-08 14:29:38 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-08 14:29:38 -0800
commit0e0b0c9e3d2c2edf8deff1f02b7856ad47db3ff9 (patch)
tree80abdb50e95ec914683169a1828c7290679e0c52 /media
parentb3871fad556084932b6d17d07972cd2d8250fb5c (diff)
parent4c987433da6df0a42dc5643e11bff5f955f53fdc (diff)
downloadframeworks_base-0e0b0c9e3d2c2edf8deff1f02b7856ad47db3ff9.zip
frameworks_base-0e0b0c9e3d2c2edf8deff1f02b7856ad47db3ff9.tar.gz
frameworks_base-0e0b0c9e3d2c2edf8deff1f02b7856ad47db3ff9.tar.bz2
Merge "Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers."
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/colorconversion/SoftwareRenderer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index 4c11c36..a6dbf69 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -45,7 +45,9 @@ SoftwareRenderer::SoftwareRenderer(
LOGI("Creating physical memory heap failed, reverting to regular heap.");
mMemoryHeap = new MemoryHeapBase(2 * mFrameSize);
} else {
- mMemoryHeap = new MemoryHeapPmem(mMemoryHeap);
+ sp<MemoryHeapPmem> pmemHeap = new MemoryHeapPmem(mMemoryHeap);
+ pmemHeap->slap();
+ mMemoryHeap = pmemHeap;
}
CHECK(mISurface.get() != NULL);