Add MediaError.message

content/renderer/media/render_media_log.cc

 // Copyright (c) 2012 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 "content/renderer/media/render_media_log.h"
 
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 10 matching lines @@
 #define MEDIA_EVENT_LOG_UTILITY DVLOG(1)
 #endif
 
 namespace {
 
 // Print an event to the chromium log.
 void Log(media::MediaLogEvent* event) {
   if (event->type == media::MediaLogEvent::PIPELINE_ERROR ||
       event->type == media::MediaLogEvent::MEDIA_ERROR_LOG_ENTRY) {
     LOG(ERROR) << "MediaEvent: "
-               << media::MediaLog::MediaEventToLogString(*event);
+               << media::MediaLog::MediaEventToLogString(*event, true);
   } else if (event->type != media::MediaLogEvent::BUFFERED_EXTENTS_CHANGED &&
              event->type != media::MediaLogEvent::PROPERTY_CHANGE &&
              event->type != media::MediaLogEvent::WATCH_TIME_UPDATE &&
              event->type != media::MediaLogEvent::NETWORK_ACTIVITY_SET) {
-    MEDIA_EVENT_LOG_UTILITY << "MediaEvent: "
-                            << media::MediaLog::MediaEventToLogString(*event);
+    MEDIA_EVENT_LOG_UTILITY
+        << "MediaEvent: "
+        << media::MediaLog::MediaEventToLogString(*event, true);
   }
 }
 
+// Limit the number of recent MEDIA_ERROR_LOG_ENTRY retained for use in
+// GetErrorMessages(). Older entries are dropped to make room for newer ones.
+const int kMaxErrorLogEntries = 20;
+
 }  // namespace
 
 namespace content {
 
 RenderMediaLog::RenderMediaLog(const GURL& security_origin)
     : security_origin_(security_origin),
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
       tick_clock_(new base::DefaultTickClock()),
       last_ipc_send_time_(tick_clock_->NowTicks()),
       ipc_send_pending_(false) {
@@ skipping 20 matching lines @@
         // SendQueuedMediaEvents() will enqueue the most recent event of this
         // kind, if any, prior to sending the event batch.
         break;
 
       case media::MediaLogEvent::DURATION_SET:
         // Similar to the extents changed message, this may fire many times for
         // badly muxed media. Suppress within our rate limits here.
         last_duration_changed_event_.swap(event);
         break;
 
-      // Hold onto the most recent PIPELINE_ERROR and MEDIA_LOG_ERROR_ENTRY for
-      // use in GetLastErrorMessage().
+      // Hold onto the most recent PIPELINE_ERROR and (potentially multiple,
+      // capped number of) MEDIA_LOG_ERROR_ENTRY for use in GetErrorMessages().
       case media::MediaLogEvent::PIPELINE_ERROR:
         queued_media_events_.push_back(*event);
         last_pipeline_error_.swap(event);
         break;
       case media::MediaLogEvent::MEDIA_ERROR_LOG_ENTRY:
         queued_media_events_.push_back(*event);
-        last_media_error_log_entry_.swap(event);
+        recent_media_error_log_entries_.push_back(std::move(event));
+        if (recent_media_error_log_entries_.size() > kMaxErrorLogEntries)
+          recent_media_error_log_entries_.pop_front();
         break;
 
       // Just enqueue all other event types for throttled transmission.
       default:
         queued_media_events_.push_back(*event);
     }
 
     if (ipc_send_pending_)
       return;
 
@@ skipping 11 matching lines @@
 
   // It's been more than a second so send ASAP.
   if (task_runner_->BelongsToCurrentThread()) {
     SendQueuedMediaEvents();
     return;
   }
   task_runner_->PostTask(
       FROM_HERE, base::Bind(&RenderMediaLog::SendQueuedMediaEvents, this));
 }
 
-std::string RenderMediaLog::GetLastErrorMessage() {
+std::map<std::string, std::vector<std::string>>
+RenderMediaLog::GetErrorMessages() {
   base::AutoLock auto_lock(lock_);
 
-  // Return the conditional concatenation of the last pipeline error and the
-  // last media error log.
-  std::stringstream result;
+  std::map<std::string, std::vector<std::string>> result;
   if (last_pipeline_error_) {
-    result << MediaEventToLogString(*last_pipeline_error_)
-           << (last_media_error_log_entry_ ? ", " : "");
+    result[EventTypeToString(last_pipeline_error_->type)].push_back(
+        MediaEventToLogString(*last_pipeline_error_, false));
   }
-  if (last_media_error_log_entry_)
-    result << MediaEventToLogString(*last_media_error_log_entry_);
-  return result.str();
+
+  for (const auto& entry : recent_media_error_log_entries_) {
+    result[EventTypeToString(entry->type)].push_back(
+        MediaEventToLogString(*entry, false));
+  }
+
+  return result;
 }
 
 void RenderMediaLog::RecordRapporWithSecurityOrigin(const std::string& metric) {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(
         FROM_HERE, base::Bind(&RenderMediaLog::RecordRapporWithSecurityOrigin,
                               this, metric));
     return;
   }
 
@@ skipping 36 matching lines @@
   tick_clock_.swap(tick_clock);
   last_ipc_send_time_ = tick_clock_->NowTicks();
 }
 
 void RenderMediaLog::SetTaskRunnerForTesting(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   task_runner_ = task_runner;
 }
 
 }  // namespace content