commit 99656856f6a33ad1779eabf0513e19b77601cdeb
author Jason Macnak <natsu@google.com> Fri Jul 09 17:21:06 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 09 17:21:06 2021 +0000
tree c4a35a13abe629e30c4bf278fa910bd200e94c6c
parent 26a8d3f9af8c057cdd9178d77c354ef988781c31
parent 3ecfed4579b41313aa77a46f71eba2f31396d1f4

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

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

Change-Id: Ie7994fe301d5c5650976fb8f08a11490e160c404

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;
   }