commit 1ebb261c0c22955116d121e5d38dfa68df027c6c
author Andreas Huber <andih@google.com> Mon Mar 08 14:29:38 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 08 14:29:38 2010 -0800
tree 2181aed3c5c1667f33ed319ff3b6200f441ec41d
parent 1322e7ebc33e8e161fb73cd47e43dd93357608e4
parent 0caaa95e11b700440f64e110b11f77a93acfa569

Merge "Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers."

media/libstagefright/colorconversion/SoftwareRenderer.cpp

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 @@
         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);