diff options
author | Andreas Huber <andih@google.com> | 2010-02-01 13:02:58 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-01 13:02:58 -0800 |
commit | 5fdff9e6c50faa6196349e8aecc08d0b9bc5467d (patch) | |
tree | 7e4ec66a65bfc273d737d17493530e6574f39847 | |
parent | 8ef96af97e200a62a3205085c79c6ca7b0e873ee (diff) | |
parent | cfde87ba10df8a5b071102c79b54a34ebd3ddf45 (diff) | |
download | frameworks_base-5fdff9e6c50faa6196349e8aecc08d0b9bc5467d.zip frameworks_base-5fdff9e6c50faa6196349e8aecc08d0b9bc5467d.tar.gz frameworks_base-5fdff9e6c50faa6196349e8aecc08d0b9bc5467d.tar.bz2 |
Merge "Use physical memory for software rendering to take a fast path through surface flinger if possible."
-rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index ef6ede0..ed91eea 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -20,6 +20,7 @@ #include "../include/SoftwareRenderer.h" #include <binder/MemoryHeapBase.h> +#include <binder/MemoryHeapPmem.h> #include <media/stagefright/MediaDebug.h> #include <ui/ISurface.h> @@ -38,8 +39,16 @@ SoftwareRenderer::SoftwareRenderer( mDecodedWidth(decodedWidth), mDecodedHeight(decodedHeight), mFrameSize(mDecodedWidth * mDecodedHeight * 2), // RGB565 - mMemoryHeap(new MemoryHeapBase(2 * mFrameSize)), mIndex(0) { + // TODO: How do I allocate physical memory on Droid? + mMemoryHeap = new MemoryHeapBase("/dev/pmem_adsp", 2 * mFrameSize); + if (mMemoryHeap->heapID() < 0) { + LOGI("Creating physical memory heap failed, reverting to regular heap."); + mMemoryHeap = new MemoryHeapBase(2 * mFrameSize); + } else { + mMemoryHeap = new MemoryHeapPmem(mMemoryHeap); + } + CHECK(mISurface.get() != NULL); CHECK(mDecodedWidth > 0); CHECK(mDecodedHeight > 0); |