commit da46a8d302b53882a5f17ef598c82cd40e26930f
author Linux Build Service Account <lnxbuild@localhost> Tue Aug 18 20:21:57 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 18 20:21:57 2020 -0700
tree a722b47b062c66d46957ce32e5619458ba85be86
parent 1e51caea9f24e1f96fb54c1ef5d45604ef6ac1df
parent fe4cd075a525eb65ea1d82c6bc5116dd233494f1

Merge "gralloc: Consider subsampling in width and height" into display.lnx.5.1.r2-rel

gralloc/gr_buf_mgr.cpp

diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp
index 0d5d376..e78ba2e 100644
--- a/gralloc/gr_buf_mgr.cpp
+++ b/gralloc/gr_buf_mgr.cpp
@@ -687,8 +687,8 @@
     plane_info[i].sampleIncrementInBits = static_cast<int64_t>(plane_layout[i].step * 8);
     plane_info[i].strideInBytes = static_cast<int64_t>(plane_layout[i].stride_bytes);
     plane_info[i].totalSizeInBytes = static_cast<int64_t>(plane_layout[i].size);
-    plane_info[i].widthInSamples = handle->unaligned_width;
-    plane_info[i].heightInSamples = handle->unaligned_height;
+    plane_info[i].widthInSamples = handle->unaligned_width >> plane_layout[i].h_subsampling;
+    plane_info[i].heightInSamples = handle->unaligned_height >> plane_layout[i].v_subsampling;
   }
   *out = plane_info;
   return Error::NONE;