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

Commit e57e0962 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup to composer apis for HDR:"

parents 5354b8a1 bc1c7438

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/IComposerClient.aidl

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ interface IComposerClient { 
  void setClientTargetSlotCount(long display, int clientTargetSlotCount);

  void setColorMode(long display, android.hardware.graphics.composer3.ColorMode mode, android.hardware.graphics.composer3.RenderIntent intent);

  void setContentType(long display, android.hardware.graphics.composer3.ContentType type);

  void setDisplayBrightness(long display, float brightness);

  void setDisplayedContentSamplingEnabled(long display, boolean enable, android.hardware.graphics.composer3.FormatColorComponent componentMask, long maxFrames);

  void setPowerMode(long display, android.hardware.graphics.composer3.PowerMode mode);

  void setReadbackBuffer(long display, in android.hardware.common.NativeHandle buffer, in @nullable ParcelFileDescriptor releaseFence);

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/LayerCommand.aidl

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ parcelable LayerCommand { 
  @nullable android.hardware.graphics.common.Rect[] visibleRegion;

  @nullable android.hardware.graphics.composer3.ZOrder z;

  @nullable float[] colorTransform;

  @nullable android.hardware.graphics.composer3.WhitePointNits whitePointNits;

  @nullable android.hardware.graphics.composer3.Luminance whitePointNits;

  @nullable android.hardware.graphics.composer3.PerFrameMetadata[] perFrameMetadata;

  @nullable android.hardware.graphics.composer3.PerFrameMetadataBlob[] perFrameMetadataBlob;

}

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/WhitePointNits.aidl→graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/Luminance.aidl

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,6 @@ 


package android.hardware.graphics.composer3;

@VintfStability

parcelable WhitePointNits {

parcelable Luminance {

  float nits;

}

graphics/composer/aidl/android/hardware/graphics/composer3/IComposerClient.aidl

+0 −19
Original line number Diff line number Diff line
@@ -615,25 +615,6 @@ interface IComposerClient { 
     */

    void setContentType(long display, ContentType type);



    /**

     * Sets the brightness of a display.

     *

     * Ideally, the brightness change should take effect in the next frame post (so that it can be

     * aligned with color transforms).

     *

     * @param display

     *      The display whose brightness is set.

     * @param brightness

     *      A number between 0.0f (minimum brightness) and 1.0f (maximum brightness), or -1.0 to

     *      turn the backlight off.

     *

     * @exception EX_BAD_DISPLAY   when the display is invalid, or

     * @exception EX_UNSUPPORTED   when brightness operations are not supported, or

     * @exception EX_BAD_PARAMETER when the brightness is invalid, or

     * @exception EX_NO_RESOURCES  when the brightness cannot be applied.

     */

    void setDisplayBrightness(long display, float brightness);



    /**

     * Enables or disables the collection of color content statistics

     * on this display.

graphics/composer/aidl/android/hardware/graphics/composer3/LayerCommand.aidl

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.hardware.graphics.common.Rect; 
import android.hardware.graphics.composer3.Buffer;

import android.hardware.graphics.composer3.Color;

import android.hardware.graphics.composer3.FloatColor;

import android.hardware.graphics.composer3.Luminance;

import android.hardware.graphics.composer3.ParcelableBlendMode;

import android.hardware.graphics.composer3.ParcelableComposition;

import android.hardware.graphics.composer3.ParcelableDataspace;
@@ -30,7 +31,6 @@ import android.hardware.graphics.composer3.ParcelableTransform; 
import android.hardware.graphics.composer3.PerFrameMetadata;

import android.hardware.graphics.composer3.PerFrameMetadataBlob;

import android.hardware.graphics.composer3.PlaneAlpha;

import android.hardware.graphics.composer3.WhitePointNits;

import android.hardware.graphics.composer3.ZOrder;



@VintfStability
@@ -243,7 +243,7 @@ parcelable LayerCommand { 
     * brightness in nits, and accordingly SDR content shall be dimmed to the desired white point

     * provided.

     */

    @nullable WhitePointNits whitePointNits;

    @nullable Luminance whitePointNits;



    /**

     * Sets the PerFrameMetadata for the display. This metadata must be used