Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44e65f46 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Update RAW stream dataspace 

Raw stream dataspace is ARBITRARY, not UNKNOWN based on graphics.h.

Test: atest MultiResolutionImageReaderTest
Bug: 330097655
Change-Id: I1b2cf69191d657690575e8dc646426a80d1d5ec3
parent 6cc5aab0

core/java/android/hardware/camera2/params/StreamConfigurationMap.java

+16 −0
Original line number Diff line number Diff line
@@ -1473,6 +1473,11 @@ public final class StreamConfigurationMap { 
     * <li>ImageFormat.DEPTH_JPEG => HAL_DATASPACE_DYNAMIC_DEPTH

     * <li>ImageFormat.HEIC => HAL_DATASPACE_HEIF

     * <li>ImageFormat.JPEG_R => HAL_DATASPACE_JPEG_R

     * <li>ImageFormat.YUV_420_888 => HAL_DATASPACE_JFIF

     * <li>ImageFormat.RAW_SENSOR => HAL_DATASPACE_ARBITRARY

     * <li>ImageFormat.RAW_OPAQUE => HAL_DATASPACE_ARBITRARY

     * <li>ImageFormat.RAW10 => HAL_DATASPACE_ARBITRARY

     * <li>ImageFormat.RAW12 => HAL_DATASPACE_ARBITRARY

     * <li>others => HAL_DATASPACE_UNKNOWN

     * </ul>

     * </p>
@@ -1511,6 +1516,11 @@ public final class StreamConfigurationMap { 
                return HAL_DATASPACE_JPEG_R;

            case ImageFormat.YUV_420_888:

                return HAL_DATASPACE_JFIF;

            case ImageFormat.RAW_SENSOR:

            case ImageFormat.RAW_PRIVATE:

            case ImageFormat.RAW10:

            case ImageFormat.RAW12:

                return HAL_DATASPACE_ARBITRARY;

            default:

                return HAL_DATASPACE_UNKNOWN;

        }
@@ -2005,6 +2015,12 @@ public final class StreamConfigurationMap { 
    private static final int HAL_DATASPACE_RANGE_SHIFT = 27;



    private static final int HAL_DATASPACE_UNKNOWN = 0x0;



    /**

     * @hide

     */

    public static final int HAL_DATASPACE_ARBITRARY = 0x1;



    /** @hide */

    public static final int HAL_DATASPACE_V0_JFIF =

            (2 << HAL_DATASPACE_STANDARD_SHIFT) |