Revert "vndk: Align size for ion buffers"
This reverts commit 72dfcb700fe2d0057f303eb0c73326a8444ad49b.
Reason for revert: Camera regression
Bug: 110988142
Change-Id: I749975744280a4875d6afc1e42b7ba981a558950
Test: record video using Camera app
diff --git a/codec2/vndk/C2AllocatorIon.cpp b/codec2/vndk/C2AllocatorIon.cpp
index bd852b9..57d4f0b 100644
--- a/codec2/vndk/C2AllocatorIon.cpp
+++ b/codec2/vndk/C2AllocatorIon.cpp
@@ -212,11 +212,10 @@
static Impl *Alloc(int ionFd, size_t size, size_t align, unsigned heapMask, unsigned flags, C2Allocator::id_t id) {
int bufferFd = -1;
ion_user_handle_t buffer = -1;
- size_t alignedSize = (size + align - 1) & ~(align - 1);
- int ret = ion_alloc(ionFd, alignedSize, align, heapMask, flags, &buffer);
+ int ret = ion_alloc(ionFd, size, align, heapMask, flags, &buffer);
ALOGV("ion_alloc(ionFd = %d, size = %zu, align = %zu, prot = %d, flags = %d) "
"returned (%d) ; buffer = %d",
- ionFd, alignedSize, align, heapMask, flags, ret, buffer);
+ ionFd, size, align, heapMask, flags, ret, buffer);
if (ret == 0) {
// get buffer fd for native handle constructor
ret = ion_share(ionFd, buffer, &bufferFd);
@@ -225,7 +224,7 @@
buffer = -1;
}
}
- return new Impl(ionFd, alignedSize, bufferFd, buffer, id, ret);
+ return new Impl(ionFd, size, bufferFd, buffer, id, ret);
}
c2_status_t map(size_t offset, size_t size, C2MemoryUsage usage, C2Fence *fence, void **addr) {
