Add PipelineStatus UMA logging to media_internals

content/browser/media/media_internals.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_
 #define CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "media/audio/audio_logging.h"
+#include "media/base/media_log.h"
 #include "media/video/capture/video_capture_device_info.h"
 
 namespace media {
 class AudioParameters;
 struct MediaLogEvent;
 }
 
 namespace content {
 
 // This class stores information about currently active media.
 class CONTENT_EXPORT MediaInternals
-    : NON_EXPORTED_BASE(public media::AudioLogFactory) {
+    : NON_EXPORTED_BASE(public media::AudioLogFactory),
+      public NotificationObserver {

[DaleCurtis, 2014/11/06 23:49:08]

Instead of adding this to the main MediaInternals class, you should just add a
private inner class to the CC file that MediaInternals can own; just like
AudioLogImpl is done.

[prabhur1, 2014/11/07 23:43:23]

Done.

  public:
+  // NotificationObserver implementation.
+  void Observe(int type,
+               const NotificationSource& source,
+               const NotificationDetails& details) override;
+
   // Called with the update string.
   typedef base::Callback<void(const base::string16&)> UpdateCallback;
 
   static MediaInternals* GetInstance();
 
   ~MediaInternals() override;
 
   // Called when a MediaEvent occurs.
   void OnMediaEvents(int render_process_id,
                      const std::vector<media::MediaLogEvent>& events);
 
   // Add/remove update callbacks (see above).  Must be called on the IO thread.
   void AddUpdateCallback(const UpdateCallback& callback);
   void RemoveUpdateCallback(const UpdateCallback& callback);
 
   // Sends all audio cached data to each registered UpdateCallback.
   void SendAudioStreamData();
 
   // Sends all video capture capabilities cached data to each registered
   // UpdateCallback.
   void SendVideoCaptureDeviceCapabilities();
 
   // Called to inform of the capabilities enumerated for video devices.
   void UpdateVideoCaptureDeviceCapabilities(
       const media::VideoCaptureDeviceInfos& video_capture_device_infos);
 
   // AudioLogFactory implementation.  Safe to call from any thread.
   scoped_ptr<media::AudioLog> CreateAudioLog(AudioComponent component) override;
 
+  void LogAndClearPlayersInRenderer(int render_process_id);
+
  private:
+  struct PipelineInfo {
+    media::PipelineStatus last_pipeline_status;

[DaleCurtis, 2014/11/06 23:49:08]

If you take my advice above this whole thing should move into the .cc file.  You
should move all the initialization into constructor parameters.  See the syntax
on MediaInternals().

[prabhur1, 2014/11/07 23:43:24]

Done.

+    bool has_audio;
+    bool has_video;
+    std::string audio_codec_name;
+    std::string video_codec_name;
+    std::string video_decoder;
+    PipelineInfo() {
+      has_audio = false;
+      has_video = false;
+      audio_codec_name = "";

[DaleCurtis, 2014/11/06 23:49:08]

Not necessary to initialize the strings.

[prabhur1, 2014/11/07 23:43:23]

Done.

+      video_codec_name = "";
+      video_decoder = "";
+      last_pipeline_status = media::PIPELINE_OK;
+    }
+  };
+
+  // Key is playerid
+  typedef std::map<int, PipelineInfo*> PlayerInfoMap;

[DaleCurtis, 2014/11/06 23:49:08]

Don't use a pointer, no need since you're providing a default constructor...

[prabhur1, 2014/11/07 23:43:23]

Done.

+
+  // Key is renderer id
+  typedef std::map<int, PlayerInfoMap> RendererPlayerMap;
+
+  // Stores player information per renderer
+  RendererPlayerMap renderer_info;
+
+  NotificationRegistrar registrar_;
+
   friend class AudioLogImpl;
   friend class MediaInternalsTest;
   friend struct base::DefaultLazyInstanceTraits<MediaInternals>;
 
   MediaInternals();
 
+  void SavePlayerState(const media::MediaLogEvent& event,
+                       int render_process_id);
+  void LogUMAForPipelineStatus(const PipelineInfo& player_info);

[DaleCurtis, 2014/11/06 23:49:08]

s/Log/Report/

[prabhur1, 2014/11/07 23:43:23]

Done.

+
   // Sends |update| to each registered UpdateCallback.  Safe to call from any
   // thread, but will forward to the IO thread.
   void SendUpdate(const base::string16& update);
 
   // Caches |value| under |cache_key| so that future SendAudioStreamData() calls
   // will include the current data.  Calls JavaScript |function|(|value|) for
   // each registered UpdateCallback.  SendUpdateAndPurgeCache() is similar but
   // purges the cache entry after completion instead.
   void SendUpdateAndCacheAudioStreamKey(const std::string& cache_key,
                                         const std::string& function,
                                         const base::DictionaryValue* value);
   void SendUpdateAndPurgeAudioStreamCache(const std::string& cache_key,
                                           const std::string& function,
                                           const base::DictionaryValue* value);
 
   // Must only be accessed on the IO thread.
   std::vector<UpdateCallback> update_callbacks_;
   base::ListValue video_capture_capabilities_cached_data_;
 
   // All variables below must be accessed under |lock_|.
   base::Lock lock_;
   base::DictionaryValue audio_streams_cached_data_;
   int owner_ids_[AUDIO_COMPONENT_MAX];
 
   DISALLOW_COPY_AND_ASSIGN(MediaInternals);
 };
 
-} // namespace content
+}  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_