Remove reporting statistics reporting from chrome://media-internals and fix event logging.

media/base/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 "media/base/media_log.h"
 
 #include <string>
 
 #include "base/atomic_sequence_num.h"
-#include "base/bind.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"

[scherkus (not reviewing), 2012/05/10 02:45:03]

this .h should be removed

 #include "base/message_loop.h"
 #include "base/values.h"
 
 namespace media {
 
-// A count of all MediaLogs created on this render process.
-// Used to generate unique ids.
-static base::StaticAtomicSequenceNumber media_log_count;
+// A count of all MediaLogs created in the current process. Used to generate
+// unique IDs.
+static base::StaticAtomicSequenceNumber g_media_log_count;
 
 const char* MediaLog::EventTypeToString(MediaLogEvent::Type type) {
   switch (type) {
     case MediaLogEvent::WEBMEDIAPLAYER_CREATED:
       return "WEBMEDIAPLAYER_CREATED";
     case MediaLogEvent::WEBMEDIAPLAYER_DESTROYED:
       return "WEBMEDIAPLAYER_DESTROYED";
     case MediaLogEvent::PIPELINE_CREATED:
       return "PIPELINE_CREATED";
     case MediaLogEvent::PIPELINE_DESTROYED:
@@ skipping 17 matching lines @@
     case MediaLogEvent::TOTAL_BYTES_SET:
       return "TOTAL_BYTES_SET";
     case MediaLogEvent::NETWORK_ACTIVITY_SET:
       return "NETWORK_ACTIVITY_SET";
     case MediaLogEvent::ENDED:
       return "ENDED";
     case MediaLogEvent::AUDIO_RENDERER_DISABLED:
       return "AUDIO_RENDERER_DISABLED";
     case MediaLogEvent::BUFFERED_EXTENTS_CHANGED:
       return "BUFFERED_EXTENTS_CHANGED";
-    case MediaLogEvent::STATISTICS_UPDATED:
-      return "STATISTICS_UPDATED";
   }
   NOTREACHED();
   return NULL;
 }
 
 const char* MediaLog::PipelineStateToString(Pipeline::State state) {
   switch (state) {
     case Pipeline::kCreated:
       return "created";
     case Pipeline::kInitDemuxer:
@@ skipping 61 matching lines @@
       return "dumuxer: could not parse";
     case DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
       return "demuxer: no supported streams";
     case DECODER_ERROR_NOT_SUPPORTED:
       return "decoder: not supported";
   }
   NOTREACHED();
   return NULL;
 }
 
-MediaLog::MediaLog() {
-  id_ = media_log_count.GetNext();
-  stats_update_pending_ = false;
+MediaLog::MediaLog()
+  : id_(g_media_log_count.GetNext()) {

[scherkus (not reviewing), 2012/05/10 02:45:03]

crap I need to fix indent here

[Ami GONE FROM CHROMIUM, 2012/05/10 17:16:49]

single line?

[scherkus (not reviewing), 2012/05/10 17:31:23]

Done.

 }
 
 MediaLog::~MediaLog() {}
 
-void MediaLog::AddEvent(scoped_ptr<MediaLogEvent> event) {
-}
+void MediaLog::AddEvent(scoped_ptr<MediaLogEvent> event) {}

[Ami GONE FROM CHROMIUM, 2012/05/10 17:16:49]

Should this be pure-virtual?

[scherkus (not reviewing), 2012/05/10 17:31:23]

We create non-overridden MediaLogs in a few spots (tests, applications). Why?
not sure!

I wonder if this should be pure-virt and we have a subclass like MediaLogLogger
that VLOG(1)s the information so said tests/applications can quickly get some
logging information (i.e., pipeline state changes)

 
 scoped_ptr<MediaLogEvent> MediaLog::CreateEvent(MediaLogEvent::Type type) {
   scoped_ptr<MediaLogEvent> event(new MediaLogEvent);
   event->id = id_;
   event->type = type;
   event->time = base::Time::Now();
   return event.Pass();
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateBooleanEvent(
@@ skipping 55 matching lines @@
 scoped_ptr<MediaLogEvent> MediaLog::CreateBufferedExtentsChangedEvent(
     size_t start, size_t current, size_t end) {
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED));
   event->params.SetInteger("buffer_start", start);
   event->params.SetInteger("buffer_current", current);
   event->params.SetInteger("buffer_end", end);
   return event.Pass();
 }
 
-void MediaLog::QueueStatisticsUpdatedEvent(PipelineStatistics stats) {
-  base::AutoLock auto_lock(stats_lock_);
-  last_statistics_ = stats;
-
-  // Sadly, this function can get dispatched on threads not running a message
-  // loop.  Happily, this is pretty rare (only VideoRendererBase at this time)
-  // so we simply leave stats updating for another call to trigger.
-  if (!stats_update_pending_ && MessageLoop::current()) {
-    stats_update_pending_ = true;
-    MessageLoop::current()->PostDelayedTask(
-        FROM_HERE,
-        base::Bind(&media::MediaLog::AddStatisticsUpdatedEvent, this),
-        base::TimeDelta::FromMilliseconds(500));
-  }
-}
-
-void MediaLog::AddStatisticsUpdatedEvent() {
-  base::AutoLock auto_lock(stats_lock_);
-  scoped_ptr<MediaLogEvent> event(
-      CreateEvent(MediaLogEvent::STATISTICS_UPDATED));
-  event->params.SetInteger("audio_bytes_decoded",
-                           last_statistics_.audio_bytes_decoded);
-  event->params.SetInteger("video_bytes_decoded",
-                           last_statistics_.video_bytes_decoded);
-  event->params.SetInteger("video_frames_decoded",
-                           last_statistics_.video_frames_decoded);
-  event->params.SetInteger("video_frames_dropped",
-                           last_statistics_.video_frames_dropped);
-  AddEvent(event.Pass());
-  stats_update_pending_ = false;
-}
-
 }  //namespace media