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

Commit 1ae58617 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "[Graphics AIDL interface] add supportMixedColorSpaces boolean variable."

parents 33e63a4b 7aaacf60
Loading
Loading
Loading
Loading
+6 −1
Original line number Original line Diff line number Diff line
@@ -34,5 +34,10 @@
package android.hardware.graphics.composer3;
package android.hardware.graphics.composer3;
@VintfStability
@VintfStability
parcelable OverlayProperties {
parcelable OverlayProperties {
  android.hardware.graphics.composer3.SupportedBufferCombinations[] combinations;
  android.hardware.graphics.composer3.OverlayProperties.SupportedBufferCombinations[] combinations;
  boolean supportMixedColorSpaces;
  parcelable SupportedBufferCombinations {
    android.hardware.graphics.common.PixelFormat[] pixelFormats;
    android.hardware.graphics.common.Dataspace[] dataspaces;
  }
}
}
+0 −39
Original line number Original line Diff line number Diff line
/**
 * Copyright (C) 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.graphics.composer3;
@VintfStability
parcelable SupportedBufferCombinations {
  android.hardware.graphics.common.PixelFormat[] pixelFormats;
  android.hardware.graphics.common.Dataspace[] dataspaces;
}
+10 −2
Original line number Original line Diff line number Diff line
@@ -16,14 +16,22 @@


package android.hardware.graphics.composer3;
package android.hardware.graphics.composer3;


import android.hardware.graphics.composer3.SupportedBufferCombinations;

@VintfStability
@VintfStability
parcelable OverlayProperties {
parcelable OverlayProperties {
    parcelable SupportedBufferCombinations {
        // List of pixelformats and dataspaces that can be used together.
        // All pixelformats and dataspaces stored inside are valid combinations.
        android.hardware.graphics.common.PixelFormat[] pixelFormats;
        android.hardware.graphics.common.Dataspace[] dataspaces;
    }
    // Array of all valid pixelformat and dataspace combinations.
    // Array of all valid pixelformat and dataspace combinations.
    // If all supported formats work with all supported dataspaces,
    // If all supported formats work with all supported dataspaces,
    // then this list may only have 1 entry.
    // then this list may only have 1 entry.
    // If some dataspaces, e.g. scRGB, only work with specific formats,
    // If some dataspaces, e.g. scRGB, only work with specific formats,
    // then this list may contain more than 1 entry.
    // then this list may contain more than 1 entry.
    SupportedBufferCombinations[] combinations;
    SupportedBufferCombinations[] combinations;

    // True if the DPU is able to color manage at least two overlays
    // with different input colorspaces, false otherwise.
    boolean supportMixedColorSpaces;
}
}
+0 −25
Original line number Original line Diff line number Diff line
/**
 * Copyright (C) 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.hardware.graphics.composer3;

@VintfStability
parcelable SupportedBufferCombinations {
    // List of pixelformats and dataspaces that can be used together.
    // All pixelformats and dataspaces stored inside are valid combinations.
    android.hardware.graphics.common.PixelFormat[] pixelFormats;
    android.hardware.graphics.common.Dataspace[] dataspaces;
}