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"
@@ skipping 19 matching lines @@
   // 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);
 
+  if (event->type == media::MediaLogEvent::PIPELINE_ERROR) {
+    LOG(ERROR) << media::MediaLog::MediaEventToLogString(*event.get());

[wolenetz, 2015/02/13 20:36:36]

nit: *. --> ->

[servolk, 2015/03/26 00:04:08]

This won't work (compile error). We are not trying to invoke the get() method on
MediaLogEvent here. We are calling .get() on scoped_ptr and then we are applying
* to get a reference from the raw pointer returned by .get().

[wolenetz, 2015/03/26 01:38:52]

Silly me.  Precedence bit me.

+  } 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());

[wolenetz, 2015/02/13 20:36:36]

nit: ditto

[servolk, 2015/03/26 00:04:08]

See above

[wolenetz, 2015/03/26 01:38:52]

Acknowledged.

+  }
+
   // Limit the send rate of high frequency events.
   base::TimeTicks curr_time = tick_clock_->NowTicks();
   if ((curr_time - last_ipc_send_time_) < base::TimeDelta::FromSeconds(1))
     return;
   last_ipc_send_time_ = curr_time;
 
   if (last_buffered_extents_changed_event_) {
     queued_media_events_.push_back(*last_buffered_extents_changed_event_);
     last_buffered_extents_changed_event_.reset();
   }
 
   DVLOG(1) << "media log events array size " << queued_media_events_.size();
 
   RenderThread::Get()->Send(
       new ViewHostMsg_MediaLogEvents(queued_media_events_));
   queued_media_events_.clear();
 }
 
 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