Incorporating logging into Cast

media/cast/rtp_sender/rtp_sender.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/rtp_sender/rtp_sender.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/pacing/paced_sender.h"
 #include "media/cast/rtcp/rtcp_defines.h"
+#include "net/base/big_endian.h"
 
 namespace media {
 namespace cast {
 
-RtpSender::RtpSender(base::TickClock* clock,
+RtpSender::RtpSender(scoped_refptr<CastEnvironment> cast_environment,
                      const AudioSenderConfig* audio_config,
                      const VideoSenderConfig* video_config,
                      PacedPacketSender* transport)
-    : config_(),
-      transport_(transport),
-      clock_(clock) {
+    : clock_(cast_environment->Clock()),

[Alpha Left Google, 2013/11/14 00:29:24]

This is not used anywhere in this file. Please remove it.

[mikhal, 2013/11/14 17:42:31]

Done.

+      cast_environment_(cast_environment),
+      config_(),
+      transport_(transport) {
   // Store generic cast config and create packetizer config.
   DCHECK(audio_config || video_config) << "Invalid argument";
   if (audio_config) {
-    storage_.reset(new PacketStorage(clock, audio_config->rtp_history_ms));
+    storage_.reset(new PacketStorage(cast_environment->Clock(),
+                                     audio_config->rtp_history_ms));
     config_.audio = true;
     config_.ssrc = audio_config->sender_ssrc;
     config_.payload_type = audio_config->rtp_payload_type;
     config_.frequency = audio_config->frequency;
     config_.audio_codec = audio_config->codec;
   } else {
-    storage_.reset(new PacketStorage(clock, video_config->rtp_history_ms));
+    storage_.reset(new PacketStorage(cast_environment->Clock(),
+                                     video_config->rtp_history_ms));
     config_.audio = false;
     config_.ssrc = video_config->sender_ssrc;
     config_.payload_type = video_config->rtp_payload_type;
     config_.frequency = kVideoFrequency;
     config_.video_codec = video_config->codec;
   }
   // Randomly set start values.
   config_.sequence_number = base::RandInt(0, 65535);
   config_.rtp_timestamp = base::RandInt(0, 65535);
   config_.rtp_timestamp += base::RandInt(0, 65535) << 16;
@@ skipping 31 matching lines @@
         // Get packet from storage.
         success = storage_->GetPacket(frame_id, packet_id, &packets_to_resend);
 
         // Resend packet to the network.
         if (success) {
           VLOG(1) << "Resend " << static_cast<int>(frame_id)
                   << ":" << packet_id;
           // Set a unique incremental sequence number for every packet.
           Packet& packet = packets_to_resend.back();
           UpdateSequenceNumber(&packet);
+          // Log retransmission (first extract rtp_timestamp).
+          uint32 rtp_timestamp;
+          net::BigEndianReader big_endian_reader(packet.data() + 4, 4);
+          big_endian_reader.ReadU32(&rtp_timestamp);
+          // TODO(mikhal): Consider placing the max value instead of -1.
+          cast_environment_->Logging()->InsertPacketEvent(kPacketRetransmited,
+              rtp_timestamp, frame_id, packet_id, -1, packet.size());
           // Set the size as correspond to each frame.
           ++packet_id;
         }
       } while (success);
     } else {
       // Iterate over all of the packets in the frame.
       for (PacketIdSet::const_iterator set_it = packets_set.begin();
           set_it != packets_set.end(); ++set_it) {
         uint16 packet_id = *set_it;
         success = storage_->GetPacket(frame_id, packet_id, &packets_to_resend);
@@ skipping 38 matching lines @@
         time_since_last_send.InMilliseconds() * (config_.frequency / 1000);
   } else {
     sender_info->rtp_timestamp = 0;
   }
   sender_info->send_packet_count = packetizer_->send_packets_count();
   sender_info->send_octet_count = packetizer_->send_octet_count();
 }
 
 }  //  namespace cast
 }  // namespace media