Add support for more advanced color correction

ui/display/chromeos/test/action_logger_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/chromeos/test/action_logger_util.h"
 
 #include <stddef.h>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 39 matching lines @@
       size.height(), out1 ? DisplaySnapshotToString(*out1).c_str() : "NULL",
       out2 ? DisplaySnapshotToString(*out2).c_str() : "NULL");
 }
 
 std::string GetSetHDCPStateAction(const DisplaySnapshot& output,
                                   HDCPState state) {
   return base::StringPrintf("set_hdcp(id=%" PRId64 ",state=%d)",
                             output.display_id(), state);
 }
 
-std::string SetGammaRampAction(const ui::DisplaySnapshot& output,
-                               const std::vector<GammaRampRGBEntry>& lut) {
-  std::string table;
-  for (size_t i = 0; i < lut.size(); ++i) {
-    table += base::StringPrintf(",rgb[%" PRIuS "]=%04x%04x%04x", i, lut[i].r,
-                                lut[i].g, lut[i].b);
+std::string SetColorCorrectionAction(
+    const ui::DisplaySnapshot& output,
+    const std::vector<GammaRampRGBEntry>& degamma_lut,
+    const std::vector<GammaRampRGBEntry>& gamma_lut,
+    const std::vector<float>& correction_matrix) {
+  std::string degamma_table;
+  for (size_t i = 0; i < degamma_lut.size(); ++i) {
+    degamma_table += base::StringPrintf(",degamma[%" PRIuS "]=%04x%04x%04x", i,
+                                        degamma_lut[i].r, degamma_lut[i].g,
+                                        degamma_lut[i].b);
+  }
+  std::string gamma_table;
+  for (size_t i = 0; i < gamma_lut.size(); ++i) {
+    gamma_table +=
+        base::StringPrintf(",gamma[%" PRIuS "]=%04x%04x%04x", i, gamma_lut[i].r,
+                           gamma_lut[i].g, gamma_lut[i].b);
   }
 
-  return base::StringPrintf("set_gamma_ramp(id=%" PRId64 "%s)",
-                            output.display_id(), table.c_str());
+  std::string ctm;
+  for (size_t i = 0; i < correction_matrix.size(); ++i) {
+    ctm += base::StringPrintf(",ctm[%" PRIuS "]=%f", i, correction_matrix[i]);
+  }
+
+  return base::StringPrintf("set_color_correction(id=%" PRId64 "%s%s%s)",
+                            output.display_id(), degamma_table.c_str(),
+                            gamma_table.c_str(), ctm.c_str());
 }
 
 std::string JoinActions(const char* action, ...) {
   std::string actions;
 
   va_list arg_list;
   va_start(arg_list, action);
   while (action) {
     if (!actions.empty())
       actions += ",";
     actions += action;
     action = va_arg(arg_list, const char*);
   }
   va_end(arg_list);
   return actions;
 }
 
 }  // namespace test
 }  // namespace ui