Media: Report informational error messages to HTMLMediaElement

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"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/default_tick_clock.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_thread.h"
 
 namespace {
@@ skipping 27 matching lines @@
 void RenderMediaLog::AddEvent(scoped_ptr<media::MediaLogEvent> event) {
   Log(event.get());
 
   // For enforcing delay until it's been a second since the last ipc message was
   // sent.
   base::TimeDelta delay_for_next_ipc_send;
 
   {
     base::AutoLock auto_lock(lock_);
 
-    // Keep track of the latest buffered extents properties to avoid sending
-    // thousands of events over IPC. See http://crbug.com/352585 for details.
-    if (event->type == media::MediaLogEvent::BUFFERED_EXTENTS_CHANGED)
-      last_buffered_extents_changed_event_.swap(event);
-    else
-      queued_media_events_.push_back(*event);
+    switch (event->type) {
+      case media::MediaLogEvent::BUFFERED_EXTENTS_CHANGED:
+        // Keep track of the latest buffered extents properties to avoid sending
+        // thousands of events over IPC. See http://crbug.com/352585 for
+        // details.
+        last_buffered_extents_changed_event_.swap(event);
+        // SendQueuedMediaEvents() will enqueue the most recent event of this
+        // kind, if any, prior to sending the event batch.
+        break;
+
+      // Hold onto the most recent PIPELINE_ERROR and MEDIA_LOG_ERROR_ENTRY for
+      // use in GetLastErrorMessage();

[watk, 2016/04/04 23:47:25]

nit: s/;/./

[wolenetz, 2016/04/05 00:23:27]

Done.

+      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);
+        break;
+
+      // Just enqueue all other event types for throttled transmission.
+      default:
+        queued_media_events_.push_back(*event);
+    }
 
     if (ipc_send_pending_)
       return;
 
     ipc_send_pending_ = true;
     delay_for_next_ipc_send = base::TimeDelta::FromSeconds(1) -
                               (tick_clock_->NowTicks() - last_ipc_send_time_);
   }
 
   if (delay_for_next_ipc_send > base::TimeDelta()) {
     task_runner_->PostDelayedTask(
         FROM_HERE, base::Bind(&RenderMediaLog::SendQueuedMediaEvents, this),
         delay_for_next_ipc_send);
     return;
   }
 
   // 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() {
+  base::AutoLock auto_lock(lock_);
+
+  // Return the conditional concatenation of the last pipeline error and the
+  // last media error log.
+  std::stringstream result;
+  if (last_pipeline_error_)
+    result << MediaEventToLogString(*last_pipeline_error_)
+           << (last_media_error_log_entry_ ? ", " : "");

[watk, 2016/04/04 23:47:25]

braces around multi-line statement

[wolenetz, 2016/04/05 00:23:27]

Argh!! git cl format strikes again :/ Done.

+  if (last_media_error_log_entry_)
+    result << MediaEventToLogString(*last_media_error_log_entry_);
+  return result.str();
+}
+
 void RenderMediaLog::SendQueuedMediaEvents() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   std::vector<media::MediaLogEvent> events_to_send;
   {
     base::AutoLock auto_lock(lock_);
 
     DCHECK(ipc_send_pending_);
     ipc_send_pending_ = false;
 
@@ skipping 18 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