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

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

Merge "[LUT HAL] Interface update" into main

parents 3dbaf975 0174eb73

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

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ parcelable DisplayLuts { 
  android.hardware.graphics.composer3.DisplayLuts.LayerLut[] layerLuts;

  parcelable LayerLut {

    long layer;

    android.hardware.graphics.composer3.Lut lut;

    android.hardware.graphics.composer3.Luts luts;

  }

}

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
@@ -57,5 +57,5 @@ parcelable LayerCommand { 
  @nullable int[] bufferSlotsToClear;

  android.hardware.graphics.composer3.LayerLifecycleBatchCommandType layerLifecycleBatchCommandType;

  int newBufferSlotCount;

  @nullable android.hardware.graphics.composer3.Lut[] luts;

  @nullable android.hardware.graphics.composer3.Luts luts;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ package android.hardware.graphics.composer3; 
@VintfStability

parcelable LutProperties {

  android.hardware.graphics.composer3.LutProperties.Dimension dimension;

  long size;

  int size;

  android.hardware.graphics.composer3.LutProperties.SamplingKey[] samplingKeys;

  @VintfStability

  enum Dimension {

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/Lut.aidl→graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/Luts.aidl

+3 −2
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 


package android.hardware.graphics.composer3;

@VintfStability

parcelable Lut {

parcelable Luts {

  @nullable ParcelFileDescriptor pfd;

  android.hardware.graphics.composer3.LutProperties lutProperties;

  @nullable int[] offsets;

  android.hardware.graphics.composer3.LutProperties[] lutProperties;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.hardware.graphics.composer3;



import android.hardware.graphics.composer3.Lut;

import android.hardware.graphics.composer3.Luts;



/**

 * LUT (Look-Up Table) Interface for Color Transformation.
@@ -37,9 +37,9 @@ parcelable DisplayLuts { 
         */

        long layer;

        /**

         * A Lut specified by the HWC for given HDR layers that don't have Luts provided.

         * Lut(s) specified by the HWC for given HDR layers that don't have Luts provided.

         */

        Lut lut;

        Luts luts;

    }



    LayerLut[] layerLuts;