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

Commit baaa2bf3 authored by Scott Wiest's avatar Scott Wiest Committed by Automerger Merge Worker
Browse files

Merge "Adding boolean to determine whether a surface is MultiResolution" into... 

Merge "Adding boolean to determine whether a surface is MultiResolution" into tm-qpr-dev am: 70c12a09 am: 90ae364c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22102275



Change-Id: I421323976ea328ffe80896419873b4e7bc15004e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79845e19 90ae364c

core/java/android/hardware/camera2/extension/CameraOutputConfig.aidl

+1 −0
Original line number Diff line number Diff line
@@ -36,4 +36,5 @@ parcelable CameraOutputConfig 
    int surfaceGroupId;

    String physicalCameraId;

    List<CameraOutputConfig> sharedSurfaceConfigs;

    boolean isMultiResolutionOutput;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
            OutputConfiguration cameraOutput = new OutputConfiguration(output.surfaceGroupId,

                    outputSurface);



            if (output.isMultiResolutionOutput) {

                cameraOutput.setMultiResolutionOutput();

            }

            if ((output.sharedSurfaceConfigs != null) && !output.sharedSurfaceConfigs.isEmpty()) {

                cameraOutput.enableSurfaceSharing();

                for (CameraOutputConfig sharedOutputConfig : output.sharedSurfaceConfigs) {

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

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ public final class OutputConfiguration implements Parcelable { 
     *         call, or no non-negative group ID has been set.

     * @hide

     */

    void setMultiResolutionOutput() {

    public void setMultiResolutionOutput() {

        if (mIsShared) {

            throw new IllegalStateException("Multi-resolution output flag must not be set for " +

                    "configuration with surface sharing");

packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java

+2 −0
Original line number Diff line number Diff line
@@ -2076,6 +2076,7 @@ public class CameraExtensionsProxyService extends Service { 
        ret.outputId.id = output.getId();

        ret.physicalCameraId = output.getPhysicalCameraId();

        ret.surfaceGroupId = output.getSurfaceGroupId();

        ret.isMultiResolutionOutput = false;

        if (output instanceof SurfaceOutputConfigImpl) {

            SurfaceOutputConfigImpl surfaceConfig = (SurfaceOutputConfigImpl) output;

            ret.type = CameraOutputConfig.TYPE_SURFACE;
@@ -2095,6 +2096,7 @@ public class CameraExtensionsProxyService extends Service { 
            ret.type = CameraOutputConfig.TYPE_MULTIRES_IMAGEREADER;

            ret.imageFormat = multiResReaderConfig.getImageFormat();

            ret.capacity = multiResReaderConfig.getMaxImages();

            ret.isMultiResolutionOutput = true;

        } else {

            throw new IllegalStateException("Unknown output config type!");

        }