Add media log messages to the main log

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 "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_thread.h"
 
 namespace content {
 
 RenderMediaLog::RenderMediaLog()
     : render_loop_(base::MessageLoopProxy::current()),
       tick_clock_(new base::DefaultTickClock()),
       last_ipc_send_time_(tick_clock_->NowTicks()) {
   DCHECK(RenderThread::Get()) <<
       "RenderMediaLog must be constructed on the render thread";
 }
 
 void RenderMediaLog::AddEvent(scoped_ptr<media::MediaLogEvent> event) {
   if (!RenderThread::Get()) {
     render_loop_->PostTask(FROM_HERE, base::Bind(
         &RenderMediaLog::AddEvent, this, base::Passed(&event)));
     return;
   }
 
+  if (event->type == media::MediaLogEvent::PIPELINE_ERROR) {
+    LOG(ERROR) << "MediaEvent: "
+               << media::MediaLog::MediaEventToLogString(*event.get());
+  } else if (event->type != media::MediaLogEvent::BUFFERED_EXTENTS_CHANGED &&
+             event->type != media::MediaLogEvent::PROPERTY_CHANGE &&
+             event->type != media::MediaLogEvent::NETWORK_ACTIVITY_SET) {
+    DVLOG(1) << "MediaEvent: "
+             << media::MediaLog::MediaEventToLogString(*event.get());
+  }
+
   // Keep track of the latest buffered extents properties to avoid sending
   // thousands of events over IPC. See http://crbug.com/352585 for details.
   //
   // TODO(scherkus): We should overhaul MediaLog entirely to have clearer
   // separation of properties vs. events.
   if (event->type == media::MediaLogEvent::BUFFERED_EXTENTS_CHANGED)
     last_buffered_extents_changed_event_.swap(event);
   else
     queued_media_events_.push_back(*event);
 
@@ skipping 17 matching lines @@
 
 RenderMediaLog::~RenderMediaLog() {}
 
 void RenderMediaLog::SetTickClockForTesting(
     scoped_ptr<base::TickClock> tick_clock) {
   tick_clock_.swap(tick_clock);
   last_ipc_send_time_ = tick_clock_->NowTicks();
 }
 
 }  // namespace content