diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2014-10-01 02:11:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 02:11:36 +0000 |
commit | 16450e9fac197b076ee2b03b579183c6ff17ba46 (patch) | |
tree | eb48a9b4eed20ce6ea3058ca4d58d8e4fe49af97 | |
parent | 00cd942ebe4bf675cad1fbba0d09ba36e419b017 (diff) | |
parent | c8c05d6a5821dd56209e160066314a03d2f2ca06 (diff) | |
download | frameworks_av-16450e9fac197b076ee2b03b579183c6ff17ba46.zip frameworks_av-16450e9fac197b076ee2b03b579183c6ff17ba46.tar.gz frameworks_av-16450e9fac197b076ee2b03b579183c6ff17ba46.tar.bz2 |
am c8c05d6a: Merge "CameraService: API1: Reallocate JPEG ashmem heap if size changes" into lmp-dev
* commit 'c8c05d6a5821dd56209e160066314a03d2f2ca06':
CameraService: API1: Reallocate JPEG ashmem heap if size changes
-rw-r--r-- | services/camera/libcameraservice/api1/client2/JpegProcessor.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/client2/JpegProcessor.cpp b/services/camera/libcameraservice/api1/client2/JpegProcessor.cpp index cda98be..b433781 100644 --- a/services/camera/libcameraservice/api1/client2/JpegProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/JpegProcessor.cpp @@ -89,14 +89,27 @@ status_t JpegProcessor::updateStream(const Parameters ¶ms) { mCaptureConsumer->setFrameAvailableListener(this); mCaptureConsumer->setName(String8("Camera2Client::CaptureConsumer")); mCaptureWindow = new Surface(producer); + } + + // Since ashmem heaps are rounded up to page size, don't reallocate if + // the capture heap isn't exactly the same size as the required JPEG buffer + const size_t HEAP_SLACK_FACTOR = 2; + if (mCaptureHeap == 0 || + (mCaptureHeap->getSize() < static_cast<size_t>(maxJpegSize)) || + (mCaptureHeap->getSize() > + static_cast<size_t>(maxJpegSize) * HEAP_SLACK_FACTOR) ) { // Create memory for API consumption - mCaptureHeap = new MemoryHeapBase(maxJpegSize, 0, "Camera2Client::CaptureHeap"); + mCaptureHeap.clear(); + mCaptureHeap = + new MemoryHeapBase(maxJpegSize, 0, "Camera2Client::CaptureHeap"); if (mCaptureHeap->getSize() == 0) { ALOGE("%s: Camera %d: Unable to allocate memory for capture", __FUNCTION__, mId); return NO_MEMORY; } } + ALOGV("%s: Camera %d: JPEG capture heap now %d bytes; requested %d bytes", + __FUNCTION__, mId, mCaptureHeap->getSize(), maxJpegSize); if (mCaptureStreamId != NO_STREAM) { // Check if stream parameters have to change |