diff options
| author | 2018-11-02 00:26:19 +0000 | |
|---|---|---|
| committer | 2018-11-02 00:26:19 +0000 | |
| commit | 7434f865cb716b87d8f4c6642a06ff5f328167ad (patch) | |
| tree | bf7a1a1149bb30bfdb53f86572096b39a4ba6b6b /libs/gui/ISurfaceComposer.cpp | |
| parent | 1544922b65a9cc36ad09754bdc0c1f09c613e4b4 (diff) | |
| parent | c678097979379cdf59a91697a1fcfa020cda70b6 (diff) | |
Merge "[SurfaceFlinger] Expose WCG composition preference through ISurfaceComposer API."
Diffstat (limited to 'libs/gui/ISurfaceComposer.cpp')
| -rw-r--r-- | libs/gui/ISurfaceComposer.cpp | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/libs/gui/ISurfaceComposer.cpp b/libs/gui/ISurfaceComposer.cpp index cc0a307c65..e66c0e5dd6 100644 --- a/libs/gui/ISurfaceComposer.cpp +++ b/libs/gui/ISurfaceComposer.cpp @@ -565,8 +565,10 @@ public: return reply.readParcelableVector(outLayers); } - virtual status_t getCompositionPreference(ui::Dataspace* dataSpace, - ui::PixelFormat* pixelFormat) const { + virtual status_t getCompositionPreference(ui::Dataspace* defaultDataspace, + ui::PixelFormat* defaultPixelFormat, + ui::Dataspace* wideColorGamutDataspace, + ui::PixelFormat* wideColorGamutPixelFormat) const { Parcel data, reply; status_t error = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor()); if (error != NO_ERROR) { @@ -578,8 +580,10 @@ public: } error = static_cast<status_t>(reply.readInt32()); if (error == NO_ERROR) { - *dataSpace = static_cast<ui::Dataspace>(reply.readInt32()); - *pixelFormat = static_cast<ui::PixelFormat>(reply.readInt32()); + *defaultDataspace = static_cast<ui::Dataspace>(reply.readInt32()); + *defaultPixelFormat = static_cast<ui::PixelFormat>(reply.readInt32()); + *wideColorGamutDataspace = static_cast<ui::Dataspace>(reply.readInt32()); + *wideColorGamutPixelFormat = static_cast<ui::PixelFormat>(reply.readInt32()); } return error; } @@ -925,13 +929,19 @@ status_t BnSurfaceComposer::onTransact( } case GET_COMPOSITION_PREFERENCE: { CHECK_INTERFACE(ISurfaceComposer, data, reply); - ui::Dataspace dataSpace; - ui::PixelFormat pixelFormat; - status_t error = getCompositionPreference(&dataSpace, &pixelFormat); + ui::Dataspace defaultDataspace; + ui::PixelFormat defaultPixelFormat; + ui::Dataspace wideColorGamutDataspace; + ui::PixelFormat wideColorGamutPixelFormat; + status_t error = + getCompositionPreference(&defaultDataspace, &defaultPixelFormat, + &wideColorGamutDataspace, &wideColorGamutPixelFormat); reply->writeInt32(error); if (error == NO_ERROR) { - reply->writeInt32(static_cast<int32_t>(dataSpace)); - reply->writeInt32(static_cast<int32_t>(pixelFormat)); + reply->writeInt32(static_cast<int32_t>(defaultDataspace)); + reply->writeInt32(static_cast<int32_t>(defaultPixelFormat)); + reply->writeInt32(static_cast<int32_t>(wideColorGamutDataspace)); + reply->writeInt32(static_cast<int32_t>(wideColorGamutDataspace)); } return NO_ERROR; } |