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

media/cast/video_receiver/video_receiver.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/video_receiver/video_receiver.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 387 matching lines @@
 
   base::TimeTicks now = cast_environment_->Clock()->NowTicks();
   if (time_incoming_packet_.is_null() || now - time_incoming_packet_ >
       base::TimeDelta::FromMilliseconds(kMinTimeBetweenOffsetUpdatesMs)) {
     if (time_incoming_packet_.is_null()) InitializeTimers();
     incoming_rtp_timestamp_ = rtp_header.webrtc.header.timestamp;
     time_incoming_packet_ = now;
     time_incoming_packet_updated_ = true;
   }
 
-  cast_environment_->Logging()->InsertPacketEvent(now, kPacketReceived,
+  cast_environment_->Logging()->InsertPacketEvent(now, kVideoPacketReceived,
       rtp_header.webrtc.header.timestamp, rtp_header.frame_id,
       rtp_header.packet_id, rtp_header.max_packet_id, payload_size);
 
   bool duplicate = false;
   bool complete = framer_->InsertPacket(payload_data, payload_size, rtp_header,
                                         &duplicate);
 
   if (duplicate) {
     cast_environment_->Logging()->InsertPacketEvent(now,
         kDuplicatePacketReceived,
         rtp_header.webrtc.header.timestamp, rtp_header.frame_id,
         rtp_header.packet_id, rtp_header.max_packet_id, payload_size);
     // Duplicate packets are ignored.
     return;
   }
   if (!complete) return;  // Video frame not complete; wait for more packets.
   if (queued_encoded_callbacks_.empty()) return;  // No pending callback.
 
   VideoFrameEncodedCallback callback = queued_encoded_callbacks_.front();
   queued_encoded_callbacks_.pop_front();
   cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE,
       base::Bind(&VideoReceiver::GetEncodedVideoFrame,
           weak_factory_.GetWeakPtr(), callback));
 }
 
 // Send a cast feedback message. Actual message created in the framer (cast
 // message builder).
 void VideoReceiver::CastFeedback(const RtcpCastMessage& cast_message) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
-  // TODO(pwestin): wire up log messages.
-  rtcp_->SendRtcpFromRtpReceiver(&cast_message, NULL);
-  time_last_sent_cast_message_= cast_environment_->Clock()->NowTicks();
+
+  RtcpReceiverLogMessage receiver_log;
+  VideoRtcpRawMap video_logs =
+      cast_environment_->Logging()->GetVideoRtcpRawData();
+
+  while (!video_logs.empty()) {
+    VideoRtcpRawMap::iterator it = video_logs.begin();
+    uint32 rtp_timestamp = it->first;
+    std::pair<VideoRtcpRawMap::iterator, VideoRtcpRawMap::iterator>
+        frame_range = video_logs.equal_range(rtp_timestamp);
+
+    RtcpReceiverFrameLogMessage frame_log(rtp_timestamp);
+
+    VideoRtcpRawMap::const_iterator event_it = frame_range.first;
+    for (; event_it != frame_range.second; ++event_it) {
+      RtcpReceiverEventLogMessage event_log_message;
+      event_log_message.type = event_it->second.type;
+      event_log_message.event_timestamp = event_it->second.timestamp;
+      event_log_message.delay_delta = event_it->second.delay_delta;
+      event_log_message.packet_id = event_it->second.packet_id;
+      frame_log.event_log_messages_.push_back(event_log_message);
+    }
+    receiver_log.push_back(frame_log);
+    video_logs.erase(rtp_timestamp);
+  }
+  base::TimeTicks now = cast_environment_->Clock()->NowTicks();
+  cast_environment_->Logging()->InsertGenericEvent(now, kVideoAckSent,
+      cast_message.ack_frame_id_);
+
+  rtcp_->SendRtcpFromRtpReceiver(&cast_message, &receiver_log);
+  time_last_sent_cast_message_= now;
 }
 
 // Cast messages should be sent within a maximum interval. Schedule a call
 // if not triggered elsewhere, e.g. by the cast message_builder.
 void VideoReceiver::ScheduleNextCastMessage() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   base::TimeTicks send_time;
   framer_->TimeToSendNextCastMessage(&send_time);
 
   base::TimeDelta time_to_send = send_time -
@@ skipping 26 matching lines @@
 }
 
 void VideoReceiver::SendNextRtcpReport() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   rtcp_->SendRtcpFromRtpReceiver(NULL, NULL);
   ScheduleNextRtcpReport();
 }
 
 }  // namespace cast
 }  // namespace media