diff options
| author | Tyler Luu <tluu@ti.com> | 2011-09-07 18:35:54 -0500 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-07 17:51:55 -0700 |
| commit | 941b79b3815eb5f41e0d194d6f65161d1e4a86d0 (patch) | |
| tree | 9efa61395113c77e2e976d29f32dd268bd1df18a /camera/ANativeWindowDisplayAdapter.cpp | |
| parent | 342adfa1cc708708ddfc167d06b2345fcaa8b0e5 (diff) | |
| download | hardware_ti_omap4xxx-941b79b3815eb5f41e0d194d6f65161d1e4a86d0.zip hardware_ti_omap4xxx-941b79b3815eb5f41e0d194d6f65161d1e4a86d0.tar.gz hardware_ti_omap4xxx-941b79b3815eb5f41e0d194d6f65161d1e4a86d0.tar.bz2 | |
CameraHal: Use the same gralloc usage bits for alloc and write
Change-Id: I013fd9ff40efb0ceaa1575a5af1c077d72e7921d
Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera/ANativeWindowDisplayAdapter.cpp')
| -rw-r--r-- | camera/ANativeWindowDisplayAdapter.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/camera/ANativeWindowDisplayAdapter.cpp b/camera/ANativeWindowDisplayAdapter.cpp index 3c9396b..0c4df00 100644 --- a/camera/ANativeWindowDisplayAdapter.cpp +++ b/camera/ANativeWindowDisplayAdapter.cpp @@ -551,7 +551,7 @@ void* ANativeWindowDisplayAdapter::allocateBuffer(int width, int height, const c } // Set gralloc usage bits for window. - err = mANativeWindow->set_usage(mANativeWindow, GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP); + err = mANativeWindow->set_usage(mANativeWindow, CAMHAL_GRALLOC_USAGE); if (err != 0) { LOGE("native_window_set_usage failed: %s (%d)", strerror(-err), -err); @@ -654,11 +654,7 @@ void* ANativeWindowDisplayAdapter::allocateBuffer(int width, int height, const c mANativeWindow->lock_buffer(mANativeWindow, mBufferHandleMap[i]); - mapper.lock((buffer_handle_t) mGrallocHandleMap[i], - GRALLOC_USAGE_HW_RENDER | - GRALLOC_USAGE_SW_READ_RARELY | - GRALLOC_USAGE_SW_WRITE_NEVER, - bounds, y_uv); + mapper.lock((buffer_handle_t) mGrallocHandleMap[i], CAMHAL_GRALLOC_USAGE, bounds, y_uv); } // return the rest of the buffers back to ANativeWindow @@ -1168,11 +1164,7 @@ bool ANativeWindowDisplayAdapter::handleFrameReturn() bounds.top = 0; bounds.right = mFrameWidth; bounds.bottom = mFrameHeight; - mapper.lock((buffer_handle_t) mGrallocHandleMap[i], - GRALLOC_USAGE_HW_RENDER | - GRALLOC_USAGE_SW_READ_RARELY | - GRALLOC_USAGE_SW_WRITE_NEVER, - bounds, y_uv); + mapper.lock((buffer_handle_t) mGrallocHandleMap[i], CAMHAL_GRALLOC_USAGE, bounds, y_uv); mFramesWithCameraAdapterMap.add((int) mGrallocHandleMap[i], i); |