Incorporating logging into Cast

media/cast/logging/logging_raw.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_raw.h"
 
-#include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 
 namespace media {
 namespace cast {
 
 LoggingRaw::LoggingRaw(base::TickClock* clock)
     : clock_(clock),
       frame_map_(),
@@ skipping 39 matching lines @@
     // Create a new map entry.
     FrameEvent info;
     info.frame_id = frame_id;
     info.timestamp.push_back(clock_->NowTicks());
     info.type.push_back(event);
     frame_map_.insert(std::make_pair(rtp_timestamp, info));
   } else {
     // Insert to an existing entry.
     it->second.timestamp.push_back(clock_->NowTicks());
     it->second.type.push_back(event);
+    // Do we have a valid frame_id?
+    // We don't always have it to begin with.
+    // TODO(mikhal): Switch frame_id to int when the fix gets in.
+    // This is currently illegal, as frame_id is uint8, so commenting it out.
+    // if (it->second.frame_id == -1 && frame_id != -1)
+    //   it->second.frame_id = frame_id;
   }
 }
 
 void LoggingRaw::InsertPacketEvent(CastLoggingEvent event,
                                    uint32 rtp_timestamp,
                                    uint8 frame_id,
                                    uint16 packet_id,
                                    uint16 max_packet_id,
-                                   int size) {
+                                   size_t size) {
   // Is this packet belonging to a new frame?
   PacketRawMap::iterator it = packet_map_.find(rtp_timestamp);
   if (it == packet_map_.end()) {
     // Create a new entry - start with base packet map.
     PacketEvent info;
     info.frame_id = frame_id;
     info.max_packet_id = max_packet_id;
     BasePacketInfo base_info;
     base_info.size = size;
     base_info.timestamp.push_back(clock_->NowTicks());
@@ skipping 44 matching lines @@
 }
 
 void LoggingRaw::Reset() {
   frame_map_.clear();
   packet_map_.clear();
   generic_map_.clear();
 }
 
 }  // namespace cast
 }  // namespace media