OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ |
6 #define ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ | 6 #define ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 29 matching lines...) Expand all Loading... |
40 void OnDisplayModeChanged( | 40 void OnDisplayModeChanged( |
41 const ui::DisplayConfigurator::DisplayStateList& outputs) override; | 41 const ui::DisplayConfigurator::DisplayStateList& outputs) override; |
42 void OnDisplayModeChangeFailed( | 42 void OnDisplayModeChangeFailed( |
43 const ui::DisplayConfigurator::DisplayStateList& displays, | 43 const ui::DisplayConfigurator::DisplayStateList& displays, |
44 ui::MultipleDisplayState failed_new_state) override {} | 44 ui::MultipleDisplayState failed_new_state) override {} |
45 | 45 |
46 struct ColorCalibrationData { | 46 struct ColorCalibrationData { |
47 ColorCalibrationData(); | 47 ColorCalibrationData(); |
48 ~ColorCalibrationData(); | 48 ~ColorCalibrationData(); |
49 | 49 |
50 std::vector<ui::GammaRampRGBEntry> lut; | 50 std::vector<ui::GammaRampRGBEntry> degamma_lut; |
| 51 std::vector<ui::GammaRampRGBEntry> gamma_lut; |
| 52 float correction_matrix[9]; |
51 }; | 53 }; |
52 | 54 |
53 private: | 55 private: |
54 void ApplyDisplayColorCalibration(int64_t display_id, int64_t product_id); | 56 void ApplyDisplayColorCalibration(int64_t display_id, int64_t product_id); |
55 void LoadCalibrationForDisplay(const ui::DisplaySnapshot* display); | 57 void LoadCalibrationForDisplay(const ui::DisplaySnapshot* display); |
56 void UpdateCalibrationData( | 58 void UpdateCalibrationData( |
57 int64_t display_id, | 59 int64_t display_id, |
58 int64_t product_id, | 60 int64_t product_id, |
59 scoped_ptr<DisplayColorManager::ColorCalibrationData> data, | 61 scoped_ptr<DisplayColorManager::ColorCalibrationData> data, |
60 bool success); | 62 bool success); |
61 | 63 |
62 ui::DisplayConfigurator* configurator_; | 64 ui::DisplayConfigurator* configurator_; |
63 std::map<int64_t, ColorCalibrationData*> calibration_map_; | 65 std::map<int64_t, ColorCalibrationData*> calibration_map_; |
64 base::SequencedWorkerPool* blocking_pool_; | 66 base::SequencedWorkerPool* blocking_pool_; |
65 | 67 |
66 DISALLOW_COPY_AND_ASSIGN(DisplayColorManager); | 68 DISALLOW_COPY_AND_ASSIGN(DisplayColorManager); |
67 }; | 69 }; |
68 | 70 |
69 } // namespace ash | 71 } // namespace ash |
70 | 72 |
71 #endif // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ | 73 #endif // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ |
OLD | NEW |