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

Commit 61adad88 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Adjust graphics dataspace references to new standard" into nyc-dev

parents 95972768 7966d446

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

+11 −3
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ public final class StreamConfigurationMap { 
     *

     * <p>In particular these formats are converted:

     * <ul>

     * <li>ImageFormat.JPEG => HAL_DATASPACE_JFIF

     * <li>ImageFormat.JPEG => HAL_DATASPACE_V0_JFIF

     * <li>ImageFormat.DEPTH_POINT_CLOUD => HAL_DATASPACE_DEPTH

     * <li>ImageFormat.DEPTH16 => HAL_DATASPACE_DEPTH

     * <li>others => HAL_DATASPACE_UNKNOWN
@@ -1223,7 +1223,7 @@ public final class StreamConfigurationMap { 
    static int imageFormatToDataspace(int format) {

        switch (format) {

            case ImageFormat.JPEG:

                return HAL_DATASPACE_JFIF;

                return HAL_DATASPACE_V0_JFIF;

            case ImageFormat.DEPTH_POINT_CLOUD:

            case ImageFormat.DEPTH16:

                return HAL_DATASPACE_DEPTH;
@@ -1633,8 +1633,16 @@ public final class StreamConfigurationMap { 
    private static final int HAL_PIXEL_FORMAT_Y16 = 0x20363159;





    private static final int HAL_DATASPACE_STANDARD_SHIFT = 16;

    private static final int HAL_DATASPACE_TRANSFER_SHIFT = 22;

    private static final int HAL_DATASPACE_RANGE_SHIFT = 27;



    private static final int HAL_DATASPACE_UNKNOWN = 0x0;

    private static final int HAL_DATASPACE_JFIF = 0x101;

    private static final int HAL_DATASPACE_V0_JFIF =

            (2 << HAL_DATASPACE_STANDARD_SHIFT) |

            (3 << HAL_DATASPACE_TRANSFER_SHIFT) |

            (1 << HAL_DATASPACE_RANGE_SHIFT);



    private static final int HAL_DATASPACE_DEPTH = 0x1000;



    private static final long DURATION_20FPS_NS = 50000000L;

core/jni/android_view_Surface.cpp

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ android_dataspace android_view_Surface_mapPublicFormatToHalDataspace( 
        PublicFormat f) {

    switch(f) {

        case PublicFormat::JPEG:

            return HAL_DATASPACE_JFIF;

            return HAL_DATASPACE_V0_JFIF;

        case PublicFormat::DEPTH_POINT_CLOUD:

        case PublicFormat::DEPTH16:

            return HAL_DATASPACE_DEPTH;
@@ -156,7 +156,7 @@ android_dataspace android_view_Surface_mapPublicFormatToHalDataspace( 
        case PublicFormat::YUV_420_888:

        case PublicFormat::NV21:

        case PublicFormat::YV12:

            return HAL_DATASPACE_JFIF;

            return HAL_DATASPACE_V0_JFIF;

        default:

            // Most formats map to UNKNOWN

            return HAL_DATASPACE_UNKNOWN;
@@ -210,7 +210,7 @@ PublicFormat android_view_Surface_mapHalFormatDataspaceToPublicFormat( 
            switch (dataSpace) {

                case HAL_DATASPACE_DEPTH:

                    return PublicFormat::DEPTH_POINT_CLOUD;

                case HAL_DATASPACE_JFIF:

                case HAL_DATASPACE_V0_JFIF:

                    return PublicFormat::JPEG;

                default:

                    // Assume otherwise-marked blobs are also JPEG