commit 202ff50113b293a80c8df60022e2c4ad8a829fbe
author Andreas Huber <andih@google.com> Tue Nov 03 11:59:59 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 03 11:59:59 2009 -0800
tree 8bb439769e4ccf325b8db9f5d98ead07621fc4ff
parent 672635d84f2d897b5e782448356bba18b5f2dc7c
parent c6c6237a67661c7b2d8822b7360cdf01e64d2c7c

am 338ccf43: Merge change Id2906ad8 into eclair

Merge commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d' into eclair-mr2

* commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d':
  Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.

media/libstagefright/omx/QComHardwareRenderer.cpp

diff --git a/media/libstagefright/omx/QComHardwareRenderer.cpp b/media/libstagefright/omx/QComHardwareRenderer.cpp
index 8e78c77..837b6a4 100644
--- a/media/libstagefright/omx/QComHardwareRenderer.cpp
+++ b/media/libstagefright/omx/QComHardwareRenderer.cpp
@@ -127,7 +127,8 @@
 
     master->setDevice("/dev/pmem");
 
-    mMemoryHeap = new MemoryHeapPmem(master, 0);
+    uint32_t heap_flags = master->getFlags() & MemoryHeapBase::NO_CACHING;
+    mMemoryHeap = new MemoryHeapPmem(master, heap_flags);
     mMemoryHeap->slap();
 
     ISurface::BufferHeap bufferHeap(