diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-25 01:20:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-25 01:20:59 +0000 |
| commit | c4a4a4884d97ee59bd590d71b46c681a7f6882c9 (patch) | |
| tree | 2b939e6ee9e40adb06b4719d5b815b62b7927161 | |
| parent | e38066c14806b1a62dac01e6c8fe14c776d32093 (diff) | |
| parent | fe2cdb7b3d0718e4a6792efc31954b74f6cdf0f0 (diff) | |
| download | zuma-c4a4a4884d97ee59bd590d71b46c681a7f6882c9.tar.gz | |
Snap for 10998418 from fe2cdb7b3d0718e4a6792efc31954b74f6cdf0f0 to 24Q1-release
Change-Id: Ia960b44d6f2105e1f7e3bc9c06a1939c2b4808d9
| -rw-r--r-- | libhwc2.1/libdevice/HistogramController.cpp | 18 | ||||
| -rw-r--r-- | libhwc2.1/libdevice/HistogramController.h | 12 |
2 files changed, 16 insertions, 14 deletions
diff --git a/libhwc2.1/libdevice/HistogramController.cpp b/libhwc2.1/libdevice/HistogramController.cpp index 30b0d5d..ac616fb 100644 --- a/libhwc2.1/libdevice/HistogramController.cpp +++ b/libhwc2.1/libdevice/HistogramController.cpp @@ -18,12 +18,12 @@ // TODO: b/295990513 - Remove the if defined after kernel prebuilts are merged. #if defined(EXYNOS_HISTOGRAM_CHANNEL_REQUEST) -int HistogramController::createHistogramDrmConfigLocked(const ChannelInfo &channel, - std::shared_ptr<void> &configPtr, - size_t &length) const { +int HistogramController::createHistogramDrmConfigLocked(const ChannelInfo& channel, + std::shared_ptr<void>& configPtr, + size_t& length) const { configPtr = std::make_shared<struct histogram_channel_config>(); - struct histogram_channel_config *channelConfig = - (struct histogram_channel_config *)configPtr.get(); + struct histogram_channel_config* channelConfig = + (struct histogram_channel_config*)configPtr.get(); if (channelConfig == nullptr) { ALOGE("%s: histogram failed to allocate histogram_channel_config", __func__); @@ -46,11 +46,11 @@ int HistogramController::createHistogramDrmConfigLocked(const ChannelInfo &chann return NO_ERROR; } -int HistogramController::parseDrmEvent(void *event, uint8_t &channelId, char16_t *&buffer) const { - struct exynos_drm_histogram_channel_event *histogram_channel_event = - (struct exynos_drm_histogram_channel_event *)event; +int HistogramController::parseDrmEvent(void* event, uint8_t& channelId, char16_t*& buffer) const { + struct exynos_drm_histogram_channel_event* histogram_channel_event = + (struct exynos_drm_histogram_channel_event*)event; channelId = histogram_channel_event->hist_id; - buffer = (char16_t *)&histogram_channel_event->bins; + buffer = (char16_t*)&histogram_channel_event->bins; return NO_ERROR; } #endif diff --git a/libhwc2.1/libdevice/HistogramController.h b/libhwc2.1/libdevice/HistogramController.h index 0cfee0e..b5e8dac 100644 --- a/libhwc2.1/libdevice/HistogramController.h +++ b/libhwc2.1/libdevice/HistogramController.h @@ -14,17 +14,19 @@ * limitations under the License. */ +#pragma once + #include "HistogramDevice.h" class HistogramController : public HistogramDevice { public: - HistogramController(ExynosDisplay *display) : HistogramDevice(display, 4, {3}) {} + HistogramController(ExynosDisplay* display) : HistogramDevice(display, 4, {3}) {} // TODO: b/295990513 - Remove the if defined after kernel prebuilts are merged. #if defined(EXYNOS_HISTOGRAM_CHANNEL_REQUEST) - virtual int createHistogramDrmConfigLocked(const ChannelInfo &channel, - std::shared_ptr<void> &configPtr, - size_t &length) const override + virtual int createHistogramDrmConfigLocked(const ChannelInfo& channel, + std::shared_ptr<void>& configPtr, + size_t& length) const override REQUIRES(channel.channelInfoMutex); - virtual int parseDrmEvent(void *event, uint8_t &channelId, char16_t *&buffer) const override; + virtual int parseDrmEvent(void* event, uint8_t& channelId, char16_t*& buffer) const override; #endif }; |