commit bf2f7b67da1a1d3b0488e5c86f3b6f9702dc5a07
author Roman Kiryanov <rkir@google.com> Sun Jan 29 19:11:51 2023 -0800
committer Roman Kiryanov <rkir@google.com> Sun Jan 29 19:16:11 2023 -0800
tree 99473aeaa31f0f7ac6630bd05bfd4aadf3f22b55
parent 0ff5d75fc0ae5df70a622247bba10b3a2e1a94de

Minor cleanup in gralloc

Bug: 251042358
Test: presubmit
Change-Id: Id3e2314abb7ca9a004c594f6a480b17d83cb8997
Signed-off-by: Roman Kiryanov <rkir@google.com>

system/hals/allocator3.cpp

diff --git a/system/hals/allocator3.cpp b/system/hals/allocator3.cpp
index 3619d91..b968d7f 100644
--- a/system/hals/allocator3.cpp
+++ b/system/hals/allocator3.cpp
@@ -199,16 +199,14 @@
             emulatorFrameworkFormat = EmulatorFrameworkFormat::YUV_420_888;
             break;
 
-        default:
-            if (static_cast<android::hardware::graphics::common::V1_1::PixelFormat>(format) ==
-                    android::hardware::graphics::common::V1_1::PixelFormat::YCBCR_P010) {
-                yuv_format = true;
-                glFormat = GL_RGBA;
-                glType = GL_UNSIGNED_BYTE;
-                bpp = 2;
-                break;
-            }
+        case PixelFormat::YCBCR_P010:
+            yuv_format = true;
+            glFormat = GL_RGBA;
+            glType = GL_UNSIGNED_BYTE;
+            bpp = 2;
+            break;
 
+        default:
             ALOGE("%s:%d Unsupported format: format=%d, frameworkFormat=%d, usage=%x",
                   __func__, __LINE__, format, descriptor.format, usage);
             RETURN_ERROR(Error3::UNSUPPORTED);

system/hals/mapper3.cpp

diff --git a/system/hals/mapper3.cpp b/system/hals/mapper3.cpp
index 58c0f69..a14a0cd 100644
--- a/system/hals/mapper3.cpp
+++ b/system/hals/mapper3.cpp
@@ -351,17 +351,15 @@
             cStep = 1;
             break;
 
-        default:
-            if (static_cast<android::hardware::graphics::common::V1_1::PixelFormat>(cb->format) ==
-                    android::hardware::graphics::common::V1_1::PixelFormat::YCBCR_P010) {
-                yStride = cb->width * 2;
-                cStride = yStride;
-                uOffset = cb->height * yStride;
-                vOffset = uOffset + 2;
-                cStep = 4;
-                break;
-            }
+        case PixelFormat::YCBCR_P010:
+            yStride = cb->width * 2;
+            cStride = yStride;
+            uOffset = cb->height * yStride;
+            vOffset = uOffset + 2;
+            cStep = 4;
+            break;
 
+        default:
             ALOGE("%s:%d unexpected format (%d)", __func__, __LINE__, cb->format);
             RETURN_ERROR(Error3::BAD_BUFFER);
         }