Incorporating logging into Cast

media/cast/rtcp/rtcp.h

 // 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.
 
 #ifndef MEDIA_CAST_RTCP_RTCP_H_
 #define MEDIA_CAST_RTCP_RTCP_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.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"
 
 namespace media {
 namespace cast {
 
 class LocalRtcpReceiverFeedback;
 class LocalRtcpRttFeedback;
 class PacedPacketSender;
 class RtcpReceiver;
 class RtcpSender;
@@ skipping 18 matching lines @@
   virtual void GetStatistics(uint8* fraction_lost,
                              uint32* cumulative_lost,  // 24 bits valid.
                              uint32* extended_high_sequence_number,
                              uint32* jitter) = 0;
 
   virtual ~RtpReceiverStatistics() {}
 };
 
 class Rtcp {
  public:
-  Rtcp(base::TickClock* clock,
+  Rtcp(scoped_refptr<CastEnvironment> cast_environment,
        RtcpSenderFeedback* sender_feedback,
        PacedPacketSender* paced_packet_sender,
        RtpSenderStatistics* rtp_sender_statistics,
        RtpReceiverStatistics* rtp_receiver_statistics,
        RtcpMode rtcp_mode,
        const base::TimeDelta& rtcp_interval,
        bool sending_media,
        uint32 local_ssrc,
        const std::string& c_name);
 
@@ skipping 39 matching lines @@
                                       uint32 last_report,
                                       uint32 delay_since_last_report);
 
   void OnReceivedSendReportRequest();
 
   void UpdateRtt(const base::TimeDelta& sender_delay,
                  const base::TimeDelta& receiver_delay);
 
   void UpdateNextTimeToSendRtcp();
 
   base::TickClock* const clock_;  // Not owned by this class.

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

While you're at it please remove this member. The code can access the clock
through cast_environment_ anyway. There's just a handful of call sites.

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

Done.

+  scoped_refptr<CastEnvironment> cast_environment_;
   const base::TimeDelta rtcp_interval_;
   const RtcpMode rtcp_mode_;
   const bool sending_media_;
   const uint32 local_ssrc_;
 
   // Not owned by this class.
   RtpSenderStatistics* const rtp_sender_statistics_;
   RtpReceiverStatistics* const rtp_receiver_statistics_;
 
   scoped_ptr<LocalRtcpRttFeedback> rtt_feedback_;
@@ skipping 19 matching lines @@
   int number_of_rtt_in_avg_;
   float avg_rtt_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(Rtcp);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RTCP_RTCP_H_