commit 5ed4f5f21a17a6961c34ec18595c8a587f5c8c36
author Jason Macnak <natsu@google.com> Fri Jul 09 17:30:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 09 17:30:40 2021 +0000
tree f9fbbf4587ce3d1573d2eec3d39061f4cd804185
parent 0ec5fbec6be93cbccf3106dc3469c14ce26e8417
parent 99656856f6a33ad1779eabf0513e19b77601cdeb

Merge "Handle R16G16B16A16_FLOAT in AHardwareBuffer_bytesPerPixel" am: d195645e36 am: 3ecfed4579 am: 99656856f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1760374

Change-Id: I8ae99ba341c3e98fe28211409b267351cab9b258

libs/nativewindow/AHardwareBuffer.cpp

diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp
index 79b47a1..8a677ce 100644
--- a/libs/nativewindow/AHardwareBuffer.cpp
+++ b/libs/nativewindow/AHardwareBuffer.cpp
@@ -653,6 +653,8 @@
       case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
       case AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT:
           return 4;
+      case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
+          return 8;
       default:
           return 0;
   }