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

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

Merge "Provide dimming ratio instead of white point nits in composer"

parents 1b22c1ff b1f16725

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

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


package android.hardware.graphics.composer3;

@VintfStability

parcelable Luminance {

  float nits;

parcelable LayerBrightness {

  float brightness;

}

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
@@ -50,7 +50,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.Luminance whitePointNits;

  @nullable android.hardware.graphics.composer3.LayerBrightness brightness;

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

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

  @nullable android.hardware.graphics.common.Rect[] blockingRegion;

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

+1 −9
Original line number Diff line number Diff line
@@ -77,15 +77,7 @@ parcelable DisplayCommand { 
     * the display brightness, for example when internally switching the display between multiple

     * power modes to achieve higher luminance. In those cases, the underlying display panel's real

     * brightness may not be applied atomically; however, layer dimming when mixing HDR and SDR

     * content must be synchronized.

     *

     * As an illustrative example: suppose two layers have white

     * points of 200 nits and 1000 nits respectively, the old display luminance is 200 nits, and the

     * new display luminance is 1000 nits. If the new display luminance takes two frames to apply,

     * then: In the first frame, there must not be any relative dimming of layers (treat both layers

     * as 200 nits as the maximum luminance of the display is 200 nits). In the second frame, there

     * dimming should be applied to ensure that the first layer does not become perceptually

     * brighter during the transition.

     * content must be synchronized to ensure that there is no user-perceptable flicker.

     *

     * The display luminance must be updated by this command even if there is not pending validate

     * or present command.

graphics/composer/aidl/android/hardware/graphics/composer3/Luminance.aidl→graphics/composer/aidl/android/hardware/graphics/composer3/LayerBrightness.aidl

+4 −4
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
package android.hardware.graphics.composer3;



@VintfStability

parcelable Luminance {

parcelable LayerBrightness {

    /**

     * Photometric measure of luminous intensity per unit area of light.

     * Units are nits, or cd/m^2.

     * Brightness of the current layer, ranging from 0 to 1, where 0 is the minimum brightness of

     * the display, and 1 is the current brightness of the display.

     */

    float nits;

    float brightness;

}

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

+6 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.hardware.graphics.common.Point; 
import android.hardware.graphics.common.Rect;

import android.hardware.graphics.composer3.Buffer;

import android.hardware.graphics.composer3.Color;

import android.hardware.graphics.composer3.Luminance;

import android.hardware.graphics.composer3.LayerBrightness;

import android.hardware.graphics.composer3.ParcelableBlendMode;

import android.hardware.graphics.composer3.ParcelableComposition;

import android.hardware.graphics.composer3.ParcelableDataspace;
@@ -221,12 +221,12 @@ parcelable LayerCommand { 
    @nullable float[] colorTransform;



    /**

     * Sets the desired white point for the layer. This is intended to be used when presenting

     * an SDR layer alongside HDR content. The HDR content will be presented at the display

     * brightness in nits, and accordingly SDR content shall be dimmed to the desired white point

     * provided.

     * Sets the desired brightness for the layer. This is intended to be used for instance when

     * presenting an SDR layer alongside HDR content. The HDR content will be presented at the

     * display brightness in nits, and accordingly SDR content shall be dimmed according to the

     * provided brightness ratio.

     */

    @nullable Luminance whitePointNits;

    @nullable LayerBrightness brightness;



    /**

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