From 3914efed82de14a5e149b6cdf67cfb92bf261712 Mon Sep 17 00:00:00 2001 From: Austin Borger Date: Wed, 24 May 2023 17:17:25 -0700 Subject: [PATCH] Camera: Relax input format requirements for RAW reprocessing. Certain applications may want to request RAW reprocessing when they know the capabilities of the device in advance. CTS requirements will prevent HALs from advertising this capability, but we should allow requests for it. Bug: 282820994 Test: Ran Camera CTS Change-Id: I1526841f38ab1409c15c10cd5d95107741997d6f --- .../android/hardware/camera2/impl/CameraDeviceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index e23bbc6c347d9..d3bde4b4b8a86 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -20,6 +20,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainRunna import android.annotation.NonNull; import android.content.Context; +import android.graphics.ImageFormat; import android.hardware.ICameraService; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCaptureSession; @@ -1478,6 +1479,12 @@ public class CameraDeviceImpl extends CameraDevice } } + // Allow RAW formats, even when not advertised. + if (inputFormat == ImageFormat.RAW_PRIVATE || inputFormat == ImageFormat.RAW10 + || inputFormat == ImageFormat.RAW12 || inputFormat == ImageFormat.RAW_SENSOR) { + return true; + } + if (validFormat == false) { return false; }