commit df41327854757726660528124ca91c2589355c27
author Huan Song <huans@google.com> Wed Jul 21 16:51:44 2021 -0700
committer Huan Song <huans@google.com> Thu Jul 22 10:35:58 2021 -0700
tree 535162436a4a5028de197c30425bc60deec0e033
parent 7efc857cdd219046336d6b978fa12d028291ffe7

Set YCbCr420_888 as default camera format

Bug: b/189957071

Test: run cts -m CtsCameraTestCases -t
android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface[1]

Change-Id: Ib1fb929fe2d37a5b187a294b853af18ca2b7eb60

system/hals/allocator3.cpp

diff --git a/system/hals/allocator3.cpp b/system/hals/allocator3.cpp
index 5c103a5..d3cf5c1 100644
--- a/system/hals/allocator3.cpp
+++ b/system/hals/allocator3.cpp
@@ -301,6 +301,10 @@
                     // Camera-to-encoder is NV21
                     *format = PixelFormat::YCRCB_420_SP;
                     RETURN(Error3::NONE);
+                } else {
+                    // b/189957071
+                    *format = PixelFormat::YCBCR_420_888;
+                    RETURN(Error3::NONE);
                 }
             }
             RETURN_ERROR(Error3::UNSUPPORTED);

system/hals/mapper3.cpp

diff --git a/system/hals/mapper3.cpp b/system/hals/mapper3.cpp
index 6903f9b..e74e76c 100644
--- a/system/hals/mapper3.cpp
+++ b/system/hals/mapper3.cpp
@@ -567,11 +567,7 @@
 
         case PixelFormat::IMPLEMENTATION_DEFINED:
             if (usage & BufferUsage::CAMERA_OUTPUT) {
-                if (usage & BufferUsage::GPU_TEXTURE) {
-                    RETURN(true);
-                } else if (usage & BufferUsage::VIDEO_ENCODER) {
-                    RETURN(true);
-                }
+                RETURN(true);
             }
             RETURN(false);