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

Commit c4f471e7 authored by Dan Stoza's avatar Dan Stoza
Browse files

Plumb HDR capabilities up to SurfaceComposerClient 

Plumbs HDR capabilities up from HWC2 through SurfaceFlinger and
ISurfaceComposer to SurfaceComposerClient.

Bug: 25684127
Change-Id: I0f07043ff42bfc7a159f785fee3e84936dc3c280
parent 7d7ae734

include/gui/ISurfaceComposer.h

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ class ComposerState; 
class DisplayState;

struct DisplayInfo;

struct DisplayStatInfo;

class HdrCapabilities;

class IDisplayEventConnection;

class IMemoryHeap;

class Rect;
@@ -157,6 +158,13 @@ public: 
     * Requires the ACCESS_SURFACE_FLINGER permission.

     */

    virtual status_t getAnimationFrameStats(FrameStats* outStats) const = 0;



    /* Gets the supported HDR capabilities of the given display.

     *

     * Requires the ACCESS_SURFACE_FLINGER permission.

     */

    virtual status_t getHdrCapabilities(const sp<IBinder>& display,

            HdrCapabilities* outCapabilities) const = 0;

};



// ----------------------------------------------------------------------------
@@ -184,6 +192,7 @@ public: 
        GET_ANIMATION_FRAME_STATS,

        SET_POWER_MODE,

        GET_DISPLAY_STATS,

        GET_HDR_CAPABILITIES,

    };



    virtual status_t onTransact(uint32_t code, const Parcel& data,

include/gui/SurfaceComposerClient.h

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ namespace android { 


class DisplayInfo;

class Composer;

class HdrCapabilities;

class ISurfaceComposerClient;

class IGraphicBufferProducer;

class Region;
@@ -145,6 +146,9 @@ public: 
    static status_t clearAnimationFrameStats();

    static status_t getAnimationFrameStats(FrameStats* outStats);



    static status_t getHdrCapabilities(const sp<IBinder>& display,

            HdrCapabilities* outCapabilities);



    static void setDisplaySurface(const sp<IBinder>& token,

            const sp<IGraphicBufferProducer>& bufferProducer);

    static void setDisplayLayerStack(const sp<IBinder>& token,

libs/gui/ISurfaceComposer.cpp

+40 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include <ui/DisplayInfo.h>

#include <ui/DisplayStatInfo.h>

#include <ui/HdrCapabilities.h>



#include <utils/Log.h>
@@ -282,6 +283,28 @@ public: 
        reply.read(*outStats);

        return reply.readInt32();

    }



    virtual status_t getHdrCapabilities(const sp<IBinder>& display,

            HdrCapabilities* outCapabilities) const {

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        status_t result = data.writeStrongBinder(display);

        if (result != NO_ERROR) {

            ALOGE("getHdrCapabilities failed to writeStrongBinder: %d", result);

            return result;

        }

        result = remote()->transact(BnSurfaceComposer::GET_HDR_CAPABILITIES,

                data, &reply);

        if (result != NO_ERROR) {

            ALOGE("getHdrCapabilities failed to transact: %d", result);

            return result;

        }

        result = reply.readInt32();

        if (result == NO_ERROR) {

            result = reply.readParcelable(outCapabilities);

        }

        return result;

    }

};



// Out-of-line virtual method definition to trigger vtable emission in this
@@ -467,6 +490,23 @@ status_t BnSurfaceComposer::onTransact( 
            setPowerMode(display, mode);

            return NO_ERROR;

        }

        case GET_HDR_CAPABILITIES: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            sp<IBinder> display = nullptr;

            status_t result = data.readStrongBinder(&display);

            if (result != NO_ERROR) {

                ALOGE("getHdrCapabilities failed to readStrongBinder: %d",

                        result);

                return result;

            }

            HdrCapabilities capabilities;

            result = getHdrCapabilities(display, &capabilities);

            reply->writeInt32(result);

            if (result == NO_ERROR) {

                reply->writeParcelable(capabilities);

            }

            return NO_ERROR;

        }

        default: {

            return BBinder::onTransact(code, data, reply, flags);

        }

libs/gui/SurfaceComposerClient.cpp

+6 −0
Original line number Diff line number Diff line
@@ -722,6 +722,12 @@ status_t SurfaceComposerClient::getAnimationFrameStats(FrameStats* outStats) { 
    return ComposerService::getComposerService()->getAnimationFrameStats(outStats);

}



status_t SurfaceComposerClient::getHdrCapabilities(const sp<IBinder>& display,

        HdrCapabilities* outCapabilities) {

    return ComposerService::getComposerService()->getHdrCapabilities(display,

            outCapabilities);

}



// ----------------------------------------------------------------------------



status_t ScreenshotClient::capture(

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+20 −0
Original line number Diff line number Diff line
@@ -736,6 +736,26 @@ void HWComposer::clearReleaseFences(int32_t displayId) { 
    mDisplayData[displayId].releaseFences.clear();

}



std::unique_ptr<HdrCapabilities> HWComposer::getHdrCapabilities(

        int32_t displayId) {

    if (!isValidDisplay(displayId)) {

        ALOGE("getHdrCapabilities: Display %d is not valid", displayId);

        return nullptr;

    }



    auto& hwcDisplay = mDisplayData[displayId].hwcDisplay;

    std::unique_ptr<HdrCapabilities> capabilities;

    auto error = hwcDisplay->getHdrCapabilities(&capabilities);

    if (error != HWC2::Error::None) {

        ALOGE("getOutputCapabilities: Failed to get capabilities on display %d:"

                " %s (%d)", displayId, to_string(error).c_str(),

                static_cast<int32_t>(error));

        return nullptr;

    }



    return capabilities;

}



// Converts a PixelFormat to a human-readable string.  Max 11 chars.

// (Could use a table of prefab String8 objects.)

/*