| Index: media/cast/logging/logging_stats.cc
|
| diff --git a/media/cast/logging/logging_stats.cc b/media/cast/logging/logging_stats.cc
|
| index e9e6d729b5eb980c03a5ab005c99630ae9f1451a..c45410a4b1761375c049ded9556f73bd1a0bb2a5 100644
|
| --- a/media/cast/logging/logging_stats.cc
|
| +++ b/media/cast/logging/logging_stats.cc
|
| @@ -75,8 +75,8 @@ void LoggingStats::InsertBaseFrameEvent(const base::TimeTicks& time_of_event,
|
| stats.event_counter = 1;
|
| frame_stats_.insert(std::make_pair(event, stats));
|
| } else {
|
| - it->second.last_event_time = time_of_event;
|
| ++(it->second.event_counter);
|
| + it->second.last_event_time = time_of_event;
|
| }
|
| }
|
|
|
| @@ -101,6 +101,7 @@ void LoggingStats::InsertPacketEvent(const base::TimeTicks& time_of_event,
|
| // Add to an existing event.
|
| it->second.sum_size += size;
|
| ++(it->second.event_counter);
|
| + it->second.last_event_time = time_of_event;
|
| }
|
| }
|
|
|
| @@ -133,12 +134,35 @@ void LoggingStats::InsertGenericEvent(const base::TimeTicks& time_of_event,
|
| }
|
| }
|
|
|
| -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 {
|
|
|