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

Commit 97a46df0 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge changes I0f07043f,Ib4635ee4,I472ad9f0 into nyc-dev 

* changes:
  Plumb HDR capabilities up to SurfaceComposerClient
  HWC2: Add getHdrCapabilities to C++ shim
  HWC2: Add getHdrCapabilities stub to adapter
parents 45d15b83 c4f471e7

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,

include/ui/HdrCapabilities.h

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_UI_HDR_CAPABILTIES_H

#define ANDROID_UI_HDR_CAPABILTIES_H



#include <binder/Parcelable.h>



namespace android {



class HdrCapabilities : public Parcelable

{

public:

    HdrCapabilities(const std::vector<int32_t /*android_hdr_t*/>& types,

            float maxLuminance, float maxAverageLuminance, float minLuminance)

      : mSupportedHdrTypes(types),

        mMaxLuminance(maxLuminance),

        mMaxAverageLuminance(maxAverageLuminance),

        mMinLuminance(minLuminance) {}



    // Make this move-constructable and move-assignable

    HdrCapabilities(HdrCapabilities&& other) = default;

    HdrCapabilities& operator=(HdrCapabilities&& other) = default;



    HdrCapabilities()

      : mSupportedHdrTypes(),

        mMaxLuminance(-1.0f),

        mMaxAverageLuminance(-1.0f),

        mMinLuminance(-1.0f) {}



    virtual ~HdrCapabilities() = default;



    const std::vector<int32_t /*android_hdr_t*/>& getSupportedHdrTypes() const {

        return mSupportedHdrTypes;

    }

    float getDesiredMaxLuminance() const { return mMaxLuminance; }

    float getDesiredMaxAverageLuminance() const { return mMaxAverageLuminance; }

    float getDesiredMinLuminance() const { return mMinLuminance; }



    // Parcelable interface

    virtual status_t writeToParcel(Parcel* parcel) const override;

    virtual status_t readFromParcel(const Parcel* parcel) override;



private:

    std::vector<int32_t /*android_hdr_t*/> mSupportedHdrTypes;

    float mMaxLuminance;

    float mMaxAverageLuminance;

    float mMinLuminance;

};



} // namespace android



#endif

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(