commit 1622d38408797c56b3649e567063c0885418a382
author qctecmdr <qctecmdr@localhost> Fri Apr 03 04:00:49 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 03 04:00:49 2020 -0700
tree 24f764cefa36f675ecebb1f5d8eb12f1a51fba7a
parent 48a1fa6c53397251af10a8e4b58f0e55a35cc3d6
parent 8e65bf874b3c7154a205c938690031a3357381b4

Merge "gralloc: Add support for new camera FLEX formats"

gralloc/gr_camera_info.cpp

diff --git a/gralloc/gr_camera_info.cpp b/gralloc/gr_camera_info.cpp
index 99f3851..12ec3db 100644
--- a/gralloc/gr_camera_info.cpp
+++ b/gralloc/gr_camera_info.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -109,6 +109,15 @@
     case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX:
       format = CAMERA_PIXEL_FORMAT_UBWC_FLEX;
       break;
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_2_BATCH:
+      format = CAMERA_PIXEL_FORMAT_UBWC_FLEX_2_BATCH;
+      break;
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_4_BATCH:
+      format = CAMERA_PIXEL_FORMAT_UBWC_FLEX_4_BATCH;
+      break;
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_8_BATCH:
+      format = CAMERA_PIXEL_FORMAT_UBWC_FLEX_8_BATCH;
+      break;
     case HAL_PIXEL_FORMAT_MULTIPLANAR_FLEX:
       format = CAMERA_PIXEL_FORMAT_MULTIPLANAR_FLEX;
       break;

gralloc/gr_camera_info.h

diff --git a/gralloc/gr_camera_info.h b/gralloc/gr_camera_info.h
index fe4d357..28e02b0 100644
--- a/gralloc/gr_camera_info.h
+++ b/gralloc/gr_camera_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -51,8 +51,14 @@
                                          // individual APIs
   CAMERA_PIXEL_FORMAT_UBWC_FLEX = 0x126,  // YUV format with fliexible alignment defined by
                                           // individual APIs
-  CAMERA_PIXEL_FORMAT_MULTIPLANAR_FLEX = 0x127,  // YUV format with fliexible alignment defined by
-                                                 // individual APIs
+  CAMERA_PIXEL_FORMAT_MULTIPLANAR_FLEX = 0x127,   // YUV format with fliexible alignment defined by
+                                                  // individual APIs
+  CAMERA_PIXEL_FORMAT_UBWC_FLEX_2_BATCH = 0x128,  // YUV format with fliexible alignment defined by
+                                                  // individual APIs
+  CAMERA_PIXEL_FORMAT_UBWC_FLEX_4_BATCH = 0x129,  // YUV format with fliexible alignment defined by
+                                                  // individual APIs
+  CAMERA_PIXEL_FORMAT_UBWC_FLEX_8_BATCH = 0x130,  // YUV format with fliexible alignment defined by
+                                                  // individual APIs
   CAMERA_PIXEL_FORMAT_NV12_VENUS = 0x7FA30C04,           // NV12 video format
   CAMERA_PIXEL_FORMAT_NV12_HEIF = 0x00000116,            // HEIF video YUV420 format
   CAMERA_PIXEL_FORMAT_YCbCr_420_SP_UBWC = 0x7FA30C06,    // 8 bit YUV 420 semi-planar UBWC format

gralloc/gr_utils.cpp

diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp
index 79e5d3a..07ad9e2 100644
--- a/gralloc/gr_utils.cpp
+++ b/gralloc/gr_utils.cpp
@@ -72,6 +72,9 @@
     case HAL_PIXEL_FORMAT_CbYCrY_422_I:
     case HAL_PIXEL_FORMAT_NV12_LINEAR_FLEX :
     case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX:
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_2_BATCH:
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_4_BATCH:
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_8_BATCH:
     case HAL_PIXEL_FORMAT_MULTIPLANAR_FLEX:
       return true;
     default:
@@ -153,6 +156,9 @@
     case HAL_PIXEL_FORMAT_NV21_ZSL:
     case HAL_PIXEL_FORMAT_NV12_LINEAR_FLEX:
     case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX:
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_2_BATCH:
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_4_BATCH:
+    case HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_8_BATCH:
     case HAL_PIXEL_FORMAT_MULTIPLANAR_FLEX:
     case HAL_PIXEL_FORMAT_RAW_OPAQUE:
     case HAL_PIXEL_FORMAT_RAW10: