summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajat Yadav <rajayada@codeaurora.org>2021-10-08 10:44:14 +0530
committerRajat Yadav <rajayada@codeaurora.org>2021-10-08 15:57:55 +0530
commit53f98bbc9034b04f7ca70ff7d753769da4d640fa (patch)
tree84a1b5a1d1444710bb3b814ebf6aca77f31ccef8
parent1a81bdd1ad6522362f5e45161a508b57e46c663c (diff)
Revert "gralloc: Fix align width and heigth for YCrCb and YCbCr format"
This reverts commit bd9c05adf9d9ee324423f86d4eda73744f6d1bbb. Change-Id: Ia1b26b6012758a23e76391c4808fd00a08cbbe6a
-rw-r--r--gralloc/gr_utils.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp
index d9559122..7c6265ed 100644
--- a/gralloc/gr_utils.cpp
+++ b/gralloc/gr_utils.cpp
@@ -1080,17 +1080,12 @@ void GetAlignedWidthAndHeight(const BufferInfo &info, unsigned int *alignedw,
// Below should be only YUV family
switch (format) {
case HAL_PIXEL_FORMAT_YCrCb_420_SP:
- /*
- * Todo: relook this alignment again
- * Change made to unblock the software EIS feature from camera
- * Currently using same alignment as camera doing
- */
- aligned_w = INT(VENUS_Y_STRIDE(COLOR_FMT_NV21, width));
- aligned_h = INT(VENUS_Y_SCANLINES(COLOR_FMT_NV21, height));
- break;
case HAL_PIXEL_FORMAT_YCbCr_420_SP:
- aligned_w = INT(VENUS_Y_STRIDE(COLOR_FMT_NV12, width));
- aligned_h = INT(VENUS_Y_SCANLINES(COLOR_FMT_NV12, height));
+ if (AdrenoMemInfo::GetInstance() == nullptr) {
+ return;
+ }
+ alignment = AdrenoMemInfo::GetInstance()->GetGpuPixelAlignment();
+ aligned_w = ALIGN(width, alignment);
break;
case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
aligned_w = ALIGN(width, alignment);