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

Commit 59f36d3e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove flag com.android.internal.camera.flags.depth_jpeg_extensions" into main

parents 5a069a06 6858bc9f

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+3 −3
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ public final class CameraExtensionCharacteristics { 
                    return getSupportedSizes(

                            extenders.second.getSupportedPostviewResolutions(sz), format);

                }  else if (format == ImageFormat.JPEG_R || format == ImageFormat.YCBCR_P010 ||

                        (Flags.depthJpegExtensions() && (format == ImageFormat.DEPTH_JPEG))) {

                        format == ImageFormat.DEPTH_JPEG) {

                    // DepthJpeg/Jpeg_R/UltraHDR + YCBCR_P010 is currently not supported in the

                    // basic extension case

                    return new ArrayList<>();
@@ -1271,7 +1271,7 @@ public final class CameraExtensionCharacteristics { 
                            return generateSupportedSizes(null, format, streamMap);

                        }

                    } else if (format == ImageFormat.JPEG_R || format == ImageFormat.YCBCR_P010 ||

                            (Flags.depthJpegExtensions() && (format == ImageFormat.DEPTH_JPEG))) {

                            format == ImageFormat.DEPTH_JPEG) {

                        // DepthJpeg/Jpeg_R/UltraHDR + YCBCR_P010 is currently not supported in the

                        // basic extension case

                        return new ArrayList<>();
@@ -1363,7 +1363,7 @@ public final class CameraExtensionCharacteristics { 
                    return  null;

                }

                if (format == ImageFormat.JPEG_R || format == ImageFormat.YCBCR_P010 ||

                        (Flags.depthJpegExtensions() && (format == ImageFormat.DEPTH_JPEG))) {

                        format == ImageFormat.DEPTH_JPEG) {

                    // DepthJpeg/JpegR/UltraHDR + YCBCR_P010 is not supported for basic extensions

                    return null;

                }

core/java/android/hardware/camera2/impl/CameraExtensionUtils.java

+5 −10
Original line number Diff line number Diff line
@@ -56,10 +56,7 @@ public final class CameraExtensionUtils { 
    static {

        SUPPORTED_CAPTURE_OUTPUT_FORMATS.addAll(Arrays.asList(

                CameraExtensionCharacteristics.PROCESSING_INPUT_FORMAT, ImageFormat.JPEG,

                ImageFormat.YCBCR_P010, ImageFormat.JPEG_R ));

        if (Flags.depthJpegExtensions()) {

            SUPPORTED_CAPTURE_OUTPUT_FORMATS.add(ImageFormat.DEPTH_JPEG);

        }

                ImageFormat.YCBCR_P010, ImageFormat.JPEG_R, ImageFormat.DEPTH_JPEG));

    }



    public static class SurfaceInfo {
@@ -109,13 +106,11 @@ public final class CameraExtensionUtils { 
            surfaceInfo.mFormat = ImageFormat.JPEG_R;

            return surfaceInfo;

        }

        if (Flags.depthJpegExtensions()) {

        if ((nativeFormat == StreamConfigurationMap.HAL_PIXEL_FORMAT_BLOB)

                && (dataspace == StreamConfigurationMap.HAL_DATASPACE_DYNAMIC_DEPTH)) {

            surfaceInfo.mFormat = ImageFormat.DEPTH_JPEG;

            return surfaceInfo;

        }

        }



        return surfaceInfo;

    }