commit 535c1da7c6c29205ff84d3719dfefde2670a1e8a
author android-build-team Robot <android-build-team-robot@google.com> Tue Nov 03 18:17:17 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Nov 03 18:17:17 2020 +0000
tree 3abe06a6afa4c24164f64c3105797b6e42645c55
parent ba3632f69f7289e86a2276a5af12b9a364e9cae4
parent 91f18f4dd42c8ff13d2c235b2ea217b26df31685

Snap for 6948038 from 91f18f4dd42c8ff13d2c235b2ea217b26df31685 to rvc-platform-release

Change-Id: Ie20f0d2098b10b18c4d7e7d812f35d64db20a1e2

cros_gralloc/gralloc4/CrosGralloc4Mapper.cc

diff --git a/cros_gralloc/gralloc4/CrosGralloc4Mapper.cc b/cros_gralloc/gralloc4/CrosGralloc4Mapper.cc
index 47e24ac..2a3f4c0 100644
--- a/cros_gralloc/gralloc4/CrosGralloc4Mapper.cc
+++ b/cros_gralloc/gralloc4/CrosGralloc4Mapper.cc
@@ -467,7 +467,12 @@
         PixelFormat pixelFormat = static_cast<PixelFormat>(crosHandle->droid_format);
         status = android::gralloc4::encodePixelFormatRequested(pixelFormat, &encodedMetadata);
     } else if (metadataType == android::gralloc4::MetadataType_PixelFormatFourCC) {
-        status = android::gralloc4::encodePixelFormatFourCC(crosHandle->format, &encodedMetadata);
+        uint32_t format = crosHandle->format;
+        // Map internal fourcc codes back to standard fourcc codes.
+        if (format == DRM_FORMAT_YVU420_ANDROID) {
+            format = DRM_FORMAT_YVU420;
+        }
+        status = android::gralloc4::encodePixelFormatFourCC(format, &encodedMetadata);
     } else if (metadataType == android::gralloc4::MetadataType_PixelFormatModifier) {
         status = android::gralloc4::encodePixelFormatModifier(crosHandle->format_modifier,
                                                               &encodedMetadata);