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

media/cast/rtcp/rtcp_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/rtcp/rtcp_sender.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 14 matching lines @@
     const base::TimeDelta& time_delta) {
   int64 time_delta_ms = time_delta.InMilliseconds();
   // Max delta is 4096 milliseconds.
   DCHECK_GE(GG_INT64_C(0xfff), time_delta_ms);
 
   uint16 event_type_and_timestamp_delta =
       static_cast<uint16>(time_delta_ms & 0xfff);
 
   uint16 event_type = 0;
   switch (event) {
-    case media::cast::kAckSent:
+    case media::cast::kAudioAckSent:
       event_type = 1;
       break;
     case media::cast::kAudioPlayoutDelay:
       event_type = 2;
       break;
     case media::cast::kAudioFrameDecoded:
       event_type = 3;
       break;
-    case media::cast::kVideoFrameDecoded:
+    case media::cast::kAudioPacketReceived:
       event_type = 4;
       break;
-    case media::cast::kVideoRenderDelay:
+    case media::cast::kVideoAckSent:
       event_type = 5;
       break;
-    case media::cast::kPacketReceived:
+    case media::cast::kVideoFrameDecoded:
       event_type = 6;
       break;
+    case media::cast::kVideoRenderDelay:
+      event_type = 7;
+      break;
+    case media::cast::kVideoPacketReceived:
+      event_type = 8;
+      break;
     case media::cast::kDuplicatePacketReceived:
-      event_type = 7;
+      event_type = 9;
       break;
     default:
       NOTREACHED();
   }
   DCHECK(!(event_type & 0xfff0));
   return (event_type << 12) + event_type_and_timestamp_delta;
 }
 
 bool ScanRtcpReceiverLogMessage(
     const media::cast::RtcpReceiverLogMessage& receiver_log_message,
@@ skipping 558 matching lines @@
     big_endian_writer.WriteU8(static_cast<uint8>(base_timestamp_ms));
 
     while (!frame_log_messages.event_log_messages_.empty() &&
            messages_in_frame > 0) {
       const RtcpReceiverEventLogMessage& event_message =
           frame_log_messages.event_log_messages_.front();
       uint16 event_type_and_timestamp_delta =
           MergeEventTypeAndTimestampForWireFormat(event_message.type,
           event_message.event_timestamp - event_timestamp_base);
       switch (event_message.type) {
-        case kAckSent:
+        case kAudioAckSent:
+        case kVideoAckSent:
         case kAudioPlayoutDelay:
         case kAudioFrameDecoded:
         case kVideoFrameDecoded:
         case kVideoRenderDelay:
           big_endian_writer.WriteU16(static_cast<uint16>(
               event_message.delay_delta.InMilliseconds()));
           big_endian_writer.WriteU16(event_type_and_timestamp_delta);
           break;
-        case kPacketReceived:
+        case kAudioPacketReceived:
+        case kVideoPacketReceived:
         case kDuplicatePacketReceived:
           big_endian_writer.WriteU16(event_message.packet_id);
           big_endian_writer.WriteU16(event_type_and_timestamp_delta);
           break;
         default:
           NOTREACHED();
       }
       messages_in_frame--;
       frame_log_messages.event_log_messages_.pop_front();
     }
     if (frame_log_messages.event_log_messages_.empty()) {
       // We sent all messages on this frame; pop the frame header.
       receiver_log_message->pop_front();
     }
   }
   DCHECK_EQ(total_number_of_messages_to_send, 0);
 }
 
 }  // namespace cast
 }  // namespace media