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

Commit 980a36d0 authored by Piotr Wilczyński's avatar Piotr Wilczyński
Browse files

Convert refresh rate blocking zone thresholds from nits 

Additionally:
- change the brightness value stored in DisplayModeDirector to float scale so that the brightness thresholds don't have to be converted to the int scale
- convert ambient thresholds to float for simplicity of code
- fix incorrect Float.NaN comparison in DPC

Bug: 290906453
Test: atest DisplayDeviceConfigTest
Test: atest DisplayModeDirectorTest
Test: atest DeviceConfigParsingUtilsTest
Test: atest DisplayPowerControllerTest
Test: atest DisplayPowerController2Test
Change-Id: I6f582109ea1c4fd4110493e716fffb6a9a882bba
parent 497b75bb

core/res/res/values/config.xml

+12 −3
Original line number Diff line number Diff line
@@ -5122,13 +5122,18 @@ 
         a threshold.

         For example, no higher refresh rate if

             display brightness <= disp0 && ambient brightness <= amb0

             || display brightness <= disp1 && ambient brightness <= amb1 -->

             || display brightness <= disp1 && ambient brightness <= amb1

         Brightness thresholds are paired with lux thresholds - they both have to be met.

         A negative brightness or lux value means that only one threshold should be used - e.g. if

         the brightness value is negative, only the lux threshold is applied. -->

    <!-- Low zone brightness thresholds in the range [0, 255] -->

    <integer-array translatable="false" name="config_brightnessThresholdsOfPeakRefreshRate">

         <!--

           <item>disp0</item>

           <item>disp1</item>

        -->

    </integer-array>

    <!-- Low zone lux thresholds -->

    <integer-array translatable="false" name="config_ambientThresholdsOfPeakRefreshRate">

         <!--

           <item>amb0</item>
@@ -5149,14 +5154,18 @@ 
         may have lower display brightness requirements for the flickering is visible.

         For example, fixed refresh rate if

             display brightness >= disp0 && ambient brightness >= amb0

             || display brightness >= disp1 && ambient brightness >= amb1 -->

             || display brightness >= disp1 && ambient brightness >= amb1

         Brightness thresholds are paired with lux thresholds - they both have to be met.

         A negative brightness or lux value means that only one threshold should be used - e.g. if

         the brightness value is negative, only the lux threshold is applied. -->

    <!-- High zone brightness thresholds in the range [0, 255] -->

    <integer-array translatable="false" name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate">

         <!--

           <item>disp0</item>

           <item>disp1</item>

        -->

    </integer-array>



    <!-- High zone lux thresholds -->

    <integer-array translatable="false" name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate">

         <!--

           <item>amb0</item>

services/core/java/com/android/server/display/DisplayDeviceConfig.java

+92 −47
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.server.display;



import static com.android.server.display.utils.DeviceConfigParsingUtils.ambientBrightnessThresholdsIntToFloat;

import static com.android.server.display.utils.DeviceConfigParsingUtils.displayBrightnessThresholdsIntToFloat;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;
@@ -475,7 +478,7 @@ public class DisplayDeviceConfig { 
    private static final int DEFAULT_REFRESH_RATE_IN_HBM = 0;

    private static final int DEFAULT_LOW_REFRESH_RATE = 60;

    private static final int DEFAULT_HIGH_REFRESH_RATE = 0;

    private static final int[] DEFAULT_BRIGHTNESS_THRESHOLDS = new int[]{};

    private static final float[] DEFAULT_BRIGHTNESS_THRESHOLDS = new float[]{};



    private static final float[] DEFAULT_AMBIENT_THRESHOLD_LEVELS = new float[]{0f};

    private static final float[] DEFAULT_AMBIENT_BRIGHTENING_THRESHOLDS = new float[]{100f};
@@ -691,9 +694,14 @@ public class DisplayDeviceConfig { 
     * prevent flicker, we only support higher refresh rates if the display brightness is above a

     * threshold. For example, no higher refresh rate if display brightness <= disp0 && ambient

     * brightness <= amb0 || display brightness <= disp1 && ambient brightness <= amb1

     *

     * Brightness thresholds are paired with lux thresholds - they both have to be met.

     *

     * A negative brightness or lux value means that only one threshold should be used - e.g. if

     * the brightness value is negative, only the lux threshold is applied.

     */

    private int[] mLowDisplayBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;

    private int[] mLowAmbientBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;

    private float[] mLowDisplayBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;

    private float[] mLowAmbientBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;



    /**

     * The display uses different gamma curves for different refresh rates. It's hard for panel
@@ -705,9 +713,14 @@ public class DisplayDeviceConfig { 
     * have lower display brightness requirements for the flickering is visible. For example, fixed

     * refresh rate if display brightness >= disp0 && ambient brightness >= amb0 || display

     * brightness >= disp1 && ambient brightness >= amb1

     *

     * Brightness thresholds are paired with lux thresholds - they both have to be met.

     *

     * A negative brightness or lux value means that only one threshold should be used - e.g. if

     * the brightness value is negative, only the lux threshold is applied.

     */

    private int[] mHighDisplayBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;

    private int[] mHighAmbientBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;

    private float[] mHighDisplayBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;

    private float[] mHighAmbientBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;



    private final HashMap<String, ThermalBrightnessThrottlingData>

            mThermalBrightnessThrottlingDataMapByThrottlingId = new HashMap<>();
@@ -1493,36 +1506,44 @@ public class DisplayDeviceConfig { 
    /**

     * @return An array of lower display brightness thresholds. This, in combination with lower

     * ambient brightness thresholds help define buckets in which the refresh rate switching is not

     * allowed

     * allowed.

     *

     * A negative threshold value means that only the lux threshold is applied.

     */

    public int[] getLowDisplayBrightnessThresholds() {

    public float[] getLowDisplayBrightnessThresholds() {

        return mLowDisplayBrightnessThresholds;

    }



    /**

     * @return An array of lower ambient brightness thresholds. This, in combination with lower

     * display brightness thresholds help define buckets in which the refresh rate switching is not

     * allowed

     * allowed.

     *

     * A negative threshold value means that only the display brightness threshold is applied.

     */

    public int[] getLowAmbientBrightnessThresholds() {

    public float[] getLowAmbientBrightnessThresholds() {

        return mLowAmbientBrightnessThresholds;

    }



    /**

     * @return An array of high display brightness thresholds. This, in combination with high

     * ambient brightness thresholds help define buckets in which the refresh rate switching is not

     * allowed

     * allowed.

     *

     * A negative threshold value means that only the lux threshold is applied.

     */

    public int[] getHighDisplayBrightnessThresholds() {

    public float[] getHighDisplayBrightnessThresholds() {

        return mHighDisplayBrightnessThresholds;

    }



    /**

     * @return An array of high ambient brightness thresholds. This, in combination with high

     * display brightness thresholds help define buckets in which the refresh rate switching is not

     * allowed

     * allowed.

     *

     * A negative threshold value means that only the display brightness threshold is applied.

     */

    public int[] getHighAmbientBrightnessThresholds() {

    public float[] getHighAmbientBrightnessThresholds() {

        return mHighAmbientBrightnessThresholds;

    }
@@ -2144,34 +2165,46 @@ public class DisplayDeviceConfig { 
     */

    private void loadLowerBrightnessThresholds(BlockingZoneConfig lowerBlockingZoneConfig) {

        if (lowerBlockingZoneConfig == null) {

            mLowDisplayBrightnessThresholds = mContext.getResources().getIntArray(

            int[] lowDisplayBrightnessThresholdsInt = mContext.getResources().getIntArray(

                R.array.config_brightnessThresholdsOfPeakRefreshRate);

            mLowAmbientBrightnessThresholds = mContext.getResources().getIntArray(

            int[] lowAmbientBrightnessThresholdsInt = mContext.getResources().getIntArray(

                R.array.config_ambientThresholdsOfPeakRefreshRate);

            if (mLowDisplayBrightnessThresholds == null || mLowAmbientBrightnessThresholds == null

                    || mLowDisplayBrightnessThresholds.length

                    != mLowAmbientBrightnessThresholds.length) {

            if (lowDisplayBrightnessThresholdsInt == null

                    || lowAmbientBrightnessThresholdsInt == null

                    || lowDisplayBrightnessThresholdsInt.length

                    != lowAmbientBrightnessThresholdsInt.length) {

                throw new RuntimeException("display low brightness threshold array and ambient "

                    + "brightness threshold array have different length: "

                    + "mLowDisplayBrightnessThresholds="

                    + Arrays.toString(mLowDisplayBrightnessThresholds)

                    + ", mLowAmbientBrightnessThresholds="

                    + Arrays.toString(mLowAmbientBrightnessThresholds));

                    + "lowDisplayBrightnessThresholdsInt="

                    + Arrays.toString(lowDisplayBrightnessThresholdsInt)

                    + ", lowAmbientBrightnessThresholdsInt="

                    + Arrays.toString(lowAmbientBrightnessThresholdsInt));

            }



            mLowDisplayBrightnessThresholds =

                    displayBrightnessThresholdsIntToFloat(lowDisplayBrightnessThresholdsInt);

            mLowAmbientBrightnessThresholds =

                    ambientBrightnessThresholdsIntToFloat(lowAmbientBrightnessThresholdsInt);

        } else {

            List<DisplayBrightnessPoint> lowerThresholdDisplayBrightnessPoints =

                    lowerBlockingZoneConfig.getBlockingZoneThreshold().getDisplayBrightnessPoint();

            int size = lowerThresholdDisplayBrightnessPoints.size();

            mLowDisplayBrightnessThresholds = new int[size];

            mLowAmbientBrightnessThresholds = new int[size];

            mLowDisplayBrightnessThresholds = new float[size];

            mLowAmbientBrightnessThresholds = new float[size];

            for (int i = 0; i < size; i++) {

                // We are explicitly casting this value to an integer to be able to reuse the

                // existing DisplayBrightnessPoint type. It is fine to do this because the round off

                // will have the negligible and unnoticeable impact on the loaded thresholds.

                mLowDisplayBrightnessThresholds[i] = (int) lowerThresholdDisplayBrightnessPoints

                float thresholdNits = lowerThresholdDisplayBrightnessPoints

                        .get(i).getNits().floatValue();

                if (thresholdNits < 0) {

                    // A negative value means that there's no threshold

                    mLowDisplayBrightnessThresholds[i] = thresholdNits;

                } else {

                    float thresholdBacklight = mNitsToBacklightSpline.interpolate(thresholdNits);

                    mLowDisplayBrightnessThresholds[i] =

                            mBacklightToBrightnessSpline.interpolate(thresholdBacklight);

                }



                mLowAmbientBrightnessThresholds[i] = lowerThresholdDisplayBrightnessPoints

                    .get(i).getLux().intValue();

                    .get(i).getLux().floatValue();

            }

        }

    }
@@ -2183,34 +2216,46 @@ public class DisplayDeviceConfig { 
     */

    private void loadHigherBrightnessThresholds(BlockingZoneConfig blockingZoneConfig) {

        if (blockingZoneConfig == null) {

            mHighDisplayBrightnessThresholds = mContext.getResources().getIntArray(

            int[] highDisplayBrightnessThresholdsInt = mContext.getResources().getIntArray(

                R.array.config_highDisplayBrightnessThresholdsOfFixedRefreshRate);

            mHighAmbientBrightnessThresholds = mContext.getResources().getIntArray(

            int[] highAmbientBrightnessThresholdsInt = mContext.getResources().getIntArray(

                R.array.config_highAmbientBrightnessThresholdsOfFixedRefreshRate);

            if (mHighAmbientBrightnessThresholds == null || mHighDisplayBrightnessThresholds == null

                    || mHighAmbientBrightnessThresholds.length

                    != mHighDisplayBrightnessThresholds.length) {

            if (highDisplayBrightnessThresholdsInt == null

                    || highAmbientBrightnessThresholdsInt == null

                    || highDisplayBrightnessThresholdsInt.length

                    != highAmbientBrightnessThresholdsInt.length) {

                throw new RuntimeException("display high brightness threshold array and ambient "

                    + "brightness threshold array have different length: "

                    + "mHighDisplayBrightnessThresholds="

                    + Arrays.toString(mHighDisplayBrightnessThresholds)

                    + ", mHighAmbientBrightnessThresholds="

                    + Arrays.toString(mHighAmbientBrightnessThresholds));

                    + "highDisplayBrightnessThresholdsInt="

                    + Arrays.toString(highDisplayBrightnessThresholdsInt)

                    + ", highAmbientBrightnessThresholdsInt="

                    + Arrays.toString(highAmbientBrightnessThresholdsInt));

            }



            mHighDisplayBrightnessThresholds =

                    displayBrightnessThresholdsIntToFloat(highDisplayBrightnessThresholdsInt);

            mHighAmbientBrightnessThresholds =

                    ambientBrightnessThresholdsIntToFloat(highAmbientBrightnessThresholdsInt);

        } else {

            List<DisplayBrightnessPoint> higherThresholdDisplayBrightnessPoints =

                    blockingZoneConfig.getBlockingZoneThreshold().getDisplayBrightnessPoint();

            int size = higherThresholdDisplayBrightnessPoints.size();

            mHighDisplayBrightnessThresholds = new int[size];

            mHighAmbientBrightnessThresholds = new int[size];

            mHighDisplayBrightnessThresholds = new float[size];

            mHighAmbientBrightnessThresholds = new float[size];

            for (int i = 0; i < size; i++) {

                // We are explicitly casting this value to an integer to be able to reuse the

                // existing DisplayBrightnessPoint type. It is fine to do this because the round off

                // will have the negligible and unnoticeable impact on the loaded thresholds.

                mHighDisplayBrightnessThresholds[i] = (int) higherThresholdDisplayBrightnessPoints

                float thresholdNits = higherThresholdDisplayBrightnessPoints

                        .get(i).getNits().floatValue();

                if (thresholdNits < 0) {

                    // A negative value means that there's no threshold

                    mHighDisplayBrightnessThresholds[i] = thresholdNits;

                } else {

                    float thresholdBacklight = mNitsToBacklightSpline.interpolate(thresholdNits);

                    mHighDisplayBrightnessThresholds[i] =

                            mBacklightToBrightnessSpline.interpolate(thresholdBacklight);

                }



                mHighAmbientBrightnessThresholds[i] = higherThresholdDisplayBrightnessPoints

                    .get(i).getLux().intValue();

                    .get(i).getLux().floatValue();

            }

        }

    }

services/core/java/com/android/server/display/DisplayPowerController.java

+1 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            float userBrightness = BrightnessMappingStrategy.NO_USER_BRIGHTNESS;

            if (userNits >= 0) {

                userBrightness = mInteractiveModeBrightnessMapper.convertToFloatScale(userNits);

                if (userBrightness == PowerManager.BRIGHTNESS_INVALID_FLOAT) {

                if (Float.isNaN(userBrightness)) {

                    userBrightness = BrightnessMappingStrategy.NO_USER_BRIGHTNESS;

                }

            }

services/core/java/com/android/server/display/DisplayPowerController2.java

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
            float userBrightness = BrightnessMappingStrategy.NO_USER_BRIGHTNESS;

            if (userNits >= 0) {

                userBrightness = mInteractiveModeBrightnessMapper.convertToFloatScale(userNits);

                if (userBrightness == PowerManager.BRIGHTNESS_INVALID_FLOAT) {

                if (Float.isNaN(userBrightness)) {

                    userBrightness = BrightnessMappingStrategy.NO_USER_BRIGHTNESS;

                }

            }

services/core/java/com/android/server/display/feature/DeviceConfigParameterProvider.java

+56 −22
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.provider.DeviceConfig; 
import android.provider.DeviceConfigInterface;

import android.util.Slog;



import com.android.server.display.utils.DeviceConfigParsingUtils;



import java.util.concurrent.Executor;



/**
@@ -102,32 +104,64 @@ public class DeviceConfigParameterProvider { 
                DisplayManager.DeviceConfig.KEY_REFRESH_RATE_IN_LOW_ZONE, -1);

    }



    /** Return null if no such property or wrong format (not comma separated integers). */

    /**

     * Get the high ambient brightness thresholds for the configured refresh rate zone. The values

     * are paired with brightness thresholds.

     *

     * A negative value means that only the display brightness threshold should be used.

     *

     * Return null if no such property or wrong format (not comma separated integers).

     */

    @Nullable

    public int[] getHighAmbientBrightnessThresholds() {

        return getIntArrayProperty(DisplayManager.DeviceConfig

                .KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS);

    public float[] getHighAmbientBrightnessThresholds() {

        return DeviceConfigParsingUtils.ambientBrightnessThresholdsIntToFloat(

                getIntArrayProperty(DisplayManager.DeviceConfig

                        .KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS));

    }



    /** Return null if no such property or wrong format (not comma separated integers). */

    /**

     * Get the high display brightness thresholds for the configured refresh rate zone. The values

     * are paired with lux thresholds.

     *

     * A negative value means that only the ambient threshold should be used.

     *

     * Return null if no such property or wrong format (not comma separated integers).

     */

    @Nullable

    public int[] getHighDisplayBrightnessThresholds() {

        return getIntArrayProperty(DisplayManager.DeviceConfig

                .KEY_FIXED_REFRESH_RATE_HIGH_DISPLAY_BRIGHTNESS_THRESHOLDS);

    public float[] getHighDisplayBrightnessThresholds() {

        return DeviceConfigParsingUtils.displayBrightnessThresholdsIntToFloat(

                getIntArrayProperty(DisplayManager.DeviceConfig

                        .KEY_FIXED_REFRESH_RATE_HIGH_DISPLAY_BRIGHTNESS_THRESHOLDS));

    }



    /** Return null if no such property or wrong format (not comma separated integers). */

    /**

     * Get the low display brightness thresholds for the configured refresh rate zone. The values

     * are paired with lux thresholds.

     *

     * A negative value means that only the ambient threshold should be used.

     *

     * Return null if no such property or wrong format (not comma separated integers).

     */

    @Nullable

    public int[] getLowDisplayBrightnessThresholds() {

        return getIntArrayProperty(DisplayManager.DeviceConfig

                .KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS);

    public float[] getLowDisplayBrightnessThresholds() {

        return DeviceConfigParsingUtils.displayBrightnessThresholdsIntToFloat(

                getIntArrayProperty(DisplayManager.DeviceConfig

                        .KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS));

    }



    /** Return null if no such property or wrong format (not comma separated integers). */

    /**

     * Get the low ambient brightness thresholds for the configured refresh rate zone. The values

     * are paired with brightness thresholds.

     *

     * A negative value means that only the display brightness threshold should be used.

     *

     * Return null if no such property or wrong format (not comma separated integers).

     */

    @Nullable

    public int[] getLowAmbientBrightnessThresholds() {

        return getIntArrayProperty(DisplayManager.DeviceConfig

                .KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_THRESHOLDS);

    public float[] getLowAmbientBrightnessThresholds() {

        return DeviceConfigParsingUtils.ambientBrightnessThresholdsIntToFloat(

                getIntArrayProperty(DisplayManager.DeviceConfig

                        .KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_THRESHOLDS));

    }



    /** add property change listener to DeviceConfig */