Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b4f875 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

am b72726ba: Merge "camera1: Ensure MemoryHeap buffers are mmapped before copying." into lmp-dev

* commit 'b72726ba':
  camera1: Ensure MemoryHeap buffers are mmapped before copying.
parents 0b9a8c06 b72726ba
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -938,7 +938,20 @@ void CameraClient::copyFrameAndPostCopiedFrame(
    }
    previewBuffer = mPreviewBuffer;

    memcpy(previewBuffer->base(), (uint8_t *)heap->base() + offset, size);
    void* previewBufferBase = previewBuffer->base();
    void* heapBase = heap->base();

    if (heapBase == MAP_FAILED) {
        ALOGE("%s: Failed to mmap heap for preview frame.", __FUNCTION__);
        mLock.unlock();
        return;
    } else if (previewBufferBase == MAP_FAILED) {
        ALOGE("%s: Failed to mmap preview buffer for preview frame.", __FUNCTION__);
        mLock.unlock();
        return;
    }

    memcpy(previewBufferBase, (uint8_t *) heapBase + offset, size);

    sp<MemoryBase> frame = new MemoryBase(previewBuffer, 0, size);
    if (frame == 0) {