Cast: Refactor RTCP handling

media/cast/net/cast_transport_config.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.
 
 #ifndef MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_
 #define MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "media/cast/net/cast_transport_defines.h"
 
 namespace media {
 namespace cast {
 
-enum RtcpMode {
-  kRtcpCompound,     // Compound RTCP mode is described by RFC 4585.
-  kRtcpReducedSize,  // Reduced-size RTCP mode is described by RFC 5506.
-};
-
 enum Codec {
   CODEC_UNKNOWN,
   CODEC_AUDIO_OPUS,
   CODEC_AUDIO_PCM16,
   CODEC_VIDEO_FAKE,
   CODEC_VIDEO_VP8,
   CODEC_VIDEO_H264,
   CODEC_LAST = CODEC_VIDEO_H264
 };
 
 struct CastTransportRtpConfig {
   CastTransportRtpConfig();
   ~CastTransportRtpConfig();
 
   // Identifier refering to this sender.
   uint32 ssrc;
 
+  // Identifier for incoming RTCP traffic.
+  uint32 feedback_ssrc;
+
+  // Identifier for this stream.
+  std::string c_name;
+
   // RTP payload type enum: Specifies the type/encoding of frame data.
   int rtp_payload_type;
 
   // The number of most-recent frames that must be stored in the transport
   // layer, to facilitate re-transmissions.
   int stored_frames;
 
   // The AES crypto key and initialization vector.  Each of these strings
   // contains the data in binary form, of size kAesKeySize.  If they are empty
   // strings, crypto is not being used.
@@ skipping 112 matching lines @@
   uint32 delay_since_last_sr;
 };
 
 struct RtcpDlrrReportBlock {
   RtcpDlrrReportBlock();
   ~RtcpDlrrReportBlock();
   uint32 last_rr;
   uint32 delay_since_last_rr;
 };
 
-// This is only needed because IPC messages don't support more than
-// 5 arguments.
-struct SendRtcpFromRtpSenderData {
-  SendRtcpFromRtpSenderData();
-  ~SendRtcpFromRtpSenderData();
-  uint32 packet_type_flags;
-  uint32 sending_ssrc;
-  std::string c_name;
-  uint32 ntp_seconds;
-  uint32 ntp_fraction;
-  uint32 rtp_timestamp;
-};
-
 inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) {
   return lhs.ntp_seconds == rhs.ntp_seconds &&
          lhs.ntp_fraction == rhs.ntp_fraction &&
          lhs.rtp_timestamp == rhs.rtp_timestamp &&
          lhs.send_packet_count == rhs.send_packet_count &&
          lhs.send_octet_count == rhs.send_octet_count;
 }
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_