Cast: Add GetStats() extensions API.

media/cast/logging/logging_stats.cc

 // Copyright 2013 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/cast/logging/logging_stats.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace media {
@@ skipping 57 matching lines @@
   // Does this belong to an existing event?
   FrameStatsMap::iterator it = frame_stats_.find(event);
   if (it == frame_stats_.end()) {
     // New event.
     FrameLogStats stats;
     stats.first_event_time = time_of_event;
     stats.last_event_time = time_of_event;
     stats.event_counter = 1;
     frame_stats_.insert(std::make_pair(event, stats));
   } else {
+    ++(it->second.event_counter);
     it->second.last_event_time = time_of_event;
-    ++(it->second.event_counter);
   }
 }
 
 void LoggingStats::InsertPacketEvent(const base::TimeTicks& time_of_event,
                                      CastLoggingEvent event,
                                      uint32 rtp_timestamp,
                                      uint32 frame_id,
                                      uint16 packet_id,
                                      uint16 max_packet_id,
                                      size_t size) {
   // Does this packet belong to an existing event?
   PacketStatsMap::iterator it = packet_stats_.find(event);
   if (it == packet_stats_.end()) {
     // New event.
     PacketLogStats stats;
     stats.first_event_time = time_of_event;
     stats.last_event_time = time_of_event;
     stats.sum_size = size;
     stats.event_counter = 1;
     packet_stats_.insert(std::make_pair(event, stats));
   } else {
     // Add to an existing event.
     it->second.sum_size += size;
     ++(it->second.event_counter);
+    it->second.last_event_time = time_of_event;
   }
 }
 
 void LoggingStats::InsertGenericEvent(const base::TimeTicks& time_of_event,
                                       CastLoggingEvent event, int value) {
   // Does this event belong to an existing event?
   GenericStatsMap::iterator it = generic_stats_.find(event);
   if (it == generic_stats_.end()) {
     // New event.
     GenericLogStats stats;
@@ skipping 12 matching lines @@
     ++(it->second.event_counter);
     it->second.last_event_time = time_of_event;
     if (it->second.min > value) {
       it->second.min = value;
     } else if (it->second.max < value) {
       it->second.max = value;
     }
   }
 }
 
-FrameStatsMap LoggingStats::GetFrameStatsData() const {
-  return frame_stats_;
+FrameStatsMap LoggingStats::GetFrameStatsData(EventMediaType media_type) const {
+  DCHECK(media_type == AUDIO_EVENT || media_type == VIDEO_EVENT);
+
+  FrameStatsMap frame_map_to_return;
+  for (FrameStatsMap::const_iterator it = frame_stats_.begin();
+       it != frame_stats_.end();
+       ++it) {
+    if (GetEventMediaType(it->first) == media_type) {
+      frame_map_to_return.insert(std::make_pair(it->first, it->second));
+    }
+  }
+
+  return frame_map_to_return;
 }
 
-PacketStatsMap LoggingStats::GetPacketStatsData() const {
-  return packet_stats_;
+PacketStatsMap LoggingStats::GetPacketStatsData(
+    EventMediaType media_type) const {
+  DCHECK(media_type == AUDIO_EVENT || media_type == VIDEO_EVENT);
+
+  PacketStatsMap packet_map_to_return;
+  for (PacketStatsMap::const_iterator it = packet_stats_.begin();
+       it != packet_stats_.end();
+       ++it) {
+    if (GetEventMediaType(it->first) == media_type) {
+      packet_map_to_return.insert(std::make_pair(it->first, it->second));
+    }
+  }
+
+  return packet_map_to_return;
 }
 
 GenericStatsMap LoggingStats::GetGenericStatsData() const {
   return generic_stats_;
 }
 
 }  // namespace cast
 }  // namespace media