diff options
Diffstat (limited to 'legacymm')
-rw-r--r-- | legacymm/DisplayModes.cpp | 17 | ||||
-rw-r--r-- | legacymm/DisplayModes.h | 4 | ||||
-rw-r--r-- | legacymm/PictureAdjustment.cpp | 26 | ||||
-rw-r--r-- | legacymm/PictureAdjustment.h | 6 | ||||
-rw-r--r-- | legacymm/service.cpp | 4 |
5 files changed, 30 insertions, 27 deletions
diff --git a/legacymm/DisplayModes.cpp b/legacymm/DisplayModes.cpp index bc9e2cb..3bdbe0d 100644 --- a/legacymm/DisplayModes.cpp +++ b/legacymm/DisplayModes.cpp @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "DisplayModes.h" + #include <dlfcn.h> #include "Constants.h" -#include "DisplayModes.h" #include "PictureAdjustment.h" #include "Types.h" @@ -30,19 +31,19 @@ namespace legacymm { DisplayModes::DisplayModes(void* libHandle) { mLibHandle = libHandle; disp_api_supported = - reinterpret_cast<int (*)(int32_t, int32_t)>(dlsym(mLibHandle, "disp_api_supported")); + reinterpret_cast<int (*)(int32_t, int32_t)>(dlsym(mLibHandle, "disp_api_supported")); disp_api_get_num_display_modes = reinterpret_cast<int (*)(int32_t, int32_t, int*)>( - dlsym(mLibHandle, "disp_api_get_num_display_modes")); + dlsym(mLibHandle, "disp_api_get_num_display_modes")); disp_api_get_display_modes = reinterpret_cast<int (*)(int32_t, int32_t, void*, int)>( - dlsym(mLibHandle, "disp_api_get_display_modes")); + dlsym(mLibHandle, "disp_api_get_display_modes")); disp_api_get_active_display_mode = reinterpret_cast<int (*)(int32_t, int*, uint32_t*)>( - dlsym(mLibHandle, "disp_api_get_active_display_mode")); + dlsym(mLibHandle, "disp_api_get_active_display_mode")); disp_api_set_active_display_mode = reinterpret_cast<int (*)(int32_t, int)>( - dlsym(mLibHandle, "disp_api_set_active_display_mode")); + dlsym(mLibHandle, "disp_api_set_active_display_mode")); disp_api_get_default_display_mode = reinterpret_cast<int (*)(int32_t, int*)>( - dlsym(mLibHandle, "disp_api_get_default_display_mode")); + dlsym(mLibHandle, "disp_api_get_default_display_mode")); disp_api_set_default_display_mode = reinterpret_cast<int (*)(int32_t, int)>( - dlsym(mLibHandle, "disp_api_set_default_display_mode")); + dlsym(mLibHandle, "disp_api_set_default_display_mode")); } bool DisplayModes::isSupported() { diff --git a/legacymm/DisplayModes.h b/legacymm/DisplayModes.h index c3655cd..ff3b394 100644 --- a/legacymm/DisplayModes.h +++ b/legacymm/DisplayModes.h @@ -29,7 +29,7 @@ using ::android::hardware::Return; using ::android::hardware::Void; class DisplayModes : public IDisplayModes { - public: + public: DisplayModes(void* libHandle); bool isSupported(); @@ -40,7 +40,7 @@ class DisplayModes : public IDisplayModes { Return<void> getDefaultDisplayMode(getDefaultDisplayMode_cb _hidl_cb) override; Return<bool> setDisplayMode(int32_t modeID, bool makeDefault) override; - private: + private: void* mLibHandle; int (*disp_api_supported)(int32_t, int32_t); diff --git a/legacymm/PictureAdjustment.cpp b/legacymm/PictureAdjustment.cpp index 38a307d..0bc7955 100644 --- a/legacymm/PictureAdjustment.cpp +++ b/legacymm/PictureAdjustment.cpp @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "PictureAdjustment.h" + #include <dlfcn.h> #include "Constants.h" -#include "PictureAdjustment.h" #include "Types.h" namespace vendor { @@ -33,13 +34,13 @@ PictureAdjustment::PictureAdjustment(void* libHandle) { mLibHandle = libHandle; disp_api_supported = - reinterpret_cast<int (*)(int32_t, int32_t)>(dlsym(mLibHandle, "disp_api_supported")); + reinterpret_cast<int (*)(int32_t, int32_t)>(dlsym(mLibHandle, "disp_api_supported")); disp_api_get_pa_range = - reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_get_pa_range")); + reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_get_pa_range")); disp_api_get_pa_config = - reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_get_pa_config")); + reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_get_pa_config")); disp_api_set_pa_config = - reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_set_pa_config")); + reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_set_pa_config")); memset(&mDefaultPictureAdjustment, 0, sizeof(HSIC)); } @@ -64,10 +65,11 @@ HSIC PictureAdjustment::getPictureAdjustmentInternal() { if (disp_api_get_pa_config != nullptr) { if (disp_api_get_pa_config(0, &config) == 0) { - return HSIC{ - static_cast<float>(config.data.hue), static_cast<float>(config.data.saturation), - static_cast<float>(config.data.intensity), static_cast<float>(config.data.contrast), - static_cast<float>(config.data.saturationThreshold)}; + return HSIC{static_cast<float>(config.data.hue), + static_cast<float>(config.data.saturation), + static_cast<float>(config.data.intensity), + static_cast<float>(config.data.contrast), + static_cast<float>(config.data.saturationThreshold)}; } } @@ -146,7 +148,7 @@ Return<void> PictureAdjustment::getContrastRange(getContrastRange_cb _hidl_cb) { } Return<void> PictureAdjustment::getSaturationThresholdRange( - getSaturationThresholdRange_cb _hidl_cb) { + getSaturationThresholdRange_cb _hidl_cb) { FloatRange range{}; mm_pa_range r{}; @@ -168,13 +170,13 @@ Return<void> PictureAdjustment::getPictureAdjustment(getPictureAdjustment_cb _hi } Return<void> PictureAdjustment::getDefaultPictureAdjustment( - getDefaultPictureAdjustment_cb _hidl_cb) { + getDefaultPictureAdjustment_cb _hidl_cb) { _hidl_cb(mDefaultPictureAdjustment); return Void(); } Return<bool> PictureAdjustment::setPictureAdjustment( - const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) { + const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) { mm_pa_config config = {0xF, {static_cast<int>(hsic.hue), static_cast<int>(hsic.saturation), static_cast<int>(hsic.intensity), static_cast<int>(hsic.contrast), diff --git a/legacymm/PictureAdjustment.h b/legacymm/PictureAdjustment.h index a578075..b88975d 100644 --- a/legacymm/PictureAdjustment.h +++ b/legacymm/PictureAdjustment.h @@ -30,7 +30,7 @@ using ::android::hardware::Return; using ::android::hardware::Void; class PictureAdjustment : public IPictureAdjustment { - public: + public: PictureAdjustment(void* libHandle); bool isSupported(); @@ -45,11 +45,11 @@ class PictureAdjustment : public IPictureAdjustment { Return<void> getPictureAdjustment(getPictureAdjustment_cb _hidl_cb) override; Return<void> getDefaultPictureAdjustment(getDefaultPictureAdjustment_cb _hidl_cb) override; Return<bool> setPictureAdjustment( - const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) override; + const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) override; static void updateDefaultPictureAdjustment(); - private: + private: void* mLibHandle; int (*disp_api_supported)(int32_t, int32_t); diff --git a/legacymm/service.cpp b/legacymm/service.cpp index e668699..2668f77 100644 --- a/legacymm/service.cpp +++ b/legacymm/service.cpp @@ -77,8 +77,8 @@ int main() { pa = new PictureAdjustment(libHandle); if (pa == nullptr) { - LOG(ERROR) - << "Can not create an instance of LiveDisplay HAL PictureAdjustment Iface, exiting."; + LOG(ERROR) << "Can not create an instance of LiveDisplay HAL PictureAdjustment Iface, " + "exiting."; goto shutdown; } |