Merge SP1A.210803.001
Change-Id: I5b70f03707726e24325b29053c2c05cc712d4270
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);
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);