Cast: Simplify code path for RTCP sender report

chrome/common/cast_messages.h

 // Copyright 2014 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.
 
 // IPC messages for the Cast transport API.
 // Multiply-included message file, hence no include guard.
 
 #include "ipc/ipc_message_macros.h"
 #include "media/cast/cast_sender.h"
 #include "media/cast/logging/logging_defines.h"
@@ skipping 26 matching lines @@
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedVideoFrame)
   IPC_STRUCT_TRAITS_MEMBER(codec)
   IPC_STRUCT_TRAITS_MEMBER(key_frame)
   IPC_STRUCT_TRAITS_MEMBER(frame_id)
   IPC_STRUCT_TRAITS_MEMBER(last_referenced_frame_id)
   IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
   IPC_STRUCT_TRAITS_MEMBER(data)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtcpSenderInfo)
-  IPC_STRUCT_TRAITS_MEMBER(ntp_seconds)
-  IPC_STRUCT_TRAITS_MEMBER(ntp_fraction)
-  IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
-  IPC_STRUCT_TRAITS_MEMBER(send_packet_count)
-  IPC_STRUCT_TRAITS_MEMBER(send_octet_count)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtcpDlrrReportBlock)
   IPC_STRUCT_TRAITS_MEMBER(last_rr)
   IPC_STRUCT_TRAITS_MEMBER(delay_since_last_rr)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtpConfig)
   IPC_STRUCT_TRAITS_MEMBER(ssrc)
   IPC_STRUCT_TRAITS_MEMBER(max_delay_ms)
   IPC_STRUCT_TRAITS_MEMBER(payload_type)
   IPC_STRUCT_TRAITS_MEMBER(aes_key)
@@ skipping 14 matching lines @@
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::CastTransportVideoConfig)
   IPC_STRUCT_TRAITS_MEMBER(rtp)
   IPC_STRUCT_TRAITS_MEMBER(codec)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::SendRtcpFromRtpSenderData)
   IPC_STRUCT_TRAITS_MEMBER(packet_type_flags)
   IPC_STRUCT_TRAITS_MEMBER(sending_ssrc)
   IPC_STRUCT_TRAITS_MEMBER(c_name)
+  IPC_STRUCT_TRAITS_MEMBER(ntp_seconds)
+  IPC_STRUCT_TRAITS_MEMBER(ntp_fraction)
+  IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::PacketEvent)
   IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
   IPC_STRUCT_TRAITS_MEMBER(frame_id)
   IPC_STRUCT_TRAITS_MEMBER(max_packet_id)
   IPC_STRUCT_TRAITS_MEMBER(packet_id)
   IPC_STRUCT_TRAITS_MEMBER(size)
   IPC_STRUCT_TRAITS_MEMBER(timestamp)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(media_type)
 IPC_STRUCT_TRAITS_END()
 
 // Cast messages sent from the browser to the renderer.
 
 IPC_MESSAGE_CONTROL2(CastMsg_ReceivedPacket,
                      int32 /* channel_id */,
                      media::cast::Packet /* packet */);
 
 IPC_MESSAGE_CONTROL2(
     CastMsg_NotifyStatusChange,
     int32 /* channel_id */,
     media::cast::transport::CastTransportStatus /* status */);
 
-IPC_MESSAGE_CONTROL5(
-    CastMsg_RtpStatistics,
-    int32 /* channel_id */,
-    bool /* audio */,
-    media::cast::transport::RtcpSenderInfo /* sender_info */,
-    base::TimeTicks /* time_sent */,
-    uint32 /* rtp_timestamp */);
-
 IPC_MESSAGE_CONTROL2(CastMsg_RawEvents,
                      int32 /* channel_id */,
                      std::vector<media::cast::PacketEvent> /* packet_events */);
 
 // Cast messages sent from the renderer to the browser.
 
 IPC_MESSAGE_CONTROL2(
   CastHostMsg_InitializeAudio,
   int32 /*channel_id*/,
   media::cast::transport::CastTransportAudioConfig /*config*/)
 
 IPC_MESSAGE_CONTROL2(
   CastHostMsg_InitializeVideo,
   int32 /*channel_id*/,
   media::cast::transport::CastTransportVideoConfig /*config*/)
 
 IPC_MESSAGE_CONTROL3(
     CastHostMsg_InsertCodedAudioFrame,
     int32 /* channel_id */,
     media::cast::transport::EncodedAudioFrame /* audio_frame */,
     base::TimeTicks /* recorded_time */)
 
 IPC_MESSAGE_CONTROL3(
     CastHostMsg_InsertCodedVideoFrame,
     int32 /* channel_id */,
     media::cast::transport::EncodedVideoFrame /* video_frame */,
     base::TimeTicks /* recorded_time */)
 
-IPC_MESSAGE_CONTROL4(
+IPC_MESSAGE_CONTROL3(
     CastHostMsg_SendRtcpFromRtpSender,
     int32 /* channel_id */,
-    media::cast::transport::SendRtcpFromRtpSenderData /* flags, ssrc, name */,
-    media::cast::transport::RtcpSenderInfo /* sender_info */,
+    media::cast::transport::SendRtcpFromRtpSenderData /* data */,
     media::cast::transport::RtcpDlrrReportBlock /* dlrr */)
 
 IPC_MESSAGE_CONTROL3(
     CastHostMsg_ResendPackets,
     int32 /* channel_id */,
     bool /* is_audio */,
     media::cast::MissingFramesAndPacketsMap /* missing_packets */)
 
 IPC_MESSAGE_CONTROL2(
     CastHostMsg_New,
     int32 /* channel_id */,
     net::IPEndPoint /*remote_end_point*/);
 
 IPC_MESSAGE_CONTROL1(
     CastHostMsg_Delete,
     int32 /* channel_id */);