diff options
80 files changed, 1001 insertions, 232 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 1b2dc706d7..19bf216a57 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -1616,8 +1616,8 @@ void Dumpstate::DumpstateBoard() { }); auto result = dumpstate_task.get_future(); std::thread(std::move(dumpstate_task)).detach(); - if (result.wait_for(10s) != std::future_status::ready) { - MYLOGE("dumpstateBoard timed out after 10s\n"); + if (result.wait_for(30s) != std::future_status::ready) { + MYLOGE("dumpstateBoard timed out after 30s\n"); return; } std::unique_ptr<ssize_t[]> file_sizes = result.get(); diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index e1e73c7a61..27776629de 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -1264,8 +1264,8 @@ class Dex2oatFileWrapper { }; // (re)Creates the app image if needed. -Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path, bool profile_guided, - bool is_public, int uid, bool is_secondary_dex) { +Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path, + bool generate_app_image, bool is_public, int uid, bool is_secondary_dex) { // We don't create an image for secondary dex files. if (is_secondary_dex) { @@ -1278,11 +1278,11 @@ Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path, bool profile_g return Dex2oatFileWrapper(); } - // Use app images only if it is enabled (by a set image format) and we are compiling - // profile-guided (so the app image doesn't conservatively contain all classes). - if (!profile_guided) { - // In case there is a stale image, remove it now. Ignore any error. - unlink(image_path.c_str()); + // In case there is a stale image, remove it now. Ignore any error. + unlink(image_path.c_str()); + + // Not enabled, exit. + if (!generate_app_image) { return Dex2oatFileWrapper(); } char app_image_format[kPropertyValueMax]; @@ -1959,6 +1959,7 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins bool background_job_compile = (dexopt_flags & DEXOPT_IDLE_BACKGROUND_JOB) != 0; bool enable_hidden_api_checks = (dexopt_flags & DEXOPT_ENABLE_HIDDEN_API_CHECKS) != 0; bool generate_compact_dex = (dexopt_flags & DEXOPT_GENERATE_COMPACT_DEX) != 0; + bool generate_app_image = (dexopt_flags & DEXOPT_GENERATE_APP_IMAGE) != 0; // Check if we're dealing with a secondary dex file and if we need to compile it. std::string oat_dir_str; @@ -2027,8 +2028,8 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins unique_fd swap_fd = maybe_open_dexopt_swap_file(out_oat_path); // Create the app image file if needed. - Dex2oatFileWrapper image_fd = - maybe_open_app_image(out_oat_path, profile_guided, is_public, uid, is_secondary_dex); + Dex2oatFileWrapper image_fd = maybe_open_app_image( + out_oat_path, generate_app_image, is_public, uid, is_secondary_dex); // Open the reference profile if needed. Dex2oatFileWrapper reference_profile_fd = maybe_open_reference_profile( diff --git a/cmds/installd/installd_constants.h b/cmds/installd/installd_constants.h index 26aa443d4e..c928631d8f 100644 --- a/cmds/installd/installd_constants.h +++ b/cmds/installd/installd_constants.h @@ -54,6 +54,7 @@ constexpr int DEXOPT_STORAGE_DE = 1 << 8; constexpr int DEXOPT_IDLE_BACKGROUND_JOB = 1 << 9; constexpr int DEXOPT_ENABLE_HIDDEN_API_CHECKS = 1 << 10; constexpr int DEXOPT_GENERATE_COMPACT_DEX = 1 << 11; +constexpr int DEXOPT_GENERATE_APP_IMAGE = 1 << 12; /* all known values for dexopt flags */ constexpr int DEXOPT_MASK = @@ -67,7 +68,8 @@ constexpr int DEXOPT_MASK = | DEXOPT_STORAGE_DE | DEXOPT_IDLE_BACKGROUND_JOB | DEXOPT_ENABLE_HIDDEN_API_CHECKS - | DEXOPT_GENERATE_COMPACT_DEX; + | DEXOPT_GENERATE_COMPACT_DEX + | DEXOPT_GENERATE_APP_IMAGE; // NOTE: keep in sync with StorageManager constexpr int FLAG_STORAGE_DE = 1 << 0; diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp index 58355f9db0..96d8c47a8a 100644 --- a/cmds/installd/otapreopt.cpp +++ b/cmds/installd/otapreopt.cpp @@ -82,8 +82,9 @@ static_assert(DEXOPT_STORAGE_DE == 1 << 8, "DEXOPT_STORAGE_DE unexpected."); static_assert(DEXOPT_ENABLE_HIDDEN_API_CHECKS == 1 << 10, "DEXOPT_ENABLE_HIDDEN_API_CHECKS unexpected"); static_assert(DEXOPT_GENERATE_COMPACT_DEX == 1 << 11, "DEXOPT_GENERATE_COMPACT_DEX unexpected"); +static_assert(DEXOPT_GENERATE_APP_IMAGE == 1 << 12, "DEXOPT_GENERATE_APP_IMAGE unexpected"); -static_assert(DEXOPT_MASK == (0xdfe | DEXOPT_IDLE_BACKGROUND_JOB), +static_assert(DEXOPT_MASK == (0x1dfe | DEXOPT_IDLE_BACKGROUND_JOB), "DEXOPT_MASK unexpected."); diff --git a/cmds/installd/otapreopt_parameters.cpp b/cmds/installd/otapreopt_parameters.cpp index d56aec9e2b..cf3de018c0 100644 --- a/cmds/installd/otapreopt_parameters.cpp +++ b/cmds/installd/otapreopt_parameters.cpp @@ -246,6 +246,8 @@ bool OTAPreoptParameters::ReadArgumentsPostV1(uint32_t version, const char** arg case 7: // Version 8 adds a new dexopt flag: DEXOPT_GENERATE_COMPACT_DEX case 8: num_args_expected = 16; break; + // Version 9 adds a new dexopt flag: DEXOPT_GENERATE_APP_IMAGE + case 9: num_args_expected = 16; break; default: LOG(ERROR) << "Don't know how to read arguments for version " << version; return false; diff --git a/cmds/installd/tests/installd_otapreopt_test.cpp b/cmds/installd/tests/installd_otapreopt_test.cpp index 63426cb4e0..b5185073d2 100644 --- a/cmds/installd/tests/installd_otapreopt_test.cpp +++ b/cmds/installd/tests/installd_otapreopt_test.cpp @@ -113,6 +113,7 @@ protected: case 6: return "6"; case 7: return "7"; case 8: return "8"; + case 9: return "9"; } return nullptr; } diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp index 788a6eb8f0..885efec9b9 100644 --- a/libs/gui/GLConsumer.cpp +++ b/libs/gui/GLConsumer.cpp @@ -984,7 +984,8 @@ status_t GLConsumer::doGLFenceWaitLocked() const { } if (mCurrentFence->isValid()) { - if (SyncFeatures::getInstance().useWaitSync()) { + if (SyncFeatures::getInstance().useWaitSync() && + SyncFeatures::getInstance().useNativeFenceSync()) { // Create an EGLSyncKHR from the current fence. int fenceFd = mCurrentFence->dup(); if (fenceFd == -1) { diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 6a1aebd6d6..339bd0fa4e 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -45,6 +45,7 @@ namespace android { using ui::ColorMode; +using ui::Dataspace; Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controlledByApp) : mGraphicBufferProducer(bufferProducer), @@ -80,7 +81,7 @@ Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controll mReqFormat = 0; mReqUsage = 0; mTimestamp = NATIVE_WINDOW_TIMESTAMP_AUTO; - mDataSpace = HAL_DATASPACE_UNKNOWN; + mDataSpace = Dataspace::UNKNOWN; mScalingMode = NATIVE_WINDOW_SCALING_MODE_FREEZE; mTransform = 0; mStickyTransform = 0; @@ -666,8 +667,9 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) { sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : Fence::NO_FENCE); IGraphicBufferProducer::QueueBufferOutput output; IGraphicBufferProducer::QueueBufferInput input(timestamp, isAutoTimestamp, - mDataSpace, crop, mScalingMode, mTransform ^ mStickyTransform, - fence, mStickyTransform, mEnableFrameTimestamps); + static_cast<android_dataspace>(mDataSpace), crop, mScalingMode, + mTransform ^ mStickyTransform, fence, mStickyTransform, + mEnableFrameTimestamps); // we should send HDR metadata as needed if this becomes a bottleneck input.setHdrMetadata(mHdrMetadata); @@ -1098,8 +1100,7 @@ int Surface::dispatchSetSidebandStream(va_list args) { } int Surface::dispatchSetBuffersDataSpace(va_list args) { - android_dataspace dataspace = - static_cast<android_dataspace>(va_arg(args, int)); + Dataspace dataspace = static_cast<Dataspace>(va_arg(args, int)); return setBuffersDataSpace(dataspace); } @@ -1531,7 +1532,7 @@ int Surface::setBuffersTimestamp(int64_t timestamp) return NO_ERROR; } -int Surface::setBuffersDataSpace(android_dataspace dataSpace) +int Surface::setBuffersDataSpace(Dataspace dataSpace) { ALOGV("Surface::setBuffersDataSpace"); Mutex::Autolock lock(mMutex); @@ -1563,7 +1564,7 @@ int Surface::setBuffersCta8613Metadata(const android_cta861_3_metadata* metadata return NO_ERROR; } -android_dataspace_t Surface::getBuffersDataSpace() { +Dataspace Surface::getBuffersDataSpace() { ALOGV("Surface::getBuffersDataSpace"); Mutex::Autolock lock(mMutex); return mDataSpace; diff --git a/libs/gui/include/gui/Surface.h b/libs/gui/include/gui/Surface.h index 641d62cd4d..9aeafae198 100644 --- a/libs/gui/include/gui/Surface.h +++ b/libs/gui/include/gui/Surface.h @@ -22,6 +22,7 @@ #include <gui/IGraphicBufferProducer.h> #include <ui/ANativeObjectBase.h> +#include <ui/GraphicTypes.h> #include <ui/Region.h> #include <utils/Condition.h> @@ -245,7 +246,7 @@ protected: virtual int setBuffersTransform(uint32_t transform); virtual int setBuffersStickyTransform(uint32_t transform); virtual int setBuffersTimestamp(int64_t timestamp); - virtual int setBuffersDataSpace(android_dataspace dataSpace); + virtual int setBuffersDataSpace(ui::Dataspace dataSpace); virtual int setBuffersSmpte2086Metadata(const android_smpte2086_metadata* metadata); virtual int setBuffersCta8613Metadata(const android_cta861_3_metadata* metadata); virtual int setCrop(Rect const* rect); @@ -286,7 +287,7 @@ public: // detachNextBuffer, or attachBuffer call. status_t getAndFlushRemovedBuffers(std::vector<sp<GraphicBuffer>>* out); - android_dataspace_t getBuffersDataSpace(); + ui::Dataspace getBuffersDataSpace(); static status_t attachAndQueueBuffer(Surface* surface, sp<GraphicBuffer> buffer); @@ -340,9 +341,9 @@ protected: int64_t mTimestamp; // mDataSpace is the buffer dataSpace that will be used for the next buffer - // queue operation. It defaults to HAL_DATASPACE_UNKNOWN, which + // queue operation. It defaults to Dataspace::UNKNOWN, which // means that the buffer contains some type of color data. - android_dataspace mDataSpace; + ui::Dataspace mDataSpace; // mHdrMetadata is the HDR metadata that will be used for the next buffer // queue operation. There is no HDR metadata by default. diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index f71f814f55..e477a830c9 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -83,6 +83,7 @@ cc_library_shared { "libhidlbase", "libhidltransport", "libhwbinder", + "libpdx_default_transport", "libsync", "libutils", "libutilscallstack", @@ -99,10 +100,9 @@ cc_library_shared { "libbase_headers", "libnativebase_headers", "libhardware_headers", + "libui_headers", ], - export_include_dirs: ["include"], - export_static_lib_headers: [ "libarect", "libmath", @@ -112,6 +112,7 @@ cc_library_shared { "libbase_headers", "libnativebase_headers", "libhardware_headers", + "libui_headers", ], } @@ -119,6 +120,11 @@ cc_library_headers { name: "libui_headers", export_include_dirs: ["include"], vendor_available: true, + target: { + vendor: { + override_export_include_dirs: ["include_vndk"], + }, + }, } subdirs = [ diff --git a/libs/ui/DebugUtils.cpp b/libs/ui/DebugUtils.cpp index d7d8618703..58fed84ea8 100644 --- a/libs/ui/DebugUtils.cpp +++ b/libs/ui/DebugUtils.cpp @@ -234,6 +234,33 @@ std::string decodeColorMode(ColorMode colorMode) { return android::base::StringPrintf("Unknown color mode %d", colorMode); } +std::string decodeColorTransform(android_color_transform colorTransform) { + switch (colorTransform) { + case HAL_COLOR_TRANSFORM_IDENTITY: + return std::string("Identity"); + + case HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX: + return std::string("Arbitrary matrix"); + + case HAL_COLOR_TRANSFORM_VALUE_INVERSE: + return std::string("Inverse value"); + + case HAL_COLOR_TRANSFORM_GRAYSCALE: + return std::string("Grayscale"); + + case HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA: + return std::string("Correct protanopia"); + + case HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA: + return std::string("Correct deuteranopia"); + + case HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA: + return std::string("Correct tritanopia"); + } + + return android::base::StringPrintf("Unknown color transform %d", colorTransform); +} + // Converts a PixelFormat to a human-readable string. Max 11 chars. // (Could use a table of prefab String8 objects.) std::string decodePixelFormat(android::PixelFormat format) { diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp index 4ed2aa42fc..254038b0ad 100644 --- a/libs/ui/GraphicBuffer.cpp +++ b/libs/ui/GraphicBuffer.cpp @@ -22,6 +22,7 @@ #include <grallocusage/GrallocUsageConversion.h> +#include <ui/DetachedBufferHandle.h> #include <ui/Gralloc2.h> #include <ui/GraphicBufferAllocator.h> #include <ui/GraphicBufferMapper.h> @@ -486,6 +487,24 @@ status_t GraphicBuffer::unflatten( return NO_ERROR; } +bool GraphicBuffer::isDetachedBuffer() const { + return mDetachedBufferHandle && mDetachedBufferHandle->isValid(); +} + +status_t GraphicBuffer::setDetachedBufferHandle(std::unique_ptr<DetachedBufferHandle> channel) { + if (isDetachedBuffer()) { + ALOGW("setDetachedBuffer: there is already a BufferHub channel associated with this " + "GraphicBuffer. Replacing the old one."); + } + + mDetachedBufferHandle = std::move(channel); + return NO_ERROR; +} + +std::unique_ptr<DetachedBufferHandle> GraphicBuffer::takeDetachedBufferHandle() { + return std::move(mDetachedBufferHandle); +} + // --------------------------------------------------------------------------- }; // namespace android diff --git a/libs/ui/include/ui/DebugUtils.h b/libs/ui/include/ui/DebugUtils.h index 6350d0cf95..5e5df43740 100644 --- a/libs/ui/include/ui/DebugUtils.h +++ b/libs/ui/include/ui/DebugUtils.h @@ -30,5 +30,6 @@ std::string decodeTransfer(android_dataspace dataspace); std::string decodeRange(android_dataspace dataspace); std::string dataspaceDetails(android_dataspace dataspace); std::string decodeColorMode(android::ui::ColorMode colormode); +std::string decodeColorTransform(android_color_transform colorTransform); std::string decodePixelFormat(android::PixelFormat format); std::string to_string(const android::Rect& rect); diff --git a/libs/ui/include/ui/DetachedBufferHandle.h b/libs/ui/include/ui/DetachedBufferHandle.h new file mode 100644 index 0000000000..f3c328d52b --- /dev/null +++ b/libs/ui/include/ui/DetachedBufferHandle.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2018 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_DETACHED_BUFFER_HUB_HANDLE_H +#define ANDROID_DETACHED_BUFFER_HUB_HANDLE_H + +#include <pdx/channel_handle.h> + +#include <memory> + +namespace android { + +// A wrapper that holds a pdx::LocalChannelHandle object. From the handle, a BufferHub buffer can be +// created. Current implementation assumes that the underlying transport is using libpdx (thus +// holding a pdx::LocalChannelHandle object), but future implementation can change it to a Binder +// backend if ever needed. +class DetachedBufferHandle { +public: + static std::unique_ptr<DetachedBufferHandle> Create(pdx::LocalChannelHandle handle) { + return std::unique_ptr<DetachedBufferHandle>(new DetachedBufferHandle(std::move(handle))); + } + + // Accessors to get or take the internal pdx::LocalChannelHandle. + pdx::LocalChannelHandle& handle() { return mHandle; } + const pdx::LocalChannelHandle& handle() const { return mHandle; } + + // Returns whether the DetachedBufferHandle holds a BufferHub channel. + bool isValid() const { return mHandle.valid(); } + +private: + // Constructs a DetachedBufferHandle from a pdx::LocalChannelHandle. + explicit DetachedBufferHandle(pdx::LocalChannelHandle handle) : mHandle(std::move(handle)) {} + + pdx::LocalChannelHandle mHandle; +}; + +} // namespace android + +#endif // ANDROID_DETACHED_BUFFER_HUB_HANDLE_H diff --git a/libs/ui/include/ui/GraphicBuffer.h b/libs/ui/include/ui/GraphicBuffer.h index e794462f60..cc38982e64 100644 --- a/libs/ui/include/ui/GraphicBuffer.h +++ b/libs/ui/include/ui/GraphicBuffer.h @@ -34,6 +34,7 @@ namespace android { +class DetachedBufferHandle; class GraphicBufferMapper; // =========================================================================== @@ -190,6 +191,11 @@ public: status_t flatten(void*& buffer, size_t& size, int*& fds, size_t& count) const; status_t unflatten(void const*& buffer, size_t& size, int const*& fds, size_t& count); + // Sets and takes DetachedBuffer. Should only be called from BufferHub. + bool isDetachedBuffer() const; + status_t setDetachedBufferHandle(std::unique_ptr<DetachedBufferHandle> detachedBuffer); + std::unique_ptr<DetachedBufferHandle> takeDetachedBufferHandle(); + private: ~GraphicBuffer(); @@ -240,6 +246,17 @@ private: // match the BufferQueue's internal generation number (set through // IGBP::setGenerationNumber), attempts to attach the buffer will fail. uint32_t mGenerationNumber; + + // Stores a BufferHub handle that can be used to re-attach this GraphicBuffer back into a + // BufferHub producer/consumer set. In terms of GraphicBuffer's relationship with BufferHub, + // there are three different modes: + // 1. Legacy mode: GraphicBuffer is not backed by BufferHub and mDetachedBufferHandle must be + // invalid. + // 2. Detached mode: GraphicBuffer is backed by BufferHub, but not part of a producer/consumer + // set. In this mode, mDetachedBufferHandle must be valid. + // 3. Attached mode: GraphicBuffer is backed by BufferHub and it's part of a producer/consumer + // set. In this mode, mDetachedBufferHandle must be invalid. + std::unique_ptr<DetachedBufferHandle> mDetachedBufferHandle; }; }; // namespace android diff --git a/libs/ui/include/ui/GraphicTypes.h b/libs/ui/include/ui/GraphicTypes.h index 39893b268a..92a5519898 100644 --- a/libs/ui/include/ui/GraphicTypes.h +++ b/libs/ui/include/ui/GraphicTypes.h @@ -25,6 +25,8 @@ namespace android { namespace ui { using android::hardware::graphics::common::V1_0::ColorMode; +using android::hardware::graphics::common::V1_1::Dataspace; +using android::hardware::graphics::common::V1_1::PixelFormat; } // namespace ui } // namespace android diff --git a/libs/ui/include_vndk/ui/ANativeObjectBase.h b/libs/ui/include_vndk/ui/ANativeObjectBase.h new file mode 120000 index 0000000000..4dab8d8b8b --- /dev/null +++ b/libs/ui/include_vndk/ui/ANativeObjectBase.h @@ -0,0 +1 @@ +../../include/ui/ANativeObjectBase.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/BufferQueueDefs.h b/libs/ui/include_vndk/ui/BufferQueueDefs.h new file mode 120000 index 0000000000..c886ed858e --- /dev/null +++ b/libs/ui/include_vndk/ui/BufferQueueDefs.h @@ -0,0 +1 @@ +../../include/ui/BufferQueueDefs.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/ColorSpace.h b/libs/ui/include_vndk/ui/ColorSpace.h new file mode 120000 index 0000000000..ddf70d5bdf --- /dev/null +++ b/libs/ui/include_vndk/ui/ColorSpace.h @@ -0,0 +1 @@ +../../include/ui/ColorSpace.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/DebugUtils.h b/libs/ui/include_vndk/ui/DebugUtils.h new file mode 120000 index 0000000000..8461bb39c3 --- /dev/null +++ b/libs/ui/include_vndk/ui/DebugUtils.h @@ -0,0 +1 @@ +../../include/ui/DebugUtils.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/DisplayInfo.h b/libs/ui/include_vndk/ui/DisplayInfo.h new file mode 120000 index 0000000000..75f14cf66d --- /dev/null +++ b/libs/ui/include_vndk/ui/DisplayInfo.h @@ -0,0 +1 @@ +../../include/ui/DisplayInfo.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/DisplayStatInfo.h b/libs/ui/include_vndk/ui/DisplayStatInfo.h new file mode 120000 index 0000000000..6689ad3162 --- /dev/null +++ b/libs/ui/include_vndk/ui/DisplayStatInfo.h @@ -0,0 +1 @@ +../../include/ui/DisplayStatInfo.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/Fence.h b/libs/ui/include_vndk/ui/Fence.h new file mode 120000 index 0000000000..b110201354 --- /dev/null +++ b/libs/ui/include_vndk/ui/Fence.h @@ -0,0 +1 @@ +../../include/ui/Fence.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/FenceTime.h b/libs/ui/include_vndk/ui/FenceTime.h new file mode 120000 index 0000000000..01a6ff21d1 --- /dev/null +++ b/libs/ui/include_vndk/ui/FenceTime.h @@ -0,0 +1 @@ +../../include/ui/FenceTime.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/FloatRect.h b/libs/ui/include_vndk/ui/FloatRect.h new file mode 120000 index 0000000000..a5262118f7 --- /dev/null +++ b/libs/ui/include_vndk/ui/FloatRect.h @@ -0,0 +1 @@ +../../include/ui/FloatRect.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/FrameStats.h b/libs/ui/include_vndk/ui/FrameStats.h new file mode 120000 index 0000000000..e68e5c843f --- /dev/null +++ b/libs/ui/include_vndk/ui/FrameStats.h @@ -0,0 +1 @@ +../../include/ui/FrameStats.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/Gralloc2.h b/libs/ui/include_vndk/ui/Gralloc2.h new file mode 120000 index 0000000000..66098c4edb --- /dev/null +++ b/libs/ui/include_vndk/ui/Gralloc2.h @@ -0,0 +1 @@ +../../include/ui/Gralloc2.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/GraphicBuffer.h b/libs/ui/include_vndk/ui/GraphicBuffer.h new file mode 120000 index 0000000000..445eae5395 --- /dev/null +++ b/libs/ui/include_vndk/ui/GraphicBuffer.h @@ -0,0 +1 @@ +../../include/ui/GraphicBuffer.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/GraphicBufferAllocator.h b/libs/ui/include_vndk/ui/GraphicBufferAllocator.h new file mode 120000 index 0000000000..96345330f1 --- /dev/null +++ b/libs/ui/include_vndk/ui/GraphicBufferAllocator.h @@ -0,0 +1 @@ +../../include/ui/GraphicBufferAllocator.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/GraphicBufferMapper.h b/libs/ui/include_vndk/ui/GraphicBufferMapper.h new file mode 120000 index 0000000000..c3b3a7c61d --- /dev/null +++ b/libs/ui/include_vndk/ui/GraphicBufferMapper.h @@ -0,0 +1 @@ +../../include/ui/GraphicBufferMapper.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/GraphicTypes.h b/libs/ui/include_vndk/ui/GraphicTypes.h new file mode 120000 index 0000000000..b1859e0f51 --- /dev/null +++ b/libs/ui/include_vndk/ui/GraphicTypes.h @@ -0,0 +1 @@ +../../include/ui/GraphicTypes.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/HdrCapabilities.h b/libs/ui/include_vndk/ui/HdrCapabilities.h new file mode 120000 index 0000000000..a240828c8c --- /dev/null +++ b/libs/ui/include_vndk/ui/HdrCapabilities.h @@ -0,0 +1 @@ +../../include/ui/HdrCapabilities.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/PixelFormat.h b/libs/ui/include_vndk/ui/PixelFormat.h new file mode 120000 index 0000000000..0aba056f58 --- /dev/null +++ b/libs/ui/include_vndk/ui/PixelFormat.h @@ -0,0 +1 @@ +../../include/ui/PixelFormat.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/Point.h b/libs/ui/include_vndk/ui/Point.h new file mode 120000 index 0000000000..0aeda3e97e --- /dev/null +++ b/libs/ui/include_vndk/ui/Point.h @@ -0,0 +1 @@ +../../include/ui/Point.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/Rect.h b/libs/ui/include_vndk/ui/Rect.h new file mode 120000 index 0000000000..01ed6891e9 --- /dev/null +++ b/libs/ui/include_vndk/ui/Rect.h @@ -0,0 +1 @@ +../../include/ui/Rect.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/Region.h b/libs/ui/include_vndk/ui/Region.h new file mode 120000 index 0000000000..3f829bfad0 --- /dev/null +++ b/libs/ui/include_vndk/ui/Region.h @@ -0,0 +1 @@ +../../include/ui/Region.h
\ No newline at end of file diff --git a/libs/ui/include_vndk/ui/UiConfig.h b/libs/ui/include_vndk/ui/UiConfig.h new file mode 120000 index 0000000000..f580ce1095 --- /dev/null +++ b/libs/ui/include_vndk/ui/UiConfig.h @@ -0,0 +1 @@ +../../include/ui/UiConfig.h
\ No newline at end of file diff --git a/libs/ui/tests/Android.bp b/libs/ui/tests/Android.bp index 08067fcf5d..aef6428cc8 100644 --- a/libs/ui/tests/Android.bp +++ b/libs/ui/tests/Android.bp @@ -27,3 +27,10 @@ cc_test { srcs: ["colorspace_test.cpp"], cflags: ["-Wall", "-Werror"], } + +cc_test { + name: "GraphicBuffer_test", + shared_libs: ["libpdx_default_transport", "libui", "libutils"], + srcs: ["GraphicBuffer_test.cpp"], + cflags: ["-Wall", "-Werror"], +} diff --git a/libs/ui/tests/GraphicBuffer_test.cpp b/libs/ui/tests/GraphicBuffer_test.cpp new file mode 100644 index 0000000000..eb679ac236 --- /dev/null +++ b/libs/ui/tests/GraphicBuffer_test.cpp @@ -0,0 +1,64 @@ +/* + * Copyright 2018 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. + */ + +#define LOG_TAG "GraphicBufferTest" + +#include <ui/DetachedBufferHandle.h> +#include <ui/GraphicBuffer.h> + +#include <gtest/gtest.h> + +namespace android { + +namespace { + +constexpr uint32_t kTestWidth = 1024; +constexpr uint32_t kTestHeight = 1; +constexpr uint32_t kTestFormat = HAL_PIXEL_FORMAT_BLOB; +constexpr uint32_t kTestLayerCount = 1; +constexpr uint64_t kTestUsage = GraphicBuffer::USAGE_SW_WRITE_OFTEN; + +} // namespace + +class GraphicBufferTest : public testing::Test {}; + +TEST_F(GraphicBufferTest, DetachedBuffer) { + sp<GraphicBuffer> buffer( + new GraphicBuffer(kTestWidth, kTestHeight, kTestFormat, kTestLayerCount, kTestUsage)); + + // Currently a newly allocated GraphicBuffer is in legacy mode, i.e. not associated with + // BufferHub. But this may change in the future. + EXPECT_FALSE(buffer->isDetachedBuffer()); + + pdx::LocalChannelHandle channel{nullptr, 1234}; + EXPECT_TRUE(channel.valid()); + + std::unique_ptr<DetachedBufferHandle> handle = DetachedBufferHandle::Create(std::move(channel)); + EXPECT_FALSE(channel.valid()); + EXPECT_TRUE(handle->isValid()); + EXPECT_TRUE(handle->handle().valid()); + + buffer->setDetachedBufferHandle(std::move(handle)); + EXPECT_TRUE(handle == nullptr); + EXPECT_TRUE(buffer->isDetachedBuffer()); + + handle = buffer->takeDetachedBufferHandle(); + EXPECT_TRUE(handle != nullptr); + EXPECT_TRUE(handle->isValid()); + EXPECT_FALSE(buffer->isDetachedBuffer()); +} + +} // namespace android diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp index ba28eb5298..ff994f515c 100644 --- a/services/surfaceflinger/Android.bp +++ b/services/surfaceflinger/Android.bp @@ -105,6 +105,7 @@ filegroup { "Layer.cpp", "LayerProtoHelper.cpp", "LayerRejecter.cpp", + "LayerStats.cpp", "LayerVector.cpp", "MessageQueue.cpp", "MonitoredProducer.cpp", diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp index 9200207f4a..82300e679f 100644 --- a/services/surfaceflinger/BufferLayer.cpp +++ b/services/surfaceflinger/BufferLayer.cpp @@ -829,7 +829,7 @@ void BufferLayer::drawWithOpenGL(const RenderArea& renderArea, bool useIdentityT getColor()); engine.setSourceDataSpace(mCurrentState.dataSpace); - if (mCurrentState.dataSpace == HAL_DATASPACE_BT2020_ITU_PQ && + if (mCurrentState.dataSpace == ui::Dataspace::BT2020_ITU_PQ && mConsumer->getCurrentApi() == NATIVE_WINDOW_API_MEDIA && getBE().compositionInfo.mBuffer->getPixelFormat() == HAL_PIXEL_FORMAT_RGBA_1010102) { engine.setSourceY410BT2020(true); diff --git a/services/surfaceflinger/BufferLayerConsumer.cpp b/services/surfaceflinger/BufferLayerConsumer.cpp index 46ec0e322b..6b4f5dbfb0 100644 --- a/services/surfaceflinger/BufferLayerConsumer.cpp +++ b/services/surfaceflinger/BufferLayerConsumer.cpp @@ -65,7 +65,7 @@ BufferLayerConsumer::BufferLayerConsumer(const sp<IGraphicBufferConsumer>& bq, mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE), mCurrentFence(Fence::NO_FENCE), mCurrentTimestamp(0), - mCurrentDataSpace(HAL_DATASPACE_UNKNOWN), + mCurrentDataSpace(ui::Dataspace::UNKNOWN), mCurrentFrameNumber(0), mCurrentTransformToDisplayInverse(false), mCurrentSurfaceDamage(), @@ -341,7 +341,7 @@ status_t BufferLayerConsumer::updateAndReleaseLocked(const BufferItem& item, mCurrentTransform = item.mTransform; mCurrentScalingMode = item.mScalingMode; mCurrentTimestamp = item.mTimestamp; - mCurrentDataSpace = item.mDataSpace; + mCurrentDataSpace = static_cast<ui::Dataspace>(item.mDataSpace); mCurrentHdrMetadata = item.mHdrMetadata; mCurrentFence = item.mFence; mCurrentFenceTime = item.mFenceTime; @@ -445,7 +445,7 @@ nsecs_t BufferLayerConsumer::getTimestamp() { return mCurrentTimestamp; } -android_dataspace BufferLayerConsumer::getCurrentDataSpace() { +ui::Dataspace BufferLayerConsumer::getCurrentDataSpace() { BLC_LOGV("getCurrentDataSpace"); Mutex::Autolock lock(mMutex); return mCurrentDataSpace; diff --git a/services/surfaceflinger/BufferLayerConsumer.h b/services/surfaceflinger/BufferLayerConsumer.h index 11048d8df8..f81cdb1d91 100644 --- a/services/surfaceflinger/BufferLayerConsumer.h +++ b/services/surfaceflinger/BufferLayerConsumer.h @@ -23,6 +23,7 @@ #include <ui/FenceTime.h> #include <ui/GraphicBuffer.h> +#include <ui/GraphicTypes.h> #include <ui/Region.h> #include <utils/String8.h> @@ -122,7 +123,7 @@ public: // getDataSpace retrieves the DataSpace associated with the texture image // set by the most recent call to updateTexImage. - android_dataspace getCurrentDataSpace(); + ui::Dataspace getCurrentDataSpace(); // getCurrentHdrMetadata retrieves the HDR metadata associated with the // texture image set by the most recent call to updateTexImage. @@ -324,7 +325,7 @@ private: // mCurrentDataSpace is the dataspace for the current texture. It // gets set each time updateTexImage is called. - android_dataspace mCurrentDataSpace; + ui::Dataspace mCurrentDataSpace; // mCurrentHdrMetadata is the HDR metadata for the current texture. It // gets set each time updateTexImage is called. diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 93cb849e28..58a774b7e2 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -97,6 +97,7 @@ DisplayDevice::DisplayDevice( mPowerMode(initialPowerMode), mActiveConfig(0), mActiveColorMode(ColorMode::NATIVE), + mColorTransform(HAL_COLOR_TRANSFORM_IDENTITY), mDisplayHasWideColor(supportWideColor), mDisplayHasHdr(supportHdr) { @@ -267,9 +268,19 @@ ColorMode DisplayDevice::getActiveColorMode() const { return mActiveColorMode; } -void DisplayDevice::setCompositionDataSpace(android_dataspace dataspace) { +void DisplayDevice::setColorTransform(const mat4& transform) { + const bool isIdentity = (transform == mat4()); + mColorTransform = + isIdentity ? HAL_COLOR_TRANSFORM_IDENTITY : HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX; +} + +android_color_transform_t DisplayDevice::getColorTransform() const { + return mColorTransform; +} + +void DisplayDevice::setCompositionDataSpace(ui::Dataspace dataspace) { ANativeWindow* const window = mNativeWindow.get(); - native_window_set_buffers_data_space(window, dataspace); + native_window_set_buffers_data_space(window, static_cast<android_dataspace>(dataspace)); } // ---------------------------------------------------------------------------- @@ -452,12 +463,11 @@ void DisplayDevice::dump(String8& result) const { mScissor.top, mScissor.right, mScissor.bottom, tr[0][0], tr[1][0], tr[2][0], tr[0][1], tr[1][1], tr[2][1], tr[0][2], tr[1][2], tr[2][2]); auto const surface = static_cast<Surface*>(window); - android_dataspace dataspace = surface->getBuffersDataSpace(); + ui::Dataspace dataspace = surface->getBuffersDataSpace(); result.appendFormat(" wideColor=%d, hdr=%d, colorMode=%s, dataspace: %s (%d)\n", mDisplayHasWideColor, mDisplayHasHdr, decodeColorMode(mActiveColorMode).c_str(), - dataspaceDetails(dataspace).c_str(), dataspace); - + dataspaceDetails(static_cast<android_dataspace>(dataspace)).c_str(), dataspace); String8 surfaceDump; mDisplaySurface->dumpAsString(surfaceDump); diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h index df729f5ce9..e844d115c2 100644 --- a/services/surfaceflinger/DisplayDevice.h +++ b/services/surfaceflinger/DisplayDevice.h @@ -21,6 +21,8 @@ #include <stdlib.h> +#include <math/mat4.h> + #include <ui/Region.h> #include <binder/IBinder.h> @@ -163,7 +165,9 @@ public: ui::ColorMode getActiveColorMode() const; void setActiveColorMode(ui::ColorMode mode); - void setCompositionDataSpace(android_dataspace dataspace); + android_color_transform_t getColorTransform() const; + void setColorTransform(const mat4& transform); + void setCompositionDataSpace(ui::Dataspace dataspace); /* ------------------------------------------------------------------------ * Display active config management. @@ -237,6 +241,8 @@ private: int mActiveConfig; // current active color mode ui::ColorMode mActiveColorMode; + // Current color transform + android_color_transform_t mColorTransform; // Need to know if display is wide-color capable or not. // Initialized by SurfaceFlinger when the DisplayDevice is created. diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp index 0425a8a216..bbffd0ae7f 100644 --- a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp +++ b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp @@ -32,6 +32,7 @@ namespace android { using hardware::Return; using hardware::hidl_vec; using hardware::hidl_handle; +using namespace hardware::graphics::common; using namespace hardware::graphics::composer; using PerFrameMetadata = hardware::graphics::composer::V2_2::IComposerClient::PerFrameMetadata; using PerFrameMetadataKey = @@ -256,17 +257,32 @@ Error Composer::createVirtualDisplay(uint32_t width, uint32_t height, { const uint32_t bufferSlotCount = 1; Error error = kDefaultError; - mClient->createVirtualDisplay(width, height, *format, bufferSlotCount, - [&](const auto& tmpError, const auto& tmpDisplay, - const auto& tmpFormat) { - error = tmpError; - if (error != Error::NONE) { - return; - } - - *outDisplay = tmpDisplay; - *format = tmpFormat; + if (mClient_2_2) { + mClient_2_2->createVirtualDisplay_2_2(width, height, *format, bufferSlotCount, + [&](const auto& tmpError, const auto& tmpDisplay, + const auto& tmpFormat) { + error = tmpError; + if (error != Error::NONE) { + return; + } + + *outDisplay = tmpDisplay; + *format = tmpFormat; + }); + } else { + mClient->createVirtualDisplay(width, height, + static_cast<V1_0::PixelFormat>(*format), bufferSlotCount, + [&](const auto& tmpError, const auto& tmpDisplay, + const auto& tmpFormat) { + error = tmpError; + if (error != Error::NONE) { + return; + } + + *outDisplay = tmpDisplay; + *format = static_cast<PixelFormat>(tmpFormat); }); + } return error; } @@ -522,7 +538,7 @@ Error Composer::setClientTarget(Display display, uint32_t slot, .height = target->getHeight(), .stride = target->getStride(), .layerCount = target->getLayerCount(), - .format = static_cast<PixelFormat>(target->getPixelFormat()), + .format = static_cast<V1_0::PixelFormat>(target->getPixelFormat()), .usage = target->getUsage(), }; mWriter.setClientTargetMetadata(metadata); @@ -645,7 +661,7 @@ Error Composer::setLayerBuffer(Display display, Layer layer, .height = buffer->getHeight(), .stride = buffer->getStride(), .layerCount = buffer->getLayerCount(), - .format = static_cast<PixelFormat>(buffer->getPixelFormat()), + .format = static_cast<V1_0::PixelFormat>(buffer->getPixelFormat()), .usage = buffer->getUsage(), }; mWriter.setLayerBufferMetadata(metadata); @@ -742,7 +758,7 @@ Error Composer::setLayerHdrMetadata(Display display, Layer layer, const HdrMetad metadata.cta8613.maxFrameAverageLightLevel}}); } - mWriter.setPerFrameMetadata(composerMetadata); + mWriter.setLayerPerFrameMetadata(composerMetadata); return Error::NONE; } diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.h b/services/surfaceflinger/DisplayHardware/ComposerHal.h index c0373aa6c1..98f2f9d387 100644 --- a/services/surfaceflinger/DisplayHardware/ComposerHal.h +++ b/services/surfaceflinger/DisplayHardware/ComposerHal.h @@ -24,6 +24,7 @@ #include <vector> #include <android/frameworks/vr/composer/1.0/IVrComposerClient.h> +#include <android/hardware/graphics/common/1.1/types.h> #include <android/hardware/graphics/composer/2.2/IComposer.h> #include <android/hardware/graphics/composer/2.2/IComposerClient.h> #include <composer-command-buffer/2.2/ComposerCommandBuffer.h> @@ -39,10 +40,10 @@ using android::frameworks::vr::composer::V1_0::IVrComposerClient; using android::hardware::graphics::common::V1_0::ColorMode; using android::hardware::graphics::common::V1_0::ColorTransform; -using android::hardware::graphics::common::V1_0::Dataspace; using android::hardware::graphics::common::V1_0::Hdr; -using android::hardware::graphics::common::V1_0::PixelFormat; using android::hardware::graphics::common::V1_0::Transform; +using android::hardware::graphics::common::V1_1::Dataspace; +using android::hardware::graphics::common::V1_1::PixelFormat; using android::hardware::graphics::composer::V2_1::Config; using android::hardware::graphics::composer::V2_1::Display; diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp index 9398bdec92..e6d783434a 100644 --- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp +++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp @@ -44,6 +44,8 @@ namespace android { // ---------------------------------------------------------------------------- +using ui::Dataspace; + /* * This implements the (main) framebuffer management. This class is used * mostly by SurfaceFlinger, but also by command line GL application. @@ -92,7 +94,7 @@ status_t FramebufferSurface::advanceFrame() { uint32_t slot = 0; sp<GraphicBuffer> buf; sp<Fence> acquireFence(Fence::NO_FENCE); - android_dataspace_t dataspace = HAL_DATASPACE_UNKNOWN; + Dataspace dataspace = Dataspace::UNKNOWN; status_t result = nextBuffer(slot, buf, acquireFence, dataspace); mDataSpace = dataspace; if (result != NO_ERROR) { @@ -104,7 +106,7 @@ status_t FramebufferSurface::advanceFrame() { status_t FramebufferSurface::nextBuffer(uint32_t& outSlot, sp<GraphicBuffer>& outBuffer, sp<Fence>& outFence, - android_dataspace_t& outDataspace) { + Dataspace& outDataspace) { Mutex::Autolock lock(mMutex); BufferItem item; @@ -139,7 +141,7 @@ status_t FramebufferSurface::nextBuffer(uint32_t& outSlot, outFence = item.mFence; mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer, &outSlot, &outBuffer); - outDataspace = item.mDataSpace; + outDataspace = static_cast<Dataspace>(item.mDataSpace); status_t result = mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace); if (result != NO_ERROR) { @@ -178,7 +180,8 @@ void FramebufferSurface::onFrameCommitted() { void FramebufferSurface::dumpAsString(String8& result) const { Mutex::Autolock lock(mMutex); result.appendFormat(" FramebufferSurface: dataspace: %s(%d)\n", - dataspaceDetails(mDataSpace).c_str(), mDataSpace); + dataspaceDetails(static_cast<android_dataspace>(mDataSpace)).c_str(), + mDataSpace); ConsumerBase::dumpLocked(result, " "); } diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.h b/services/surfaceflinger/DisplayHardware/FramebufferSurface.h index ed756c49a1..0fd8e9eaa4 100644 --- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.h +++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.h @@ -61,7 +61,7 @@ private: // BufferQueue and releases the previously latched buffer to the // BufferQueue. The new buffer is returned in the 'buffer' argument. status_t nextBuffer(uint32_t& outSlot, sp<GraphicBuffer>& outBuffer, - sp<Fence>& outFence, android_dataspace_t& outDataspace); + sp<Fence>& outFence, ui::Dataspace& outDataspace); // mDisplayType must match one of the HWC display types int mDisplayType; @@ -76,7 +76,7 @@ private: // compositing. Otherwise it will display the dataspace of the buffer // use for compositing which can change as wide-color content is // on/off. - android_dataspace mDataSpace; + ui::Dataspace mDataSpace; // mCurrentBuffer is the current buffer or nullptr to indicate that there is // no current buffer. diff --git a/services/surfaceflinger/DisplayHardware/HWC2.cpp b/services/surfaceflinger/DisplayHardware/HWC2.cpp index 98daec3e47..2686788ade 100644 --- a/services/surfaceflinger/DisplayHardware/HWC2.cpp +++ b/services/surfaceflinger/DisplayHardware/HWC2.cpp @@ -47,6 +47,9 @@ using android::hardware::Void; namespace HWC2 { namespace Hwc2 = android::Hwc2; +using android::ui::ColorMode; +using android::ui::Dataspace; +using android::ui::PixelFormat; namespace { @@ -114,14 +117,13 @@ uint32_t Device::getMaxVirtualDisplayCount() const } Error Device::createVirtualDisplay(uint32_t width, uint32_t height, - android_pixel_format_t* format, Display** outDisplay) + PixelFormat* format, Display** outDisplay) { ALOGI("Creating virtual display"); hwc2_display_t displayId = 0; - auto intFormat = static_cast<Hwc2::PixelFormat>(*format); auto intError = mComposer->createVirtualDisplay(width, height, - &intFormat, &displayId); + format, &displayId); auto error = static_cast<Error>(intError); if (error != Error::None) { return error; @@ -131,7 +133,6 @@ Error Device::createVirtualDisplay(uint32_t width, uint32_t height, *mComposer.get(), mCapabilities, displayId, DisplayType::Virtual); display->setConnected(true); *outDisplay = display.get(); - *format = static_cast<android_pixel_format_t>(intFormat); mDisplays.emplace(displayId, std::move(display)); ALOGI("Created virtual display"); return Error::None; @@ -362,11 +363,10 @@ Error Display::getChangedCompositionTypes( return Error::None; } -Error Display::getColorModes(std::vector<android::ui::ColorMode>* outModes) const +Error Display::getColorModes(std::vector<ColorMode>* outModes) const { auto intError = mComposer.getColorModes(mId, outModes); return static_cast<Error>(intError); - return Error::None; } std::vector<std::shared_ptr<const Display::Config>> Display::getConfigs() const @@ -517,17 +517,16 @@ Error Display::setActiveConfig(const std::shared_ptr<const Config>& config) } Error Display::setClientTarget(uint32_t slot, const sp<GraphicBuffer>& target, - const sp<Fence>& acquireFence, android_dataspace_t dataspace) + const sp<Fence>& acquireFence, Dataspace dataspace) { // TODO: Properly encode client target surface damage int32_t fenceFd = acquireFence->dup(); auto intError = mComposer.setClientTarget(mId, slot, target, - fenceFd, static_cast<Hwc2::Dataspace>(dataspace), - std::vector<Hwc2::IComposerClient::Rect>()); + fenceFd, dataspace, std::vector<Hwc2::IComposerClient::Rect>()); return static_cast<Error>(intError); } -Error Display::setColorMode(android::ui::ColorMode mode) +Error Display::setColorMode(ColorMode mode) { auto intError = mComposer.setColorMode(mId, mode); return static_cast<Error>(intError); @@ -766,14 +765,13 @@ Error Layer::setCompositionType(Composition type) return static_cast<Error>(intError); } -Error Layer::setDataspace(android_dataspace_t dataspace) +Error Layer::setDataspace(Dataspace dataspace) { if (dataspace == mDataSpace) { return Error::None; } mDataSpace = dataspace; - auto intDataspace = static_cast<Hwc2::Dataspace>(dataspace); - auto intError = mComposer.setLayerDataspace(mDisplayId, mId, intDataspace); + auto intError = mComposer.setLayerDataspace(mDisplayId, mId, mDataSpace); return static_cast<Error>(intError); } diff --git a/services/surfaceflinger/DisplayHardware/HWC2.h b/services/surfaceflinger/DisplayHardware/HWC2.h index 71c094a035..9b870e3ed9 100644 --- a/services/surfaceflinger/DisplayHardware/HWC2.h +++ b/services/surfaceflinger/DisplayHardware/HWC2.h @@ -96,7 +96,7 @@ public: uint32_t getMaxVirtualDisplayCount() const; Error createVirtualDisplay(uint32_t width, uint32_t height, - android_pixel_format_t* format, Display** outDisplay); + android::ui::PixelFormat* format, Display** outDisplay); void destroyDisplay(hwc2_display_t displayId); void onHotplug(hwc2_display_t displayId, Connection connection); @@ -234,7 +234,7 @@ public: [[clang::warn_unused_result]] Error setClientTarget( uint32_t slot, const android::sp<android::GraphicBuffer>& target, const android::sp<android::Fence>& acquireFence, - android_dataspace_t dataspace); + android::ui::Dataspace dataspace); [[clang::warn_unused_result]] Error setColorMode( android::ui::ColorMode mode); [[clang::warn_unused_result]] Error setColorTransform( @@ -311,7 +311,7 @@ public: [[clang::warn_unused_result]] Error setColor(hwc_color_t color); [[clang::warn_unused_result]] Error setCompositionType(Composition type); [[clang::warn_unused_result]] Error setDataspace( - android_dataspace_t dataspace); + android::ui::Dataspace dataspace); [[clang::warn_unused_result]] Error setHdrMetadata(const android::HdrMetadata& metadata); [[clang::warn_unused_result]] Error setDisplayFrame( const android::Rect& frame); @@ -335,7 +335,7 @@ private: hwc2_display_t mDisplayId; hwc2_layer_t mId; - android_dataspace mDataSpace = HAL_DATASPACE_UNKNOWN; + android::ui::Dataspace mDataSpace = android::ui::Dataspace::UNKNOWN; android::HdrMetadata mHdrMetadata; std::function<void(Layer*)> mLayerDestroyedListener; }; diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 6bf2ee9362..29e2727b3e 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -179,7 +179,7 @@ bool HWComposer::onVsync(hwc2_display_t displayId, int64_t timestamp, } status_t HWComposer::allocateVirtualDisplay(uint32_t width, uint32_t height, - android_pixel_format_t* format, int32_t *outId) { + ui::PixelFormat* format, int32_t *outId) { if (mRemainingHwcVirtualDisplays == 0) { ALOGE("allocateVirtualDisplay: No remaining virtual displays"); return NO_MEMORY; @@ -387,7 +387,7 @@ void HWComposer::setVsyncEnabled(int32_t displayId, HWC2::Vsync enabled) { status_t HWComposer::setClientTarget(int32_t displayId, uint32_t slot, const sp<Fence>& acquireFence, const sp<GraphicBuffer>& target, - android_dataspace_t dataspace) { + ui::Dataspace dataspace) { if (!isValidDisplay(displayId)) { return BAD_INDEX; } diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h index 0366a0d164..6e2e156abd 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.h +++ b/services/surfaceflinger/DisplayHardware/HWComposer.h @@ -80,7 +80,7 @@ public: // Attempts to allocate a virtual display. If the virtual display is created // on the HWC device, outId will contain its HWC ID. status_t allocateVirtualDisplay(uint32_t width, uint32_t height, - android_pixel_format_t* format, int32_t* outId); + ui::PixelFormat* format, int32_t* outId); // Attempts to create a new layer on this display HWC2::Layer* createLayer(int32_t displayId); @@ -92,7 +92,7 @@ public: status_t setClientTarget(int32_t displayId, uint32_t slot, const sp<Fence>& acquireFence, - const sp<GraphicBuffer>& target, android_dataspace_t dataspace); + const sp<GraphicBuffer>& target, ui::Dataspace dataspace); // Present layers to the display and read releaseFences. status_t presentAndGetReleaseFences(int32_t displayId); diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index 3480b24390..9a2817dba1 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -222,7 +222,7 @@ status_t VirtualDisplaySurface::advanceFrame() { // TODO: Correctly propagate the dataspace from GL composition result = mHwc.setClientTarget(mDisplayId, hwcSlot, mFbFence, - hwcBuffer, HAL_DATASPACE_UNKNOWN); + hwcBuffer, ui::Dataspace::UNKNOWN); } return result; diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 166ac22fa2..9d356d86c7 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -42,6 +42,7 @@ #include <gui/LayerDebugInfo.h> #include <gui/Surface.h> +#include "BufferLayer.h" #include "Colorizer.h" #include "DisplayDevice.h" #include "Layer.h" @@ -121,7 +122,7 @@ Layer::Layer(SurfaceFlinger* flinger, const sp<Client>& client, const String8& n mCurrentState.layerStack = 0; mCurrentState.sequence = 0; mCurrentState.requested = mCurrentState.active; - mCurrentState.dataSpace = HAL_DATASPACE_UNKNOWN; + mCurrentState.dataSpace = ui::Dataspace::UNKNOWN; mCurrentState.appId = 0; mCurrentState.type = 0; @@ -635,6 +636,7 @@ void Layer::setGeometry(const sp<const DisplayDevice>& displayDevice, uint32_t z hwcInfo.forceClientComposition = true; } else { auto transform = static_cast<HWC2::Transform>(orientation); + hwcInfo.transform = transform; auto error = hwcLayer->setTransform(transform); ALOGE_IF(error != HWC2::Error::None, "[%s] Failed to set transform %s: " @@ -1325,7 +1327,7 @@ bool Layer::setLayerStack(uint32_t layerStack) { return true; } -bool Layer::setDataSpace(android_dataspace dataSpace) { +bool Layer::setDataSpace(ui::Dataspace dataSpace) { if (mCurrentState.dataSpace == dataSpace) return false; mCurrentState.sequence++; mCurrentState.dataSpace = dataSpace; @@ -1334,7 +1336,7 @@ bool Layer::setDataSpace(android_dataspace dataSpace) { return true; } -android_dataspace Layer::getDataSpace() const { +ui::Dataspace Layer::getDataSpace() const { return mCurrentState.dataSpace; } @@ -1430,7 +1432,7 @@ LayerDebugInfo Layer::getLayerDebugInfo() const { info.mColor = ds.color; info.mFlags = ds.flags; info.mPixelFormat = getPixelFormat(); - info.mDataSpace = getDataSpace(); + info.mDataSpace = static_cast<android_dataspace>(getDataSpace()); info.mMatrix[0][0] = ds.active.transform[0][0]; info.mMatrix[0][1] = ds.active.transform[0][1]; info.mMatrix[1][0] = ds.active.transform[1][0]; @@ -1893,7 +1895,7 @@ void Layer::writeToProto(LayerProto* layerInfo, LayerVector::StateSet stateSet) layerInfo->set_is_opaque(isOpaque(state)); layerInfo->set_invalidate(contentDirty); - layerInfo->set_dataspace(dataspaceDetails(getDataSpace())); + layerInfo->set_dataspace(dataspaceDetails(static_cast<android_dataspace>(getDataSpace()))); layerInfo->set_pixel_format(decodePixelFormat(getPixelFormat())); LayerProtoHelper::writeToProto(getColor(), layerInfo->mutable_color()); LayerProtoHelper::writeToProto(state.color, layerInfo->mutable_requested_color()); @@ -1923,6 +1925,31 @@ void Layer::writeToProto(LayerProto* layerInfo, LayerVector::StateSet stateSet) layerInfo->set_app_id(state.appId); } +void Layer::writeToProto(LayerProto* layerInfo, int32_t hwcId) { + writeToProto(layerInfo, LayerVector::StateSet::Drawing); + + const auto& hwcInfo = getBE().mHwcLayers.at(hwcId); + + const Rect& frame = hwcInfo.displayFrame; + LayerProtoHelper::writeToProto(frame, layerInfo->mutable_hwc_frame()); + + const FloatRect& crop = hwcInfo.sourceCrop; + LayerProtoHelper::writeToProto(crop, layerInfo->mutable_hwc_crop()); + + const int32_t transform = static_cast<int32_t>(hwcInfo.transform); + layerInfo->set_hwc_transform(transform); + + const int32_t compositionType = static_cast<int32_t>(hwcInfo.compositionType); + layerInfo->set_hwc_composition_type(compositionType); + + if (std::strcmp(getTypeId(), "BufferLayer") == 0 && + static_cast<BufferLayer*>(this)->isProtected()) { + layerInfo->set_is_protected(true); + } else { + layerInfo->set_is_protected(false); + } +} + // --------------------------------------------------------------------------- }; // namespace android diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 9a9b5e60c8..8d2a0488dc 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -113,7 +113,8 @@ public: layer(nullptr), forceClientComposition(false), compositionType(HWC2::Composition::Invalid), - clearClientTarget(false) {} + clearClientTarget(false), + transform(HWC2::Transform::None) {} HWComposer* hwc; HWC2::Layer* layer; @@ -123,6 +124,7 @@ public: Rect displayFrame; FloatRect sourceCrop; HWComposerBufferCache bufferCache; + HWC2::Transform transform; }; // A layer can be attached to multiple displays when operating in mirror mode @@ -205,7 +207,7 @@ public: // dependent. Region activeTransparentRegion; Region requestedTransparentRegion; - android_dataspace dataSpace; + ui::Dataspace dataSpace; int32_t appId; int32_t type; @@ -283,8 +285,8 @@ public: bool setTransparentRegionHint(const Region& transparent); bool setFlags(uint8_t flags, uint8_t mask); bool setLayerStack(uint32_t layerStack); - bool setDataSpace(android_dataspace dataSpace); - android_dataspace getDataSpace() const; + bool setDataSpace(ui::Dataspace dataSpace); + ui::Dataspace getDataSpace() const; uint32_t getLayerStack() const; void deferTransactionUntil(const sp<IBinder>& barrierHandle, uint64_t frameNumber); void deferTransactionUntil(const sp<Layer>& barrierLayer, uint64_t frameNumber); @@ -357,6 +359,8 @@ public: void writeToProto(LayerProto* layerInfo, LayerVector::StateSet stateSet = LayerVector::StateSet::Drawing); + void writeToProto(LayerProto* layerInfo, int32_t hwcId); + protected: /* * onDraw - draws the surface. diff --git a/services/surfaceflinger/LayerProtoHelper.cpp b/services/surfaceflinger/LayerProtoHelper.cpp index 6a33148d27..cc3955087a 100644 --- a/services/surfaceflinger/LayerProtoHelper.cpp +++ b/services/surfaceflinger/LayerProtoHelper.cpp @@ -37,6 +37,13 @@ void LayerProtoHelper::writeToProto(const Rect& rect, RectProto* rectProto) { rectProto->set_right(rect.right); } +void LayerProtoHelper::writeToProto(const FloatRect& rect, FloatRectProto* rectProto) { + rectProto->set_left(rect.left); + rectProto->set_top(rect.top); + rectProto->set_bottom(rect.bottom); + rectProto->set_right(rect.right); +} + void LayerProtoHelper::writeToProto(const half4 color, ColorProto* colorProto) { colorProto->set_r(color.r); colorProto->set_g(color.g); diff --git a/services/surfaceflinger/LayerProtoHelper.h b/services/surfaceflinger/LayerProtoHelper.h index 45a0b5d173..860da63ed2 100644 --- a/services/surfaceflinger/LayerProtoHelper.h +++ b/services/surfaceflinger/LayerProtoHelper.h @@ -29,6 +29,7 @@ namespace surfaceflinger { class LayerProtoHelper { public: static void writeToProto(const Rect& rect, RectProto* rectProto); + static void writeToProto(const FloatRect& rect, FloatRectProto* rectProto); static void writeToProto(const Region& region, RegionProto* regionProto); static void writeToProto(const half4 color, ColorProto* colorProto); static void writeToProto(const Transform& transform, TransformProto* transformProto); @@ -36,4 +37,4 @@ public: }; } // namespace surfaceflinger -} // namespace android
\ No newline at end of file +} // namespace android diff --git a/services/surfaceflinger/LayerStats.cpp b/services/surfaceflinger/LayerStats.cpp new file mode 100644 index 0000000000..38ea6edfc5 --- /dev/null +++ b/services/surfaceflinger/LayerStats.cpp @@ -0,0 +1,232 @@ +/* + * Copyright 2018 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. + */ +#undef LOG_TAG +#define LOG_TAG "LayerStats" +#define ATRACE_TAG ATRACE_TAG_GRAPHICS + +#include "LayerStats.h" +#include "DisplayHardware/HWComposer.h" +#include "ui/DebugUtils.h" + +#include <android-base/stringprintf.h> +#include <log/log.h> +#include <utils/String8.h> +#include <utils/Trace.h> + +namespace android { + +void LayerStats::enable() { + ATRACE_CALL(); + std::lock_guard<std::mutex> lock(mMutex); + if (mEnabled) return; + mLayerShapeStatsMap.clear(); + mEnabled = true; + ALOGD("Logging enabled"); +} + +void LayerStats::disable() { + ATRACE_CALL(); + std::lock_guard<std::mutex> lock(mMutex); + if (!mEnabled) return; + mEnabled = false; + ALOGD("Logging disabled"); +} + +void LayerStats::clear() { + ATRACE_CALL(); + std::lock_guard<std::mutex> lock(mMutex); + mLayerShapeStatsMap.clear(); + ALOGD("Cleared current layer stats"); +} + +bool LayerStats::isEnabled() { + return mEnabled; +} + +void LayerStats::traverseLayerTreeStatsLocked( + std::vector<std::unique_ptr<LayerProtoParser::Layer>> layerTree, + const LayerProtoParser::LayerGlobal* layerGlobal, std::vector<std::string>& layerShapeVec) { + for (std::unique_ptr<LayerProtoParser::Layer>& layer : layerTree) { + if (!layer) continue; + traverseLayerTreeStatsLocked(std::move(layer->children), layerGlobal, layerShapeVec); + std::string key = ""; + base::StringAppendF(&key, ",%s", layer->type.c_str()); + base::StringAppendF(&key, ",%s", layerCompositionType(layer->hwcCompositionType)); + base::StringAppendF(&key, ",%d", layer->isProtected); + base::StringAppendF(&key, ",%s", layerTransform(layer->hwcTransform)); + base::StringAppendF(&key, ",%s", layerPixelFormat(layer->activeBuffer.format)); + base::StringAppendF(&key, ",%s", layer->dataspace.c_str()); + base::StringAppendF(&key, ",%s", + destinationLocation(layer->hwcFrame.left, layerGlobal->resolution[0], + true)); + base::StringAppendF(&key, ",%s", + destinationLocation(layer->hwcFrame.top, layerGlobal->resolution[1], + false)); + base::StringAppendF(&key, ",%s", + destinationSize(layer->hwcFrame.right - layer->hwcFrame.left, + layerGlobal->resolution[0], true)); + base::StringAppendF(&key, ",%s", + destinationSize(layer->hwcFrame.bottom - layer->hwcFrame.top, + layerGlobal->resolution[1], false)); + base::StringAppendF(&key, ",%s", scaleRatioWH(layer.get()).c_str()); + base::StringAppendF(&key, ",%s", alpha(static_cast<float>(layer->color.a))); + + layerShapeVec.push_back(key); + ALOGV("%s", key.c_str()); + } +} + +void LayerStats::logLayerStats(const LayersProto& layersProto) { + ATRACE_CALL(); + ALOGV("Logging"); + auto layerGlobal = LayerProtoParser::generateLayerGlobalInfo(layersProto); + auto layerTree = LayerProtoParser::generateLayerTree(layersProto); + std::vector<std::string> layerShapeVec; + + std::lock_guard<std::mutex> lock(mMutex); + traverseLayerTreeStatsLocked(std::move(layerTree), &layerGlobal, layerShapeVec); + + std::string layerShapeKey = + base::StringPrintf("%d,%s,%s,%s", static_cast<int32_t>(layerShapeVec.size()), + layerGlobal.colorMode.c_str(), layerGlobal.colorTransform.c_str(), + layerTransform(layerGlobal.globalTransform)); + ALOGV("%s", layerShapeKey.c_str()); + + std::sort(layerShapeVec.begin(), layerShapeVec.end(), std::greater<std::string>()); + for (auto const& s : layerShapeVec) { + layerShapeKey += s; + } + + mLayerShapeStatsMap[layerShapeKey]++; +} + +void LayerStats::dump(String8& result) { + ATRACE_CALL(); + ALOGD("Dumping"); + std::lock_guard<std::mutex> lock(mMutex); + result.append("Frequency,LayerCount,ColorMode,ColorTransform,Orientation\n"); + result.append("LayerType,CompositionType,IsProtected,Transform,PixelFormat,Dataspace,"); + result.append("DstX,DstY,DstWidth,DstHeight,WScale,HScale,Alpha\n"); + for (auto& u : mLayerShapeStatsMap) { + result.appendFormat("%u,%s\n", u.second, u.first.c_str()); + } +} + +const char* LayerStats::destinationLocation(int32_t location, int32_t range, bool isHorizontal) { + static const char* locationArray[8] = {"0", "1/8", "1/4", "3/8", "1/2", "5/8", "3/4", "7/8"}; + int32_t ratio = location * 8 / range; + if (ratio < 0) return "N/A"; + if (isHorizontal) { + // X location is divided into 4 buckets {"0", "1/4", "1/2", "3/4"} + if (ratio > 6) return "3/4"; + // use index 0, 2, 4, 6 + return locationArray[ratio & ~1]; + } + if (ratio > 7) return "7/8"; + return locationArray[ratio]; +} + +const char* LayerStats::destinationSize(int32_t size, int32_t range, bool isWidth) { + static const char* sizeArray[8] = {"1/8", "1/4", "3/8", "1/2", "5/8", "3/4", "7/8", "1"}; + int32_t ratio = size * 8 / range; + if (ratio < 0) return "N/A"; + if (isWidth) { + // width is divided into 4 buckets {"1/4", "1/2", "3/4", "1"} + if (ratio > 6) return "1"; + // use index 1, 3, 5, 7 + return sizeArray[ratio | 1]; + } + if (ratio > 7) return "1"; + return sizeArray[ratio]; +} + +const char* LayerStats::layerTransform(int32_t transform) { + return getTransformName(static_cast<hwc_transform_t>(transform)); +} + +const char* LayerStats::layerCompositionType(int32_t compositionType) { + return getCompositionName(static_cast<hwc2_composition_t>(compositionType)); +} + +const char* LayerStats::layerPixelFormat(int32_t pixelFormat) { + return decodePixelFormat(pixelFormat).c_str(); +} + +std::string LayerStats::scaleRatioWH(const LayerProtoParser::Layer* layer) { + if (!layer->type.compare("ColorLayer")) return "N/A,N/A"; + std::string ret = ""; + if (isRotated(layer->hwcTransform)) { + ret += scaleRatio(layer->hwcFrame.right - layer->hwcFrame.left, + static_cast<int32_t>(layer->hwcCrop.bottom - layer->hwcCrop.top)); + ret += ","; + ret += scaleRatio(layer->hwcFrame.bottom - layer->hwcFrame.top, + static_cast<int32_t>(layer->hwcCrop.right - layer->hwcCrop.left)); + } else { + ret += scaleRatio(layer->hwcFrame.right - layer->hwcFrame.left, + static_cast<int32_t>(layer->hwcCrop.right - layer->hwcCrop.left)); + ret += ","; + ret += scaleRatio(layer->hwcFrame.bottom - layer->hwcFrame.top, + static_cast<int32_t>(layer->hwcCrop.bottom - layer->hwcCrop.top)); + } + return ret; +} + +const char* LayerStats::scaleRatio(int32_t destinationScale, int32_t sourceScale) { + // Make scale buckets from <1/64 to >= 16, to avoid floating point + // calculation, x64 on destinationScale first + int32_t scale = destinationScale * 64 / sourceScale; + if (!scale) return "<1/64"; + if (scale < 2) return "1/64"; + if (scale < 4) return "1/32"; + if (scale < 8) return "1/16"; + if (scale < 16) return "1/8"; + if (scale < 32) return "1/4"; + if (scale < 64) return "1/2"; + if (scale < 128) return "1"; + if (scale < 256) return "2"; + if (scale < 512) return "4"; + if (scale < 1024) return "8"; + return ">=16"; +} + +const char* LayerStats::alpha(float a) { + if (a == 1.0f) return "1.0"; + if (a > 0.9f) return "0.99"; + if (a > 0.8f) return "0.9"; + if (a > 0.7f) return "0.8"; + if (a > 0.6f) return "0.7"; + if (a > 0.5f) return "0.6"; + if (a > 0.4f) return "0.5"; + if (a > 0.3f) return "0.4"; + if (a > 0.2f) return "0.3"; + if (a > 0.1f) return "0.2"; + if (a > 0.0f) return "0.1"; + return "0.0"; +} + +bool LayerStats::isRotated(int32_t transform) { + return transform & HWC_TRANSFORM_ROT_90; +} + +bool LayerStats::isVFlipped(int32_t transform) { + return transform & HWC_TRANSFORM_FLIP_V; +} + +bool LayerStats::isHFlipped(int32_t transform) { + return transform & HWC_TRANSFORM_FLIP_H; +} + +} // namespace android diff --git a/services/surfaceflinger/LayerStats.h b/services/surfaceflinger/LayerStats.h new file mode 100644 index 0000000000..7871fc6602 --- /dev/null +++ b/services/surfaceflinger/LayerStats.h @@ -0,0 +1,76 @@ +/* + * Copyright 2018 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. + */ + +#pragma once + +#include <layerproto/LayerProtoHeader.h> +#include <layerproto/LayerProtoParser.h> +#include <mutex> +#include <unordered_map> + +using namespace android::surfaceflinger; + +namespace android { +class String8; + +class LayerStats { +public: + void enable(); + void disable(); + void clear(); + bool isEnabled(); + void logLayerStats(const LayersProto& layersProto); + void dump(String8& result); + +private: + // Traverse layer tree to get all visible layers' stats + void traverseLayerTreeStatsLocked( + std::vector<std::unique_ptr<LayerProtoParser::Layer>> layerTree, + const LayerProtoParser::LayerGlobal* layerGlobal, + std::vector<std::string>& layerShapeVec); + // Convert layer's top-left position into 8x8 percentage of the display + static const char* destinationLocation(int32_t location, int32_t range, bool isHorizontal); + // Convert layer's size into 8x8 percentage of the display + static const char* destinationSize(int32_t size, int32_t range, bool isWidth); + // Return the name of the transform + static const char* layerTransform(int32_t transform); + // Return the name of the composition type + static const char* layerCompositionType(int32_t compositionType); + // Return the name of the pixel format + static const char* layerPixelFormat(int32_t pixelFormat); + // Calculate scale ratios of layer's width/height with rotation information + static std::string scaleRatioWH(const LayerProtoParser::Layer* layer); + // Calculate scale ratio from source to destination and convert to string + static const char* scaleRatio(int32_t destinationScale, int32_t sourceScale); + // Bucket the alpha into designed buckets + static const char* alpha(float a); + // Return whether the original buffer is rotated in final composition + static bool isRotated(int32_t transform); + // Return whether the original buffer is V-flipped in final composition + static bool isVFlipped(int32_t transform); + // Return whether the original buffer is H-flipped in final composition + static bool isHFlipped(int32_t transform); + + bool mEnabled = false; + // Protect mLayersStatsMap + std::mutex mMutex; + // Hashmap for tracking the frame(layer shape) stats + // KEY is a concatenation of all layers' properties within a frame + // VALUE is the number of times this particular set has been scanned out + std::unordered_map<std::string, uint32_t> mLayerShapeStatsMap; +}; + +} // namespace android diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp index ea7dc2f1fd..1eda900f47 100644 --- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp @@ -109,6 +109,8 @@ namespace RE { namespace impl { // --------------------------------------------------------------------------- +using ui::Dataspace; + GLES20RenderEngine::GLES20RenderEngine(uint32_t featureFlags) : mVpWidth(0), mVpHeight(0), mPlatformHasWideColor((featureFlags & WIDE_COLOR_SUPPORT) != 0) { glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize); @@ -214,11 +216,11 @@ void GLES20RenderEngine::setSourceY410BT2020(bool enable) { mState.setY410BT2020(enable); } -void GLES20RenderEngine::setSourceDataSpace(android_dataspace source) { +void GLES20RenderEngine::setSourceDataSpace(Dataspace source) { mDataSpace = source; } -void GLES20RenderEngine::setOutputDataSpace(android_dataspace dataspace) { +void GLES20RenderEngine::setOutputDataSpace(Dataspace dataspace) { mOutputDataSpace = dataspace; } @@ -301,14 +303,14 @@ void GLES20RenderEngine::drawMesh(const Mesh& mesh) { mesh.getByteStride(), mesh.getPositions()); // DISPLAY_P3 is the only supported wide color output - if (mPlatformHasWideColor && mOutputDataSpace == HAL_DATASPACE_DISPLAY_P3) { + if (mPlatformHasWideColor && mOutputDataSpace == Dataspace::DISPLAY_P3) { Description wideColorState = mState; - switch (int(mDataSpace)) { - case HAL_DATASPACE_DISPLAY_P3: + switch (mDataSpace) { + case Dataspace::DISPLAY_P3: // input matches output break; - case HAL_DATASPACE_BT2020_PQ: - case HAL_DATASPACE_BT2020_ITU_PQ: + case Dataspace::BT2020_PQ: + case Dataspace::BT2020_ITU_PQ: wideColorState.setColorMatrix(mState.getColorMatrix() * mBt2020ToDisplayP3); wideColorState.setInputTransferFunction(Description::TransferFunction::ST2084); wideColorState.setOutputTransferFunction(Description::TransferFunction::SRGB); @@ -317,7 +319,7 @@ void GLES20RenderEngine::drawMesh(const Mesh& mesh) { default: // treat all other dataspaces as sRGB wideColorState.setColorMatrix(mState.getColorMatrix() * mSrgbToDisplayP3); - if ((mDataSpace & HAL_DATASPACE_TRANSFER_MASK) == HAL_DATASPACE_TRANSFER_LINEAR) { + if ((mDataSpace & Dataspace::TRANSFER_MASK) & Dataspace::TRANSFER_LINEAR) { wideColorState.setInputTransferFunction(Description::TransferFunction::LINEAR); } else { wideColorState.setInputTransferFunction(Description::TransferFunction::SRGB); @@ -350,8 +352,8 @@ void GLES20RenderEngine::drawMesh(const Mesh& mesh) { void GLES20RenderEngine::dump(String8& result) { RenderEngine::dump(result); result.appendFormat("RenderEngine last dataspace conversion: (%s) to (%s)\n", - dataspaceDetails(mDataSpace).c_str(), - dataspaceDetails(mOutputDataSpace).c_str()); + dataspaceDetails(static_cast<android_dataspace>(mDataSpace)).c_str(), + dataspaceDetails(static_cast<android_dataspace>(mOutputDataSpace)).c_str()); } // --------------------------------------------------------------------------- diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.h b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.h index db3f79281e..99da19d6b1 100644 --- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.h +++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.h @@ -73,14 +73,14 @@ protected: // Color management related functions and state void setSourceY410BT2020(bool enable) override; - void setSourceDataSpace(android_dataspace source) override; - void setOutputDataSpace(android_dataspace dataspace) override; + void setSourceDataSpace(ui::Dataspace source) override; + void setOutputDataSpace(ui::Dataspace dataspace) override; // Current dataspace of layer being rendered - android_dataspace mDataSpace = HAL_DATASPACE_UNKNOWN; + ui::Dataspace mDataSpace = ui::Dataspace::UNKNOWN; // Current output dataspace of the render engine - android_dataspace mOutputDataSpace = HAL_DATASPACE_UNKNOWN; + ui::Dataspace mOutputDataSpace = ui::Dataspace::UNKNOWN; // Currently only supporting sRGB, BT2020 and DisplayP3 color spaces const bool mPlatformHasWideColor = false; diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.h b/services/surfaceflinger/RenderEngine/RenderEngine.h index d1405740e6..f78b230778 100644 --- a/services/surfaceflinger/RenderEngine/RenderEngine.h +++ b/services/surfaceflinger/RenderEngine/RenderEngine.h @@ -119,8 +119,8 @@ public: // wide color support virtual void setSourceY410BT2020(bool enable) = 0; - virtual void setSourceDataSpace(android_dataspace source) = 0; - virtual void setOutputDataSpace(android_dataspace dataspace) = 0; + virtual void setSourceDataSpace(ui::Dataspace source) = 0; + virtual void setOutputDataSpace(ui::Dataspace dataspace) = 0; // drawing virtual void drawMesh(const Mesh& mesh) = 0; diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index f180a3b285..bf76ef5d3e 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -105,6 +105,7 @@ namespace android { using namespace android::hardware::configstore; using namespace android::hardware::configstore::V1_0; using ui::ColorMode; +using ui::Dataspace; namespace { class ConditionalLock { @@ -1484,6 +1485,7 @@ void SurfaceFlinger::handleMessageRefresh() { setUpHWComposer(); doDebugFlashRegions(); doTracing("handleRefresh"); + logLayerStats(); doComposition(); postComposition(refreshStartTime); @@ -1553,6 +1555,25 @@ void SurfaceFlinger::doTracing(const char* where) { } } +void SurfaceFlinger::logLayerStats() { + ATRACE_CALL(); + if (CC_UNLIKELY(mLayerStats.isEnabled())) { + int32_t hwcId = -1; + for (size_t dpy = 0; dpy < mDisplays.size(); ++dpy) { + const sp<const DisplayDevice>& displayDevice(mDisplays[dpy]); + if (displayDevice->isPrimary()) { + hwcId = displayDevice->getHwcDisplayId(); + break; + } + } + if (hwcId < 0) { + ALOGE("LayerStats: Hmmm, no primary display?"); + return; + } + mLayerStats.logLayerStats(dumpVisibleLayersProtoInfo(hwcId)); + } +} + void SurfaceFlinger::preComposition(nsecs_t refreshStartTime) { ATRACE_CALL(); @@ -1817,7 +1838,7 @@ mat4 SurfaceFlinger::computeSaturationMatrix() const { // pickColorMode translates a given dataspace into the best available color mode. // Currently only support sRGB and Display-P3. -ColorMode SurfaceFlinger::pickColorMode(android_dataspace dataSpace) const { +ColorMode SurfaceFlinger::pickColorMode(Dataspace dataSpace) const { if (mForceNativeColorMode) { return ColorMode::NATIVE; } @@ -1825,47 +1846,48 @@ ColorMode SurfaceFlinger::pickColorMode(android_dataspace dataSpace) const { switch (dataSpace) { // treat Unknown as regular SRGB buffer, since that's what the rest of the // system expects. - case HAL_DATASPACE_UNKNOWN: - case HAL_DATASPACE_SRGB: - case HAL_DATASPACE_V0_SRGB: + case Dataspace::UNKNOWN: + case Dataspace::SRGB: + case Dataspace::V0_SRGB: return ColorMode::SRGB; break; - case HAL_DATASPACE_DISPLAY_P3: + case Dataspace::DISPLAY_P3: return ColorMode::DISPLAY_P3; break; default: // TODO (courtneygo): Do we want to assert an error here? - ALOGE("No color mode mapping for %s (%#x)", dataspaceDetails(dataSpace).c_str(), + ALOGE("No color mode mapping for %s (%#x)", + dataspaceDetails(static_cast<android_dataspace>(dataSpace)).c_str(), dataSpace); return ColorMode::SRGB; break; } } -android_dataspace SurfaceFlinger::bestTargetDataSpace( - android_dataspace a, android_dataspace b, bool hasHdr) const { +Dataspace SurfaceFlinger::bestTargetDataSpace( + Dataspace a, Dataspace b, bool hasHdr) const { // Only support sRGB and Display-P3 right now. - if (a == HAL_DATASPACE_DISPLAY_P3 || b == HAL_DATASPACE_DISPLAY_P3) { - return HAL_DATASPACE_DISPLAY_P3; + if (a == Dataspace::DISPLAY_P3 || b == Dataspace::DISPLAY_P3) { + return Dataspace::DISPLAY_P3; } - if (a == HAL_DATASPACE_V0_SCRGB_LINEAR || b == HAL_DATASPACE_V0_SCRGB_LINEAR) { - return HAL_DATASPACE_DISPLAY_P3; + if (a == Dataspace::V0_SCRGB_LINEAR || b == Dataspace::V0_SCRGB_LINEAR) { + return Dataspace::DISPLAY_P3; } - if (a == HAL_DATASPACE_V0_SCRGB || b == HAL_DATASPACE_V0_SCRGB) { - return HAL_DATASPACE_DISPLAY_P3; + if (a == Dataspace::V0_SCRGB || b == Dataspace::V0_SCRGB) { + return Dataspace::DISPLAY_P3; } if (!hasHdr) { - if (a == HAL_DATASPACE_BT2020_PQ || b == HAL_DATASPACE_BT2020_PQ) { - return HAL_DATASPACE_DISPLAY_P3; + if (a == Dataspace::BT2020_PQ || b == Dataspace::BT2020_PQ) { + return Dataspace::DISPLAY_P3; } - if (a == HAL_DATASPACE_BT2020_ITU_PQ || b == HAL_DATASPACE_BT2020_ITU_PQ) { - return HAL_DATASPACE_DISPLAY_P3; + if (a == Dataspace::BT2020_ITU_PQ || b == Dataspace::BT2020_ITU_PQ) { + return Dataspace::DISPLAY_P3; } } - return HAL_DATASPACE_V0_SRGB; + return Dataspace::V0_SRGB; } void SurfaceFlinger::setUpHWComposer() { @@ -1940,13 +1962,14 @@ void SurfaceFlinger::setUpHWComposer() { continue; } if (colorMatrix != mPreviousColorMatrix) { + displayDevice->setColorTransform(colorMatrix); status_t result = getBE().mHwc->setColorTransform(hwcId, colorMatrix); ALOGE_IF(result != NO_ERROR, "Failed to set color transform on " "display %zd: %d", displayId, result); } for (auto& layer : displayDevice->getVisibleLayersSortedByZ()) { - if ((layer->getDataSpace() == HAL_DATASPACE_BT2020_PQ || - layer->getDataSpace() == HAL_DATASPACE_BT2020_ITU_PQ) && + if ((layer->getDataSpace() == Dataspace::BT2020_PQ || + layer->getDataSpace() == Dataspace::BT2020_ITU_PQ) && !displayDevice->getHdrSupport()) { layer->forceClientComposition(hwcId); } @@ -1962,14 +1985,14 @@ void SurfaceFlinger::setUpHWComposer() { if (hasWideColorDisplay) { ColorMode newColorMode; - android_dataspace newDataSpace = HAL_DATASPACE_V0_SRGB; + Dataspace newDataSpace = Dataspace::V0_SRGB; for (auto& layer : displayDevice->getVisibleLayersSortedByZ()) { newDataSpace = bestTargetDataSpace(layer->getDataSpace(), newDataSpace, displayDevice->getHdrSupport()); ALOGV("layer: %s, dataspace: %s (%#x), newDataSpace: %s (%#x)", - layer->getName().string(), dataspaceDetails(layer->getDataSpace()).c_str(), - layer->getDataSpace(), dataspaceDetails(newDataSpace).c_str(), newDataSpace); + layer->getName().string(), dataspaceDetails(static_cast<android_dataspace>(layer->getDataSpace())).c_str(), + layer->getDataSpace(), dataspaceDetails(static_cast<android_dataspace>(newDataSpace)).c_str(), newDataSpace); } newColorMode = pickColorMode(newDataSpace); @@ -2247,7 +2270,7 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal( defaultColorMode = ColorMode::SRGB; } setActiveColorModeInternal(hw, defaultColorMode); - hw->setCompositionDataSpace(HAL_DATASPACE_UNKNOWN); + hw->setCompositionDataSpace(Dataspace::UNKNOWN); hw->setLayerStack(state.layerStack); hw->setProjection(state.orientation, state.viewport, state.frame); hw->setDisplayName(state.displayName); @@ -2350,7 +2373,7 @@ void SurfaceFlinger::processDisplayChangesLocked() { int intFormat = 0; status = state.surface->query(NATIVE_WINDOW_FORMAT, &intFormat); ALOGE_IF(status != NO_ERROR, "Unable to query format (%d)", status); - auto format = static_cast<android_pixel_format_t>(intFormat); + auto format = static_cast<ui::PixelFormat>(intFormat); getBE().mHwc->allocateVirtualDisplay(width, height, &format, &hwcId); } @@ -2424,7 +2447,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags) processDisplayHotplugEventsLocked(); } - if (transactionFlags & (eTraversalNeeded|eDisplayTransactionNeeded)) { + if (transactionFlags & (eDisplayLayerStackChanged|eDisplayTransactionNeeded)) { // The transform hint might have changed for some layers // (either because a display has changed, or because a layer // as changed). @@ -2471,18 +2494,18 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags) } } - if (transactionFlags & eDisplayTransactionNeeded) { - if (disp == nullptr) { - // NOTE: TEMPORARY FIX ONLY. Real fix should cause layers to - // redraw after transform hint changes. See bug 8508397. + if (disp == nullptr) { + // NOTE: TEMPORARY FIX ONLY. Real fix should cause layers to + // redraw after transform hint changes. See bug 8508397. - // could be null when this layer is using a layerStack - // that is not visible on any display. Also can occur at - // screen off/on times. - disp = getDefaultDisplayDeviceLocked(); - } - layer->updateTransformHint(disp); + // could be null when this layer is using a layerStack + // that is not visible on any display. Also can occur at + // screen off/on times. + disp = getDefaultDisplayDeviceLocked(); } + + // disp can be null if there is no display available at all to get + // the transform hint from. if (disp != nullptr) { layer->updateTransformHint(disp); } @@ -2811,10 +2834,10 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& displayDev if (hasClientComposition) { ALOGV("hasClientComposition"); - android_dataspace outputDataspace = HAL_DATASPACE_UNKNOWN; + Dataspace outputDataspace = Dataspace::UNKNOWN; if (displayDevice->getWideColorSupport() && displayDevice->getActiveColorMode() == ColorMode::DISPLAY_P3) { - outputDataspace = HAL_DATASPACE_DISPLAY_P3; + outputDataspace = Dataspace::DISPLAY_P3; } getBE().mRenderEngine->setOutputDataSpace(outputDataspace); @@ -3317,7 +3340,7 @@ uint32_t SurfaceFlinger::setClientStateLocked(const ComposerState& composerState mCurrentState.layersSortedByZ.add(layer); // we need traversal (state changed) // AND transaction (list changed) - flags |= eTransactionNeeded|eTraversalNeeded; + flags |= eTransactionNeeded|eTraversalNeeded|eDisplayLayerStackChanged; } } if (what & layer_state_t::eDeferTransaction) { @@ -3772,6 +3795,34 @@ status_t SurfaceFlinger::doDump(int fd, const Vector<String16>& args, bool asPro dumpWideColorInfo(result); dumpAll = false; } + + if ((index < numArgs) && + (args[index] == String16("--enable-layer-stats"))) { + index++; + mLayerStats.enable(); + dumpAll = false; + } + + if ((index < numArgs) && + (args[index] == String16("--disable-layer-stats"))) { + index++; + mLayerStats.disable(); + dumpAll = false; + } + + if ((index < numArgs) && + (args[index] == String16("--clear-layer-stats"))) { + index++; + mLayerStats.clear(); + dumpAll = false; + } + + if ((index < numArgs) && + (args[index] == String16("--dump-layer-stats"))) { + index++; + mLayerStats.dump(result); + dumpAll = false; + } } if (dumpAll) { @@ -3979,6 +4030,29 @@ LayersProto SurfaceFlinger::dumpProtoInfo(LayerVector::StateSet stateSet) const return layersProto; } +LayersProto SurfaceFlinger::dumpVisibleLayersProtoInfo(int32_t hwcId) const { + LayersProto layersProto; + const sp<DisplayDevice>& displayDevice(mDisplays[hwcId]); + + SizeProto* resolution = layersProto.mutable_resolution(); + resolution->set_w(displayDevice->getWidth()); + resolution->set_h(displayDevice->getHeight()); + + layersProto.set_color_mode(decodeColorMode(displayDevice->getActiveColorMode())); + layersProto.set_color_transform(decodeColorTransform(displayDevice->getColorTransform())); + layersProto.set_global_transform( + static_cast<int32_t>(displayDevice->getOrientationTransform())); + + mDrawingState.traverseInZOrder([&](Layer* layer) { + if (!layer->visibleRegion.isEmpty() && layer->getBE().mHwcLayers.count(hwcId)) { + LayerProto* layerProto = layersProto.add_layers(); + layer->writeToProto(layerProto, hwcId); + } + }); + + return layersProto; +} + void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index, String8& result) const { @@ -4730,10 +4804,10 @@ void SurfaceFlinger::renderScreenImplLocked(const RenderArea& renderArea, ALOGE("Invalid crop rect: b = %d (> %d)", sourceCrop.bottom, raHeight); } - android_dataspace outputDataspace = HAL_DATASPACE_UNKNOWN; + Dataspace outputDataspace = Dataspace::UNKNOWN; if (renderArea.getWideColorSupport() && renderArea.getActiveColorMode() == ColorMode::DISPLAY_P3) { - outputDataspace = HAL_DATASPACE_DISPLAY_P3; + outputDataspace = Dataspace::DISPLAY_P3; } getBE().mRenderEngine->setOutputDataSpace(outputDataspace); diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 448509bc8f..89c9cfda19 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -55,6 +55,7 @@ #include "DisplayDevice.h" #include "DispSync.h" #include "FrameTracker.h" +#include "LayerStats.h" #include "LayerVector.h" #include "MessageQueue.h" #include "SurfaceInterceptor.h" @@ -115,7 +116,8 @@ enum { eTransactionNeeded = 0x01, eTraversalNeeded = 0x02, eDisplayTransactionNeeded = 0x04, - eTransactionMask = 0x07 + eDisplayLayerStackChanged = 0x08, + eTransactionMask = 0x0f, }; // A thin interface to abstract creating instances of Surface (gui/Surface.h) to @@ -635,8 +637,8 @@ private: // Given a dataSpace, returns the appropriate color_mode to use // to display that dataSpace. - ui::ColorMode pickColorMode(android_dataspace dataSpace) const; - android_dataspace bestTargetDataSpace(android_dataspace a, android_dataspace b, + ui::ColorMode pickColorMode(ui::Dataspace dataSpace) const; + ui::Dataspace bestTargetDataSpace(ui::Dataspace a, ui::Dataspace b, bool hasHdr) const; mat4 computeSaturationMatrix() const; @@ -645,6 +647,7 @@ private: void doComposition(); void doDebugFlashRegions(); void doTracing(const char* where); + void logLayerStats(); void doDisplayComposition(const sp<const DisplayDevice>& displayDevice, const Region& dirtyRegion); // compose surfaces for display hw. this fails if using GL and the surface @@ -711,6 +714,7 @@ private: void dumpBufferingStats(String8& result) const; void dumpWideColorInfo(String8& result) const; LayersProto dumpProtoInfo(LayerVector::StateSet stateSet) const; + LayersProto dumpVisibleLayersProtoInfo(int32_t hwcId) const; bool isLayerTripleBufferingDisabled() const { return this->mLayerTripleBufferingDisabled; @@ -797,6 +801,7 @@ private: std::unique_ptr<SurfaceInterceptor> mInterceptor = std::make_unique<impl::SurfaceInterceptor>(this); SurfaceTracing mTracing; + LayerStats mLayerStats; bool mUseHwcVirtualDisplays = false; // Restrict layers to use two buffers in their bufferqueues. diff --git a/services/surfaceflinger/layerproto/LayerProtoParser.cpp b/services/surfaceflinger/layerproto/LayerProtoParser.cpp index 1383d288b9..fcf42f00a9 100644 --- a/services/surfaceflinger/layerproto/LayerProtoParser.cpp +++ b/services/surfaceflinger/layerproto/LayerProtoParser.cpp @@ -42,6 +42,16 @@ bool sortLayerUniquePtrs(const std::unique_ptr<LayerProtoParser::Layer>& lhs, return sortLayers(lhs.get(), rhs.get()); } +const LayerProtoParser::LayerGlobal LayerProtoParser::generateLayerGlobalInfo( + const LayersProto& layersProto) { + LayerGlobal layerGlobal; + layerGlobal.resolution = {layersProto.resolution().w(), layersProto.resolution().h()}; + layerGlobal.colorMode = layersProto.color_mode(); + layerGlobal.colorTransform = layersProto.color_transform(); + layerGlobal.globalTransform = layersProto.global_transform(); + return layerGlobal; +} + std::vector<std::unique_ptr<LayerProtoParser::Layer>> LayerProtoParser::generateLayerTree( const LayersProto& layersProto) { std::unordered_map<int32_t, LayerProtoParser::Layer*> layerMap = generateMap(layersProto); @@ -106,8 +116,13 @@ LayerProtoParser::Layer* LayerProtoParser::generateLayer(const LayerProto& layer layer->activeBuffer = generateActiveBuffer(layerProto.active_buffer()); layer->queuedFrames = layerProto.queued_frames(); layer->refreshPending = layerProto.refresh_pending(); + layer->hwcFrame = generateRect(layerProto.hwc_frame()); + layer->hwcCrop = generateFloatRect(layerProto.hwc_crop()); + layer->hwcTransform = layerProto.hwc_transform(); layer->windowType = layerProto.window_type(); layer->appId = layerProto.app_id(); + layer->hwcCompositionType = layerProto.hwc_composition_type(); + layer->isProtected = layerProto.is_protected(); return layer; } @@ -133,6 +148,16 @@ LayerProtoParser::Rect LayerProtoParser::generateRect(const RectProto& rectProto return rect; } +LayerProtoParser::FloatRect LayerProtoParser::generateFloatRect(const FloatRectProto& rectProto) { + LayerProtoParser::FloatRect rect; + rect.left = rectProto.left(); + rect.top = rectProto.top(); + rect.right = rectProto.right(); + rect.bottom = rectProto.bottom(); + + return rect; +} + LayerProtoParser::Transform LayerProtoParser::generateTransform( const TransformProto& transformProto) { LayerProtoParser::Transform transform; @@ -246,6 +271,10 @@ std::string LayerProtoParser::Rect::to_string() const { return StringPrintf("[%3d, %3d, %3d, %3d]", left, top, right, bottom); } +std::string LayerProtoParser::FloatRect::to_string() const { + return StringPrintf("[%.2f, %.2f, %.2f, %.2f]", left, top, right, bottom); +} + std::string LayerProtoParser::Region::to_string(const char* what) const { std::string result = StringPrintf(" Region %s (this=%lx count=%d)\n", what, static_cast<unsigned long>(id), diff --git a/services/surfaceflinger/layerproto/include/layerproto/LayerProtoParser.h b/services/surfaceflinger/layerproto/include/layerproto/LayerProtoParser.h index b56a6fbb97..74a6f28f2b 100644 --- a/services/surfaceflinger/layerproto/include/layerproto/LayerProtoParser.h +++ b/services/surfaceflinger/layerproto/include/layerproto/LayerProtoParser.h @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#pragma once #include <layerproto/LayerProtoHeader.h> @@ -57,6 +58,16 @@ public: std::string to_string() const; }; + class FloatRect { + public: + float left; + float top; + float right; + float bottom; + + std::string to_string() const; + }; + class Region { public: uint64_t id; @@ -96,12 +107,26 @@ public: LayerProtoParser::ActiveBuffer activeBuffer; int32_t queuedFrames; bool refreshPending; + LayerProtoParser::Rect hwcFrame; + LayerProtoParser::FloatRect hwcCrop; + int32_t hwcTransform; int32_t windowType; int32_t appId; + int32_t hwcCompositionType; + bool isProtected; std::string to_string() const; }; + class LayerGlobal { + public: + int2 resolution; + std::string colorMode; + std::string colorTransform; + int32_t globalTransform; + }; + + static const LayerGlobal generateLayerGlobalInfo(const LayersProto& layersProto); static std::vector<std::unique_ptr<Layer>> generateLayerTree(const LayersProto& layersProto); static std::string layersToString(std::vector<std::unique_ptr<LayerProtoParser::Layer>> layers); @@ -110,6 +135,7 @@ private: static LayerProtoParser::Layer* generateLayer(const LayerProto& layerProto); static LayerProtoParser::Region generateRegion(const RegionProto& regionProto); static LayerProtoParser::Rect generateRect(const RectProto& rectProto); + static LayerProtoParser::FloatRect generateFloatRect(const FloatRectProto& rectProto); static LayerProtoParser::Transform generateTransform(const TransformProto& transformProto); static LayerProtoParser::ActiveBuffer generateActiveBuffer( const ActiveBufferProto& activeBufferProto); diff --git a/services/surfaceflinger/layerproto/layers.proto b/services/surfaceflinger/layerproto/layers.proto index f18386b1ac..77c6675b7f 100644 --- a/services/surfaceflinger/layerproto/layers.proto +++ b/services/surfaceflinger/layerproto/layers.proto @@ -7,6 +7,10 @@ package android.surfaceflinger; // Contains a list of all layers. message LayersProto { repeated LayerProto layers = 1; + optional SizeProto resolution = 2; + optional string color_mode = 3; + optional string color_transform = 4; + optional int32 global_transform = 5; } // Information about each layer. @@ -64,8 +68,18 @@ message LayerProto { // The number of frames available. optional int32 queued_frames = 28; optional bool refresh_pending = 29; - optional int32 window_type = 30; - optional int32 app_id = 31; + // The layer's composer backend destination frame + optional RectProto hwc_frame = 30; + // The layer's composer backend source crop + optional FloatRectProto hwc_crop = 31; + // The layer's composer backend transform + optional int32 hwc_transform = 32; + optional int32 window_type = 33; + optional int32 app_id = 34; + // The layer's composition type + optional int32 hwc_composition_type = 35; + // If it's a buffer layer, indicate if the content is protected + optional bool is_protected = 36; } message PositionProto { @@ -97,6 +111,13 @@ message RectProto { optional int32 bottom = 4; } +message FloatRectProto { + optional float left = 1; + optional float top = 2; + optional float right = 3; + optional float bottom = 4; +} + message ActiveBufferProto { optional uint32 width = 1; optional uint32 height = 2; @@ -109,4 +130,4 @@ message ColorProto { optional float g = 2; optional float b = 3; optional float a = 4; -}
\ No newline at end of file +} diff --git a/services/surfaceflinger/tests/hwc2/Android.bp b/services/surfaceflinger/tests/hwc2/Android.bp index e980522702..6c0e4abcfe 100644 --- a/services/surfaceflinger/tests/hwc2/Android.bp +++ b/services/surfaceflinger/tests/hwc2/Android.bp @@ -42,6 +42,7 @@ cc_test { ], shared_libs: [ "android.hardware.graphics.common@1.0", + "android.hardware.graphics.common@1.1", "libcutils", "libEGL", "libGLESv2", diff --git a/services/surfaceflinger/tests/hwc2/Hwc2Test.cpp b/services/surfaceflinger/tests/hwc2/Hwc2Test.cpp index b3f1b69f71..13774b4ed3 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2Test.cpp +++ b/services/surfaceflinger/tests/hwc2/Hwc2Test.cpp @@ -36,6 +36,7 @@ #include "Hwc2TestVirtualDisplay.h" using android::ui::ColorMode; +using android::ui::Dataspace; void hwc2TestHotplugCallback(hwc2_callback_data_t callbackData, hwc2_display_t display, int32_t connected); @@ -442,14 +443,14 @@ public: } void setLayerDataspace(hwc2_display_t display, hwc2_layer_t layer, - android_dataspace_t dataspace, hwc2_error_t* outErr = nullptr) + Dataspace dataspace, hwc2_error_t* outErr = nullptr) { auto pfn = reinterpret_cast<HWC2_PFN_SET_LAYER_DATASPACE>( getFunction(HWC2_FUNCTION_SET_LAYER_DATASPACE)); ASSERT_TRUE(pfn) << "failed to get function"; auto err = static_cast<hwc2_error_t>(pfn(mHwc2Device, display, - layer, dataspace)); + layer, static_cast<int>(dataspace))); if (outErr) { *outErr = err; } else { @@ -790,14 +791,14 @@ public: void getClientTargetSupport(hwc2_display_t display, int32_t width, int32_t height, android_pixel_format_t format, - android_dataspace_t dataspace, hwc2_error_t* outErr = nullptr) + Dataspace dataspace, hwc2_error_t* outErr = nullptr) { auto pfn = reinterpret_cast<HWC2_PFN_GET_CLIENT_TARGET_SUPPORT>( getFunction(HWC2_FUNCTION_GET_CLIENT_TARGET_SUPPORT)); ASSERT_TRUE(pfn) << "failed to get function"; auto err = static_cast<hwc2_error_t>(pfn(mHwc2Device, display, width, - height, format, dataspace)); + height, format, static_cast<int>(dataspace))); if (outErr) { *outErr = err; } else { @@ -807,7 +808,7 @@ public: } void setClientTarget(hwc2_display_t display, buffer_handle_t handle, - int32_t acquireFence, android_dataspace_t dataspace, + int32_t acquireFence, Dataspace dataspace, hwc_region_t damage, hwc2_error_t* outErr = nullptr) { auto pfn = reinterpret_cast<HWC2_PFN_SET_CLIENT_TARGET>( @@ -815,7 +816,7 @@ public: ASSERT_TRUE(pfn) << "failed to get function"; auto err = static_cast<hwc2_error_t>(pfn(mHwc2Device, display, handle, - acquireFence, dataspace, damage)); + acquireFence, static_cast<int>(dataspace), damage)); if (outErr) { *outErr = err; } else { @@ -1691,7 +1692,7 @@ protected: const std::set<hwc2_layer_t>& clearLayers, bool flipClientTarget, const Area& displayArea) { - android_dataspace_t dataspace = HAL_DATASPACE_UNKNOWN; + Dataspace dataspace = Dataspace::UNKNOWN; hwc_region_t damage = { }; buffer_handle_t handle; int32_t acquireFence; @@ -3716,7 +3717,7 @@ TEST_F(Hwc2Test, GET_CLIENT_TARGET_SUPPORT_unsupported) * layer. */ TEST_F(Hwc2Test, SET_CLIENT_TARGET_basic) { - const android_dataspace_t dataspace = HAL_DATASPACE_UNKNOWN; + const Dataspace dataspace = Dataspace::UNKNOWN; const hwc_region_t damage = { }; const size_t layerCnt = 1; @@ -3795,7 +3796,7 @@ TEST_F(Hwc2Test, SET_CLIENT_TARGET_bad_display) std::set<hwc2_layer_t> clientLayers; std::set<hwc2_layer_t> flipClientTargetLayers; bool flipClientTarget = true; - const android_dataspace_t dataspace = HAL_DATASPACE_UNKNOWN; + const Dataspace dataspace = Dataspace::UNKNOWN; const hwc_region_t damage = { }; buffer_handle_t handle; int32_t acquireFence; diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestClientTarget.cpp b/services/surfaceflinger/tests/hwc2/Hwc2TestClientTarget.cpp index 69254921d4..14c60a7d26 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestClientTarget.cpp +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestClientTarget.cpp @@ -91,7 +91,7 @@ Area Hwc2TestClientTargetSupport::getBufferArea() const return mBufferArea.get(); } -android_dataspace_t Hwc2TestClientTargetSupport::getDataspace() const +android::ui::Dataspace Hwc2TestClientTargetSupport::getDataspace() const { return mDataspace.get(); } diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestClientTarget.h b/services/surfaceflinger/tests/hwc2/Hwc2TestClientTarget.h index 3b47978bef..6f4090f321 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestClientTarget.h +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestClientTarget.h @@ -53,7 +53,7 @@ public: bool advance(); Area getBufferArea() const; - android_dataspace_t getDataspace() const; + android::ui::Dataspace getDataspace() const; const hwc_region_t getSurfaceDamage() const; private: diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp index 937fce28fb..c1c9cc8f5b 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp @@ -146,7 +146,7 @@ hwc_rect_t Hwc2TestLayer::getCursorPosition() const return mDisplayFrame.get(); } -android_dataspace_t Hwc2TestLayer::getDataspace() const +android::ui::Dataspace Hwc2TestLayer::getDataspace() const { return mDataspace.get(); } diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h index 0e7dd228fb..29ae521804 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h @@ -54,7 +54,7 @@ public: hwc_color_t getColor() const; hwc2_composition_t getComposition() const; hwc_rect_t getCursorPosition() const; - android_dataspace_t getDataspace() const; + android::ui::Dataspace getDataspace() const; hwc_rect_t getDisplayFrame() const; float getPlaneAlpha() const; hwc_frect_t getSourceCrop() const; diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestLayers.cpp b/services/surfaceflinger/tests/hwc2/Hwc2TestLayers.cpp index 495ef79609..90127a1302 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestLayers.cpp +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestLayers.cpp @@ -169,7 +169,7 @@ hwc_rect_t Hwc2TestLayers::getCursorPosition(hwc2_layer_t layer) const return mTestLayers.at(layer).getCursorPosition(); } -android_dataspace_t Hwc2TestLayers::getDataspace(hwc2_layer_t layer) const +android::ui::Dataspace Hwc2TestLayers::getDataspace(hwc2_layer_t layer) const { if (mTestLayers.count(layer) == 0) { []() { GTEST_FAIL(); }(); diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestLayers.h b/services/surfaceflinger/tests/hwc2/Hwc2TestLayers.h index d95a91f485..909dd486e8 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestLayers.h +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestLayers.h @@ -63,7 +63,7 @@ public: hwc_color_t getColor(hwc2_layer_t layer) const; hwc2_composition_t getComposition(hwc2_layer_t layer) const; hwc_rect_t getCursorPosition(hwc2_layer_t layer) const; - android_dataspace_t getDataspace(hwc2_layer_t layer) const; + android::ui::Dataspace getDataspace(hwc2_layer_t layer) const; hwc_rect_t getDisplayFrame(hwc2_layer_t layer) const; android_pixel_format_t getFormat(hwc2_layer_t layer) const; float getPlaneAlpha(hwc2_layer_t layer) const; diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestProperties.cpp b/services/surfaceflinger/tests/hwc2/Hwc2TestProperties.cpp index 5b3bbeb708..c5b92d0664 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestProperties.cpp +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestProperties.cpp @@ -262,62 +262,62 @@ Hwc2TestDataspace::Hwc2TestDataspace(Hwc2TestCoverage coverage) std::string Hwc2TestDataspace::dump() const { std::stringstream dmp; - dmp << "\tdataspace: " << get() << "\n"; + dmp << "\tdataspace: " << static_cast<int32_t>(get()) << "\n"; return dmp.str(); } -const std::vector<android_dataspace_t> Hwc2TestDataspace::defaultDataspaces = { - HAL_DATASPACE_UNKNOWN, -}; - -const std::vector<android_dataspace_t> Hwc2TestDataspace::basicDataspaces = { - HAL_DATASPACE_UNKNOWN, - HAL_DATASPACE_V0_SRGB, -}; - -const std::vector<android_dataspace_t> Hwc2TestDataspace::completeDataspaces = { - HAL_DATASPACE_UNKNOWN, - HAL_DATASPACE_ARBITRARY, - HAL_DATASPACE_STANDARD_SHIFT, - HAL_DATASPACE_STANDARD_MASK, - HAL_DATASPACE_STANDARD_UNSPECIFIED, - HAL_DATASPACE_STANDARD_BT709, - HAL_DATASPACE_STANDARD_BT601_625, - HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED, - HAL_DATASPACE_STANDARD_BT601_525, - HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED, - HAL_DATASPACE_STANDARD_BT2020, - HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE, - HAL_DATASPACE_STANDARD_BT470M, - HAL_DATASPACE_STANDARD_FILM, - HAL_DATASPACE_TRANSFER_SHIFT, - HAL_DATASPACE_TRANSFER_MASK, - HAL_DATASPACE_TRANSFER_UNSPECIFIED, - HAL_DATASPACE_TRANSFER_LINEAR, - HAL_DATASPACE_TRANSFER_SRGB, - HAL_DATASPACE_TRANSFER_SMPTE_170M, - HAL_DATASPACE_TRANSFER_GAMMA2_2, - HAL_DATASPACE_TRANSFER_GAMMA2_8, - HAL_DATASPACE_TRANSFER_ST2084, - HAL_DATASPACE_TRANSFER_HLG, - HAL_DATASPACE_RANGE_SHIFT, - HAL_DATASPACE_RANGE_MASK, - HAL_DATASPACE_RANGE_UNSPECIFIED, - HAL_DATASPACE_RANGE_FULL, - HAL_DATASPACE_RANGE_LIMITED, - HAL_DATASPACE_SRGB_LINEAR, - HAL_DATASPACE_V0_SRGB_LINEAR, - HAL_DATASPACE_SRGB, - HAL_DATASPACE_V0_SRGB, - HAL_DATASPACE_JFIF, - HAL_DATASPACE_V0_JFIF, - HAL_DATASPACE_BT601_625, - HAL_DATASPACE_V0_BT601_625, - HAL_DATASPACE_BT601_525, - HAL_DATASPACE_V0_BT601_525, - HAL_DATASPACE_BT709, - HAL_DATASPACE_V0_BT709, - HAL_DATASPACE_DEPTH, +const std::vector<android::ui::Dataspace> Hwc2TestDataspace::defaultDataspaces = { + android::ui::Dataspace::UNKNOWN, +}; + +const std::vector<android::ui::Dataspace> Hwc2TestDataspace::basicDataspaces = { + android::ui::Dataspace::UNKNOWN, + android::ui::Dataspace::V0_SRGB, +}; + +const std::vector<android::ui::Dataspace> Hwc2TestDataspace::completeDataspaces = { + android::ui::Dataspace::UNKNOWN, + android::ui::Dataspace::ARBITRARY, + android::ui::Dataspace::STANDARD_SHIFT, + android::ui::Dataspace::STANDARD_MASK, + android::ui::Dataspace::STANDARD_UNSPECIFIED, + android::ui::Dataspace::STANDARD_BT709, + android::ui::Dataspace::STANDARD_BT601_625, + android::ui::Dataspace::STANDARD_BT601_625_UNADJUSTED, + android::ui::Dataspace::STANDARD_BT601_525, + android::ui::Dataspace::STANDARD_BT601_525_UNADJUSTED, + android::ui::Dataspace::STANDARD_BT2020, + android::ui::Dataspace::STANDARD_BT2020_CONSTANT_LUMINANCE, + android::ui::Dataspace::STANDARD_BT470M, + android::ui::Dataspace::STANDARD_FILM, + android::ui::Dataspace::TRANSFER_SHIFT, + android::ui::Dataspace::TRANSFER_MASK, + android::ui::Dataspace::TRANSFER_UNSPECIFIED, + android::ui::Dataspace::TRANSFER_LINEAR, + android::ui::Dataspace::TRANSFER_SRGB, + android::ui::Dataspace::TRANSFER_SMPTE_170M, + android::ui::Dataspace::TRANSFER_GAMMA2_2, + android::ui::Dataspace::TRANSFER_GAMMA2_8, + android::ui::Dataspace::TRANSFER_ST2084, + android::ui::Dataspace::TRANSFER_HLG, + android::ui::Dataspace::RANGE_SHIFT, + android::ui::Dataspace::RANGE_MASK, + android::ui::Dataspace::RANGE_UNSPECIFIED, + android::ui::Dataspace::RANGE_FULL, + android::ui::Dataspace::RANGE_LIMITED, + android::ui::Dataspace::SRGB_LINEAR, + android::ui::Dataspace::V0_SRGB_LINEAR, + android::ui::Dataspace::SRGB, + android::ui::Dataspace::V0_SRGB, + android::ui::Dataspace::JFIF, + android::ui::Dataspace::V0_JFIF, + android::ui::Dataspace::BT601_625, + android::ui::Dataspace::V0_BT601_625, + android::ui::Dataspace::BT601_525, + android::ui::Dataspace::V0_BT601_525, + android::ui::Dataspace::BT709, + android::ui::Dataspace::V0_BT709, + android::ui::Dataspace::DEPTH, }; diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestProperties.h b/services/surfaceflinger/tests/hwc2/Hwc2TestProperties.h index cb811e06e2..d7082f3cb5 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestProperties.h +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestProperties.h @@ -20,6 +20,7 @@ #include <array> #include <vector> +#include <ui/GraphicTypes.h> #include <ui/Region.h> #define HWC2_INCLUDE_STRINGIFICATION @@ -229,16 +230,16 @@ protected: }; -class Hwc2TestDataspace : public Hwc2TestProperty<android_dataspace_t> { +class Hwc2TestDataspace : public Hwc2TestProperty<android::ui::Dataspace> { public: Hwc2TestDataspace(Hwc2TestCoverage coverage); std::string dump() const override; protected: - static const std::vector<android_dataspace_t> defaultDataspaces; - static const std::vector<android_dataspace_t> basicDataspaces; - static const std::vector<android_dataspace_t> completeDataspaces; + static const std::vector<android::ui::Dataspace> defaultDataspaces; + static const std::vector<android::ui::Dataspace> basicDataspaces; + static const std::vector<android::ui::Dataspace> completeDataspaces; static const std::array<bool, 6> mCompositionSupport; }; diff --git a/services/surfaceflinger/tests/unittests/MockComposer.h b/services/surfaceflinger/tests/unittests/MockComposer.h index acd9b3099a..00e565b75c 100644 --- a/services/surfaceflinger/tests/unittests/MockComposer.h +++ b/services/surfaceflinger/tests/unittests/MockComposer.h @@ -29,10 +29,10 @@ namespace mock { using android::hardware::graphics::common::V1_0::ColorMode; using android::hardware::graphics::common::V1_0::ColorTransform; -using android::hardware::graphics::common::V1_0::Dataspace; using android::hardware::graphics::common::V1_0::Hdr; -using android::hardware::graphics::common::V1_0::PixelFormat; using android::hardware::graphics::common::V1_0::Transform; +using android::hardware::graphics::common::V1_1::Dataspace; +using android::hardware::graphics::common::V1_1::PixelFormat; using android::hardware::graphics::composer::V2_1::Config; using android::hardware::graphics::composer::V2_1::Display; diff --git a/services/surfaceflinger/tests/unittests/MockRenderEngine.h b/services/surfaceflinger/tests/unittests/MockRenderEngine.h index 6d3e17ff73..9bb2a3c961 100644 --- a/services/surfaceflinger/tests/unittests/MockRenderEngine.h +++ b/services/surfaceflinger/tests/unittests/MockRenderEngine.h @@ -64,8 +64,8 @@ public: MOCK_METHOD0(disableTexturing, void()); MOCK_METHOD0(disableBlending, void()); MOCK_METHOD1(setSourceY410BT2020, void(bool)); - MOCK_METHOD1(setSourceDataSpace, void(android_dataspace)); - MOCK_METHOD1(setOutputDataSpace, void(android_dataspace)); + MOCK_METHOD1(setSourceDataSpace, void(ui::Dataspace)); + MOCK_METHOD1(setOutputDataSpace, void(ui::Dataspace)); MOCK_METHOD2(bindNativeBufferAsFrameBuffer, void(ANativeWindowBuffer*, RE::BindNativeBufferAsFramebuffer*)); MOCK_METHOD1(unbindNativeBufferAsFrameBuffer, void(RE::BindNativeBufferAsFramebuffer*)); |