Incorporating logging into Cast

media/cast/rtcp/rtcp.cc

Index: media/cast/rtcp/rtcp.cc
diff --git a/media/cast/rtcp/rtcp.cc b/media/cast/rtcp/rtcp.cc
index a1720ffe1a2e433c9026d21c6482df8e79e6bb86..d476453d980af53d382ff4cdbb3b01b9ecf86d29 100644
--- a/media/cast/rtcp/rtcp.cc
+++ b/media/cast/rtcp/rtcp.cc
@@ -8,6 +8,7 @@
 #include "base/rand_util.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
+#include "media/cast/cast_environment.h"
 #include "media/cast/rtcp/rtcp_defines.h"
 #include "media/cast/rtcp/rtcp_receiver.h"
 #include "media/cast/rtcp/rtcp_sender.h"
@@ -84,7 +85,7 @@ class LocalRtcpReceiverFeedback : public RtcpReceiverFeedback {
   Rtcp* rtcp_;
 };
 
-Rtcp::Rtcp(base::TickClock* clock,
+Rtcp::Rtcp(scoped_refptr<CastEnvironment> cast_environment,
            RtcpSenderFeedback* sender_feedback,
            PacedPacketSender* paced_packet_sender,
            RtpSenderStatistics* rtp_sender_statistics,
@@ -110,7 +111,8 @@ Rtcp::Rtcp(base::TickClock* clock,
       last_received_ntp_fraction_(0),
       min_rtt_(base::TimeDelta::FromMilliseconds(kMaxRttMs)),
       number_of_rtt_in_avg_(0),
-      clock_(clock) {
+      clock_(cast_environment->Clock()),

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

You're removing clock from the constructor parameter anyway, might as well
remove |clock_| entirely.

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

removed
On 2013/11/14 00:29:24, Alpha wrote:

+      cast_environment_(cast_environment) {
   rtcp_receiver_.reset(new RtcpReceiver(sender_feedback,
                                         receiver_feedback_.get(),
                                         rtt_feedback_.get(),
@@ -175,6 +177,9 @@ void Rtcp::SendRtcpCast(const RtcpCastMessage& cast_message) {
   }
   packet_type_flags |= RtcpSender::kRtcpCast;
 
+  cast_environment_->Logging()->InsertGenericEvent(kAckSent,
+                                                   cast_message.ack_frame_id_);
+
   SendRtcp(now, packet_type_flags, 0, &cast_message);
 }
 
@@ -255,6 +260,11 @@ void Rtcp::SendRtcp(const base::TimeTicks& now,
           &report_block.cumulative_lost,
           &report_block.extended_high_sequence_number,
           &report_block.jitter);
+    cast_environment_->Logging()->InsertGenericEvent(kJitterMs,

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

nit: indent by 2 spaces.

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

Done.

+        report_block.jitter);
+    cast_environment_->Logging()->InsertGenericEvent(kPacketLoss,

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

nit: indent by 2 spaces.

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

Done.

+        report_block.fraction_lost);
+
     }
 
     report_block.last_sr = last_report_received_;
@@ -379,7 +389,9 @@ bool Rtcp::Rtt(base::TimeDelta* rtt,
   DCHECK(min_rtt) << "Invalid argument";
   DCHECK(max_rtt) << "Invalid argument";
 
-  if (number_of_rtt_in_avg_ == 0)  return false;
+  if (number_of_rtt_in_avg_ == 0) return false;
+  cast_environment_->Logging()->InsertGenericEvent(kRttMs,
+                                                   rtt->InMilliseconds());
 
   *rtt = rtt_;
   *avg_rtt = base::TimeDelta::FromMilliseconds(avg_rtt_ms_);