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

Commit 8f6d2782 authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Add proper color management into ColorFade. 

ColorFade will take a screenshot into Surface and then use it to do animation
when the device is powering on and off. However, when EGLSurface is created, it
doesn't have proper color management attributes if the Surface is in Display
P3. For now wide color implies Display P3, and thus we hard code Display P3
here. For longer solution, we should lift this limit and make sure we manage
color properly.

BUG: b/136785946, b/131928312
Test: reproduced steps in bug no longer reproducible
Change-Id: I063244d8b850187e62c8c10c7712bf615fdcaf87
parent f7ed4da5

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

+15 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.opengl.GLES11Ext; 
import android.opengl.GLES20;

import android.os.IBinder;

import android.util.Slog;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.Surface;

import android.view.Surface.OutOfResourcesException;
@@ -72,6 +73,9 @@ final class ColorFade { 
    // See code for details.

    private static final int DEJANK_FRAMES = 3;



    private static final int EGL_GL_COLORSPACE_KHR = 0x309D;

    private static final int EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT = 0x3490;



    private final int mDisplayId;



    // Set to true when the animation context has been fully prepared.
@@ -93,6 +97,7 @@ final class ColorFade { 
    private EGLSurface mEglSurface;

    private boolean mSurfaceVisible;

    private float mSurfaceAlpha;

    private boolean mIsWideColor;



    // Texture names.  We only use one texture, which contains the screenshot.

    private final int[] mTexNames = new int[1];
@@ -482,6 +487,8 @@ final class ColorFade { 
                    return false;

                }



                mIsWideColor = SurfaceControl.getActiveColorMode(token)

                        == Display.COLOR_MODE_DISPLAY_P3;

                SurfaceControl.screenshot(token, s);

                st.updateTexImage();

                st.getTransformMatrix(mTexMatrix);
@@ -608,8 +615,16 @@ final class ColorFade { 
    private boolean createEglSurface() {

        if (mEglSurface == null) {

            int[] eglSurfaceAttribList = new int[] {

                    EGL14.EGL_NONE,

                    EGL14.EGL_NONE,

                    EGL14.EGL_NONE

            };



            // If the current display is in wide color, then so is the screenshot.

            if (mIsWideColor) {

                eglSurfaceAttribList[0] = EGL_GL_COLORSPACE_KHR;

                eglSurfaceAttribList[1] = EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT;

            }

            // turn our SurfaceControl into a Surface

            mEglSurface = EGL14.eglCreateWindowSurface(mEglDisplay, mEglConfig, mSurface,

                    eglSurfaceAttribList, 0);