| Index: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
 | 
| diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
 | 
| index 6373de28e7df08b67a35acece872ab3b5dfa26f2..d2ac62e8453940cf5ab175f5b1b7bd8886ed2a65 100644
 | 
| --- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
 | 
| +++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
 | 
| @@ -33,31 +33,23 @@ const int kVideoPayloadTypeFrequency = 90000;
 | 
|  // Minimum RTP header size in bytes.
 | 
|  const uint8_t kRtpHeaderSize = 12;
 | 
|  
 | 
| -struct AudioPayload
 | 
| -{
 | 
| +struct AudioPayload {
 | 
|      uint32_t    frequency;
 | 
|      uint8_t     channels;
 | 
|      uint32_t    rate;
 | 
|  };
 | 
|  
 | 
| -struct VideoPayload
 | 
| -{
 | 
| +struct VideoPayload {
 | 
|      RtpVideoCodecTypes   videoCodecType;
 | 
|      uint32_t       maxRate;
 | 
|  };
 | 
|  
 | 
| -union PayloadUnion
 | 
| -{
 | 
| +union PayloadUnion {
 | 
|      AudioPayload Audio;
 | 
|      VideoPayload Video;
 | 
|  };
 | 
|  
 | 
| -enum RTPAliveType
 | 
| -{
 | 
| -    kRtpDead   = 0,
 | 
| -    kRtpNoRtp = 1,
 | 
| -    kRtpAlive  = 2
 | 
| -};
 | 
| +enum RTPAliveType { kRtpDead = 0, kRtpNoRtp = 1, kRtpAlive = 2 };
 | 
|  
 | 
|  enum ProtectionType {
 | 
|    kUnprotectedPacket,
 | 
| @@ -78,10 +70,7 @@ enum RTPExtensionType {
 | 
|    kRtpExtensionTransportSequenceNumber,
 | 
|  };
 | 
|  
 | 
| -enum RTCPAppSubTypes
 | 
| -{
 | 
| -    kAppSubtypeBwe     = 0x00
 | 
| -};
 | 
| +enum RTCPAppSubTypes { kAppSubtypeBwe = 0x00 };
 | 
|  
 | 
|  // TODO(sprang): Make this an enum class once rtcp_receiver has been cleaned up.
 | 
|  enum RTCPPacketType : uint32_t {
 | 
| @@ -109,17 +98,9 @@ enum RTCPPacketType : uint32_t {
 | 
|  
 | 
|  enum KeyFrameRequestMethod { kKeyFrameReqPliRtcp, kKeyFrameReqFirRtcp };
 | 
|  
 | 
| -enum RtpRtcpPacketType
 | 
| -{
 | 
| -    kPacketRtp        = 0,
 | 
| -    kPacketKeepAlive = 1
 | 
| -};
 | 
| +enum RtpRtcpPacketType { kPacketRtp = 0, kPacketKeepAlive = 1 };
 | 
|  
 | 
| -enum NACKMethod
 | 
| -{
 | 
| -    kNackOff      = 0,
 | 
| -    kNackRtcp     = 2
 | 
| -};
 | 
| +enum NACKMethod { kNackOff = 0, kNackRtcp = 2 };
 | 
|  
 | 
|  enum RetransmissionMode : uint8_t {
 | 
|    kRetransmitOff = 0x0,
 | 
| @@ -138,8 +119,7 @@ enum RtxMode {
 | 
|  
 | 
|  const size_t kRtxHeaderSize = 2;
 | 
|  
 | 
| -struct RTCPSenderInfo
 | 
| -{
 | 
| +struct RTCPSenderInfo {
 | 
|      uint32_t NTPseconds;
 | 
|      uint32_t NTPfraction;
 | 
|      uint32_t RTPtimeStamp;
 | 
| @@ -206,40 +186,36 @@ struct RtpState {
 | 
|    bool media_has_been_sent;
 | 
|  };
 | 
|  
 | 
| -class RtpData
 | 
| -{
 | 
| -public:
 | 
| -    virtual ~RtpData() {}
 | 
| +class RtpData {
 | 
| + public:
 | 
| +  virtual ~RtpData() {}
 | 
|  
 | 
| -    virtual int32_t OnReceivedPayloadData(
 | 
| -        const uint8_t* payloadData,
 | 
| -        const size_t payloadSize,
 | 
| -        const WebRtcRTPHeader* rtpHeader) = 0;
 | 
| +  virtual int32_t OnReceivedPayloadData(const uint8_t* payloadData,
 | 
| +                                        const size_t payloadSize,
 | 
| +                                        const WebRtcRTPHeader* rtpHeader) = 0;
 | 
|  
 | 
| -    virtual bool OnRecoveredPacket(const uint8_t* packet,
 | 
| -                                   size_t packet_length) = 0;
 | 
| +  virtual bool OnRecoveredPacket(const uint8_t* packet,
 | 
| +                                 size_t packet_length) = 0;
 | 
|  };
 | 
|  
 | 
| -class RtpFeedback
 | 
| -{
 | 
| -public:
 | 
| -    virtual ~RtpFeedback() {}
 | 
| -
 | 
| -    // Receiving payload change or SSRC change. (return success!)
 | 
| -    /*
 | 
| -    *   channels    - number of channels in codec (1 = mono, 2 = stereo)
 | 
| -    */
 | 
| -    virtual int32_t OnInitializeDecoder(
 | 
| -        const int8_t payloadType,
 | 
| -        const char payloadName[RTP_PAYLOAD_NAME_SIZE],
 | 
| -        const int frequency,
 | 
| -        const uint8_t channels,
 | 
| -        const uint32_t rate) = 0;
 | 
| -
 | 
| -    virtual void OnIncomingSSRCChanged(const uint32_t ssrc) = 0;
 | 
| -
 | 
| -    virtual void OnIncomingCSRCChanged(const uint32_t CSRC,
 | 
| -                                       const bool added) = 0;
 | 
| +class RtpFeedback {
 | 
| + public:
 | 
| +  virtual ~RtpFeedback() {}
 | 
| +
 | 
| +  // Receiving payload change or SSRC change. (return success!)
 | 
| +  /*
 | 
| +  *   channels    - number of channels in codec (1 = mono, 2 = stereo)
 | 
| +  */
 | 
| +  virtual int32_t OnInitializeDecoder(
 | 
| +      const int8_t payloadType,
 | 
| +      const char payloadName[RTP_PAYLOAD_NAME_SIZE],
 | 
| +      const int frequency,
 | 
| +      const uint8_t channels,
 | 
| +      const uint32_t rate) = 0;
 | 
| +
 | 
| +  virtual void OnIncomingSSRCChanged(const uint32_t ssrc) = 0;
 | 
| +
 | 
| +  virtual void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) = 0;
 | 
|  };
 | 
|  
 | 
|  class RtpAudioFeedback {
 | 
| @@ -346,7 +322,7 @@ class RtcpRttStats {
 | 
|  
 | 
|    virtual int64_t LastProcessedRtt() const = 0;
 | 
|  
 | 
| -  virtual ~RtcpRttStats() {};
 | 
| +  virtual ~RtcpRttStats() {}
 | 
|  };
 | 
|  
 | 
|  // Null object version of RtpFeedback.
 | 
| @@ -437,4 +413,4 @@ class TransportSequenceNumberAllocator {
 | 
|  };
 | 
|  
 | 
|  }  // namespace webrtc
 | 
| -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_
 | 
| +#endif  // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_
 | 
| 
 |