Changes how to compute the id of a display.

chromeos/display/output_util_unittest.cc

 // Copyright (c) 2013 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 "chromeos/display/output_util.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
@@ skipping 57 matching lines @@
     "\x15\x13\x14\x1f\x20\x23\x0d\x7f\x07\x83\x0f\x00\x00\x67\x03\x0c"
     "\x00\x10\x00\x38\x2d\xe3\x05\x03\x01\x02\x3a\x80\x18\x71\x38\x2d"
     "\x40\x58\x2c\x45\x00\x81\x91\x21\x00\x00\x1e\x01\x1d\x80\x18\x71"
     "\x1c\x16\x20\x58\x2c\x25\x00\x81\x91\x21\x00\x00\x9e\x01\x1d\x00"
     "\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\x81\x91\x21\x00\x00\x1e\x8c"
     "\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\x81\x91\x21\x00\x00"
     "\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x94";
 
 }
 
+const unsigned char kLP2565A[] =
+    "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00\x22\xF0\x76\x26\x01\x01\x01\x01"
+    "\x02\x12\x01\x03\x80\x34\x21\x78\xEE\xEF\x95\xA3\x54\x4C\x9B\x26"
+    "\x0F\x50\x54\xA5\x6B\x80\x81\x40\x81\x80\x81\x99\x71\x00\xA9\x00"
+    "\xA9\x40\xB3\x00\xD1\x00\x28\x3C\x80\xA0\x70\xB0\x23\x40\x30\x20"
+    "\x36\x00\x07\x44\x21\x00\x00\x1A\x00\x00\x00\xFD\x00\x30\x55\x1E"
+    "\x5E\x11\x00\x0A\x20\x20\x20\x20\x20\x20\x00\x00\x00\xFC\x00\x48"
+    "\x50\x20\x4C\x50\x32\x34\x36\x35\x0A\x20\x20\x20\x00\x00\x00\xFF"
+    "\x00\x43\x4E\x4B\x38\x30\x32\x30\x34\x48\x4D\x0A\x20\x20\x00\xA4";
+
+const unsigned char kLP2565B[] =
+    "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00\x22\xF0\x75\x26\x01\x01\x01\x01"
+    "\x02\x12\x01\x03\x6E\x34\x21\x78\xEE\xEF\x95\xA3\x54\x4C\x9B\x26"
+    "\x0F\x50\x54\xA5\x6B\x80\x81\x40\x71\x00\xA9\x00\xA9\x40\xA9\x4F"
+    "\xB3\x00\xD1\xC0\xD1\x00\x28\x3C\x80\xA0\x70\xB0\x23\x40\x30\x20"
+    "\x36\x00\x07\x44\x21\x00\x00\x1A\x00\x00\x00\xFD\x00\x30\x55\x1E"
+    "\x5E\x15\x00\x0A\x20\x20\x20\x20\x20\x20\x00\x00\x00\xFC\x00\x48"
+    "\x50\x20\x4C\x50\x32\x34\x36\x35\x0A\x20\x20\x20\x00\x00\x00\xFF"
+    "\x00\x43\x4E\x4B\x38\x30\x32\x30\x34\x48\x4D\x0A\x20\x20\x00\x45";
+
 TEST(OutputUtilTest, ParseEDID) {
   uint16 manufacturer_id = 0;
-  uint16 product_code = 0;
   std::string human_readable_name;
   EXPECT_TRUE(ParseOutputDeviceData(
       kNormalDisplay, charsize(kNormalDisplay),
-      &manufacturer_id, &product_code, &human_readable_name));
+      &manufacturer_id, &human_readable_name));
   EXPECT_EQ(0x22f0u, manufacturer_id);
-  EXPECT_EQ(0x286cu, product_code);
   EXPECT_EQ("HP ZR30w", human_readable_name);
 
   manufacturer_id = 0;
-  product_code = 0;
   human_readable_name.clear();
   EXPECT_TRUE(ParseOutputDeviceData(
       kInternalDisplay, charsize(kInternalDisplay),
-      &manufacturer_id, &product_code, NULL));
+      &manufacturer_id, NULL));
   EXPECT_EQ(0x4ca3u, manufacturer_id);
-  EXPECT_EQ(0x3142u, product_code);
   EXPECT_EQ("", human_readable_name);
 
   // Internal display doesn't have name.
   EXPECT_FALSE(ParseOutputDeviceData(
       kInternalDisplay, charsize(kInternalDisplay),
-      NULL, NULL, &human_readable_name));
+      NULL, &human_readable_name));
 
   manufacturer_id = 0;
-  product_code = 0;
   human_readable_name.clear();
   EXPECT_TRUE(ParseOutputDeviceData(
       kOverscanDisplay, charsize(kOverscanDisplay),
-      &manufacturer_id, &product_code, &human_readable_name));
+      &manufacturer_id, &human_readable_name));
   EXPECT_EQ(0x4c2du, manufacturer_id);
-  EXPECT_EQ(0x08feu, product_code);
   EXPECT_EQ("SAMSUNG", human_readable_name);
 }
 
 TEST(OutputUtilTest, ParseBrokenEDID) {
   uint16 manufacturer_id = 0;
-  uint16 product_code = 0;
   std::string human_readable_name;
 
   // length == 0
   EXPECT_FALSE(ParseOutputDeviceData(
       kNormalDisplay, 0,
-      &manufacturer_id, &product_code, &human_readable_name));
+      &manufacturer_id, &human_readable_name));
 
   // name is broken. Copying kNormalDisplay and substitute its name data by
   // some control code.
   std::string display_data(
       reinterpret_cast<const char*>(kNormalDisplay), charsize(kNormalDisplay));
 
   // display's name data is embedded in byte 95-107 in this specific example.
   // Fix here too when the contents of kNormalDisplay is altered.
   display_data[97] = '\x1b';
   EXPECT_FALSE(ParseOutputDeviceData(
       reinterpret_cast<const unsigned char*>(display_data.data()),
       display_data.size(),
-      &manufacturer_id, &product_code, &human_readable_name));
+      &manufacturer_id, &human_readable_name));
 
   // If |human_readable_name| isn't specified, it skips parsing the name.
   manufacturer_id = 0;
-  product_code = 0;
   EXPECT_TRUE(ParseOutputDeviceData(
       reinterpret_cast<const unsigned char*>(display_data.data()),
       display_data.size(),
-      &manufacturer_id, &product_code, NULL));
+      &manufacturer_id, NULL));
   EXPECT_EQ(0x22f0u, manufacturer_id);
-  EXPECT_EQ(0x286cu, product_code);
 }
 
 TEST(OutputUtilTest, ParseOverscanFlag) {
   bool flag = false;
   EXPECT_FALSE(ParseOutputOverscanFlag(
       kNormalDisplay, charsize(kNormalDisplay), &flag));
 
   flag = false;
   EXPECT_FALSE(ParseOutputOverscanFlag(
       kInternalDisplay, charsize(kInternalDisplay), &flag));
@@ skipping 41 matching lines @@
   EXPECT_TRUE(IsInternalOutputName("LVDSxx"));
   EXPECT_TRUE(IsInternalOutputName("eDPzz"));
 
   EXPECT_FALSE(IsInternalOutputName("xyz"));
   EXPECT_FALSE(IsInternalOutputName("abcLVDS"));
   EXPECT_FALSE(IsInternalOutputName("cdeeDP"));
   EXPECT_FALSE(IsInternalOutputName("LVD"));
   EXPECT_FALSE(IsInternalOutputName("eD"));
 }
 
+TEST(OutputUtilTest, GetDisplayId) {
+  // EDID of kLP2565A and B are slightly different but actually the same device.
+  int64 id1 = -1;
+  int64 id2 = -1;
+  EXPECT_TRUE(GetDisplayIdFromEDID(kLP2565A, charsize(kLP2565A), 0, &id1));
+  EXPECT_TRUE(GetDisplayIdFromEDID(kLP2565B, charsize(kLP2565B), 0, &id2));
+  EXPECT_EQ(id1, id2);
+  EXPECT_NE(-1, id1);
+}
+
+TEST(OutputUtilTest, GetDisplayIdFromInternal) {
+  int64 id = -1;
+  EXPECT_TRUE(GetDisplayIdFromEDID(
+      kInternalDisplay, charsize(kInternalDisplay), 0, &id));
+  EXPECT_NE(-1, id);
+}
+
+TEST(OutputUtilTest, GetDisplayIdFailure) {
+  int64 id = -1;
+  EXPECT_FALSE(GetDisplayIdFromEDID(NULL, 0, 0, &id));
+  EXPECT_EQ(-1, id);
+}
+
 }   // namespace chromeos