Commit 61c437c9 authored by Jeremy Roman's avatar Jeremy Roman Committed by Commit Bot

edid_parser: Don't log parse failure.

This is not critical enough to log at the ERROR level for all Chromium
builds, and in practice it ends up appearing when a tip-of-tree Chromium
build is run under Chrome Remote Desktop.

There are already also UMA histograms that gather this in the field.

Change-Id: If272b274d6a57f514e11c9b81ba2a0217cc2bbfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2156602
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: default avatarMiguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762050}
parent 14ebf789
...@@ -120,7 +120,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) { ...@@ -120,7 +120,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) {
constexpr size_t kProductIdLength = 2; constexpr size_t kProductIdLength = 2;
if (edid.size() < kManufacturerOffset + kManufacturerLength) { if (edid.size() < kManufacturerOffset + kManufacturerLength) {
LOG(ERROR) << "Too short EDID data: manufacturer id";
base::UmaHistogramEnumeration(kParseEdidFailureMetric, base::UmaHistogramEnumeration(kParseEdidFailureMetric,
ParseEdidFailure::kManufacturerId); ParseEdidFailure::kManufacturerId);
return; // Any other fields below are beyond this edid offset. return; // Any other fields below are beyond this edid offset.
...@@ -131,7 +130,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) { ...@@ -131,7 +130,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) {
(edid[kManufacturerOffset] << 8) + edid[kManufacturerOffset + 1]; (edid[kManufacturerOffset] << 8) + edid[kManufacturerOffset + 1];
if (edid.size() < kProductIdOffset + kProductIdLength) { if (edid.size() < kProductIdOffset + kProductIdLength) {
LOG(ERROR) << "Too short EDID data: product id";
base::UmaHistogramEnumeration(kParseEdidFailureMetric, base::UmaHistogramEnumeration(kParseEdidFailureMetric,
ParseEdidFailure::kProductId); ParseEdidFailure::kProductId);
return; // Any other fields below are beyond this edid offset. return; // Any other fields below are beyond this edid offset.
...@@ -146,7 +144,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) { ...@@ -146,7 +144,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) {
constexpr int32_t kYearOffset = 1990; constexpr int32_t kYearOffset = 1990;
if (edid.size() < kYearOfManufactureOffset + 1) { if (edid.size() < kYearOfManufactureOffset + 1) {
LOG(ERROR) << "Too short EDID data: year of manufacture";
base::UmaHistogramEnumeration(kParseEdidFailureMetric, base::UmaHistogramEnumeration(kParseEdidFailureMetric,
ParseEdidFailure::kYearOfManufacture); ParseEdidFailure::kYearOfManufacture);
return; // Any other fields below are beyond this edid offset. return; // Any other fields below are beyond this edid offset.
...@@ -168,7 +165,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) { ...@@ -168,7 +165,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) {
constexpr uint8_t kColorBitDepthOffset = 4; constexpr uint8_t kColorBitDepthOffset = 4;
if (edid.size() < kVideoInputDefinitionOffset + 1) { if (edid.size() < kVideoInputDefinitionOffset + 1) {
LOG(ERROR) << "Too short EDID data: bits per channel";
base::UmaHistogramEnumeration(kParseEdidFailureMetric, base::UmaHistogramEnumeration(kParseEdidFailureMetric,
ParseEdidFailure::kBitsPerChannel); ParseEdidFailure::kBitsPerChannel);
return; // Any other fields below are beyond this edid offset. return; // Any other fields below are beyond this edid offset.
...@@ -189,7 +185,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) { ...@@ -189,7 +185,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) {
constexpr double kGammaBias = 100.0; constexpr double kGammaBias = 100.0;
if (edid.size() < kGammaOffset + 1) { if (edid.size() < kGammaOffset + 1) {
LOG(ERROR) << "Too short EDID data: gamma";
base::UmaHistogramEnumeration(kParseEdidFailureMetric, base::UmaHistogramEnumeration(kParseEdidFailureMetric,
ParseEdidFailure::kGamma); ParseEdidFailure::kGamma);
return; // Any other fields below are beyond this edid offset. return; // Any other fields below are beyond this edid offset.
...@@ -235,7 +230,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) { ...@@ -235,7 +230,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) {
"EDID Parameter section length error"); "EDID Parameter section length error");
if (edid.size() < kChromaticityOffset + kChromaticityLength) { if (edid.size() < kChromaticityOffset + kChromaticityLength) {
LOG(ERROR) << "Too short EDID data: chromaticity coordinates";
base::UmaHistogramEnumeration(kParseEdidFailureMetric, base::UmaHistogramEnumeration(kParseEdidFailureMetric,
ParseEdidFailure::kChromaticityCoordinates); ParseEdidFailure::kChromaticityCoordinates);
return; // Any other fields below are beyond this edid offset. return; // Any other fields below are beyond this edid offset.
...@@ -338,7 +332,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) { ...@@ -338,7 +332,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) {
for (const char c : display_name_) { for (const char c : display_name_) {
if (!isascii(c) || !isprint(c)) { if (!isascii(c) || !isprint(c)) {
display_name_.clear(); display_name_.clear();
LOG(ERROR) << "invalid EDID: human unreadable char in name";
base::UmaHistogramEnumeration(kParseEdidFailureMetric, base::UmaHistogramEnumeration(kParseEdidFailureMetric,
ParseEdidFailure::kDisplayName); ParseEdidFailure::kDisplayName);
} }
...@@ -393,7 +386,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) { ...@@ -393,7 +386,6 @@ void EdidParser::ParseEdid(const std::vector<uint8_t>& edid) {
constexpr uint8_t kHDRStaticMetadataDataBlockLengthMask = 0x1F; constexpr uint8_t kHDRStaticMetadataDataBlockLengthMask = 0x1F;
if (edid.size() < kNumExtensionsOffset + 1) { if (edid.size() < kNumExtensionsOffset + 1) {
LOG(ERROR) << "Too short EDID data: extensions";
base::UmaHistogramEnumeration(kParseEdidFailureMetric, base::UmaHistogramEnumeration(kParseEdidFailureMetric,
ParseEdidFailure::kExtensions); ParseEdidFailure::kExtensions);
return; // Any other fields below are beyond this edid offset. return; // Any other fields below are beyond this edid offset.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment