cast: Wire upp logging to be sent over RTCP between receiver and sender.

media/cast/rtcp/rtcp.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/rtcp/rtcp.h"
 
 #include "base/rand_util.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
@@ skipping 80 matching lines @@
     // Add received log messages into our log system.
     RtcpReceiverLogMessage::const_iterator it = receiver_log.begin();
 
     for (; it != receiver_log.end(); ++it) {
       uint32 rtp_timestamp = it->rtp_timestamp_;
 
       RtcpReceiverEventLogMessages::const_iterator event_it =
           it->event_log_messages_.begin();
       for (; event_it != it->event_log_messages_.end(); ++event_it) {
         switch (event_it->type) {
-          case kPacketReceived:
+          case kAudioPacketReceived:
+          case kVideoPacketReceived:
           case kDuplicatePacketReceived:
             cast_environment_->Logging()->InsertPacketEvent(
                 event_it->event_timestamp, event_it->type, rtp_timestamp,
                 kFrameIdUnknown, event_it->packet_id, 0, 0);
             break;
-          case kAckSent:
+          case kAudioAckSent:
+          case kVideoAckSent:
           case kAudioFrameDecoded:
           case kVideoFrameDecoded:
             cast_environment_->Logging()->InsertFrameEvent(
                 event_it->event_timestamp, event_it->type, rtp_timestamp,
                 kFrameIdUnknown);
             break;
           case kAudioPlayoutDelay:
           case kVideoRenderDelay:
             cast_environment_->Logging()->InsertFrameEventWithDelay(
                 event_it->event_timestamp, event_it->type, rtp_timestamp,
@@ skipping 135 matching lines @@
 void Rtcp::SendRtcpFromRtpReceiver(const RtcpCastMessage* cast_message,
                                    RtcpReceiverLogMessage* receiver_log) {
   uint32 packet_type_flags = 0;
 
   base::TimeTicks now = cast_environment_->Clock()->NowTicks();
   transport::RtcpReportBlock report_block;
   RtcpReceiverReferenceTimeReport rrtr;
 
   if (cast_message) {
     packet_type_flags |= RtcpSender::kRtcpCast;
-    cast_environment_->Logging()->InsertGenericEvent(now, kAckSent,
-        cast_message->ack_frame_id_);
   }
   if (receiver_log) {
     packet_type_flags |= RtcpSender::kRtcpReceiverLog;
   }
   if (rtcp_mode_ == kRtcpCompound || now >= next_time_to_send_rtcp_) {
     packet_type_flags |= RtcpSender::kRtcpRr;
 
     report_block.remote_ssrc = 0;  // Not needed to set send side.
     report_block.media_ssrc = remote_ssrc_;  // SSRC of the RTP packet sender.
     if (rtp_receiver_statistics_) {
       rtp_receiver_statistics_->GetStatistics(
           &report_block.fraction_lost,
           &report_block.cumulative_lost,
           &report_block.extended_high_sequence_number,
           &report_block.jitter);
       cast_environment_->Logging()->InsertGenericEvent(now, kJitterMs,
           report_block.jitter);
       cast_environment_->Logging()->InsertGenericEvent(now, kPacketLoss,
           report_block.fraction_lost);
-
     }
 
     report_block.last_sr = last_report_received_;
     if (!time_last_report_received_.is_null()) {
       uint32 delay_seconds = 0;
       uint32 delay_fraction = 0;
       base::TimeDelta delta = now - time_last_report_received_;
       ConvertTimeToFractions(delta.InMicroseconds(),
                              &delay_seconds,
                              &delay_fraction);
@@ skipping 207 matching lines @@
   int random = base::RandInt(0, 999);
   base::TimeDelta time_to_next = (rtcp_interval_ / 2) +
       (rtcp_interval_ * random / 1000);
 
   base::TimeTicks now = cast_environment_->Clock()->NowTicks();
   next_time_to_send_rtcp_ = now + time_to_next;
 }
 
 }  // namespace cast
 }  // namespace media