Piteball
/
android_hardware_qcom_display
mirror of https://github.com/followmsi/android_hardware_qcom_display.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Snap for 4807121 from 0296371991 to pi-release 

Change-Id: I76f343253581eadb11aeea9a37228358e98be8bf
This commit is contained in:
android-build-team Robot 2018-05-27 07:26:23 +00:00
parent d41b688be0 0296371991
commit 4fb1ecd923
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
msm8996/sdm/libs/hwc2/hwc_display.cpp
View File

@ -135,7 +135,8 @@ HWC2::Error HWCColorMode::HandleColorModeTransform(android_color_mode_t mode,
// if the mode count is 1, then only native mode is supported, so just apply matrix w/o
// setting mode
if (color_mode_transform_map_.size() > 1U) {
if ((color_mode_transform_map_.size() > 1U && current_color_mode_ != mode) ||
(current_color_transform_ != hint)) {
color_mode_transform = color_mode_transform_map_[mode][transform_hint];
DisplayError error = display_intf_->SetColorMode(color_mode_transform);
if (error != kErrorNone) {
@ -143,7 +144,10 @@ HWC2::Error HWCColorMode::HandleColorModeTransform(android_color_mode_t mode,
// failure to force client composition
return HWC2::Error::Unsupported;
}
DLOGI("Setting Color Mode = %d Transform Hint = %d Success", mode, hint);
}
current_color_mode_ = mode;
current_color_transform_ = hint;
if (use_matrix) {
DisplayError error = display_intf_->SetColorTransform(kColorTransformMatrixCount, matrix);
@ -154,10 +158,7 @@ HWC2::Error HWCColorMode::HandleColorModeTransform(android_color_mode_t mode,
}
}
current_color_mode_ = mode;
current_color_transform_ = hint;
CopyColorTransformMatrix(matrix, color_matrix_);
DLOGV_IF(kTagQDCM, "Setting Color Mode = %d Transform Hint = %d Success", mode, hint);
return HWC2::Error::None;
}

5
msm8996/sdm/libs/hwc2/hwc_display.h
View File

@ -79,7 +79,10 @@ class HWCColorMode {
android_color_transform_t current_color_transform_ = HAL_COLOR_TRANSFORM_IDENTITY;
typedef std::map<android_color_transform_t, std::string> TransformMap;
std::map<android_color_mode_t, TransformMap> color_mode_transform_map_ = {};
double color_matrix_[kColorTransformMatrixCount] = {0};
double color_matrix_[kColorTransformMatrixCount] = { 1.0, 0.0, 0.0, 0.0, \
0.0, 1.0, 0.0, 0.0, \
0.0, 0.0, 1.0, 0.0, \
0.0, 0.0, 0.0, 1.0 };
};
class HWCDisplay : public DisplayEventHandler {