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 <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 void OnDisplayModeChanged( | 42 void OnDisplayModeChanged( |
43 const ui::DisplayConfigurator::DisplayStateList& outputs) override; | 43 const ui::DisplayConfigurator::DisplayStateList& outputs) override; |
44 void OnDisplayModeChangeFailed( | 44 void OnDisplayModeChangeFailed( |
45 const ui::DisplayConfigurator::DisplayStateList& displays, | 45 const ui::DisplayConfigurator::DisplayStateList& displays, |
46 ui::MultipleDisplayState failed_new_state) override {} | 46 ui::MultipleDisplayState failed_new_state) override {} |
47 | 47 |
48 struct ColorCalibrationData { | 48 struct ColorCalibrationData { |
49 ColorCalibrationData(); | 49 ColorCalibrationData(); |
50 ~ColorCalibrationData(); | 50 ~ColorCalibrationData(); |
51 | 51 |
52 std::vector<ui::GammaRampRGBEntry> lut; | 52 std::vector<ui::GammaRampRGBEntry> degamma_lut; |
| 53 std::vector<ui::GammaRampRGBEntry> gamma_lut; |
| 54 std::vector<float> correction_matrix; |
53 }; | 55 }; |
54 | 56 |
55 private: | 57 private: |
56 void ApplyDisplayColorCalibration(int64_t display_id, int64_t product_id); | 58 void ApplyDisplayColorCalibration(int64_t display_id, int64_t product_id); |
57 void LoadCalibrationForDisplay(const ui::DisplaySnapshot* display); | 59 void LoadCalibrationForDisplay(const ui::DisplaySnapshot* display); |
58 void UpdateCalibrationData( | 60 void UpdateCalibrationData( |
59 int64_t display_id, | 61 int64_t display_id, |
60 int64_t product_id, | 62 int64_t product_id, |
61 scoped_ptr<DisplayColorManager::ColorCalibrationData> data, | 63 scoped_ptr<DisplayColorManager::ColorCalibrationData> data, |
62 bool success); | 64 bool success); |
63 | 65 |
64 ui::DisplayConfigurator* configurator_; | 66 ui::DisplayConfigurator* configurator_; |
65 std::map<int64_t, ColorCalibrationData*> calibration_map_; | 67 std::map<int64_t, ColorCalibrationData*> calibration_map_; |
66 base::SequencedWorkerPool* blocking_pool_; | 68 base::SequencedWorkerPool* blocking_pool_; |
67 | 69 |
68 DISALLOW_COPY_AND_ASSIGN(DisplayColorManager); | 70 DISALLOW_COPY_AND_ASSIGN(DisplayColorManager); |
69 }; | 71 }; |
70 | 72 |
71 } // namespace ash | 73 } // namespace ash |
72 | 74 |
73 #endif // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ | 75 #endif // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ |
OLD | NEW |