Renamed fields in rtp_rtcp_defines.h/RTCPReportBlock

Continues on https://codereview.webrtc.org/2992043002

BUG=webrtc:8033

Review-Url: https://codereview.webrtc.org/2994633002
Cr-Commit-Position: refs/heads/master@{#19286}
This commit is contained in:
srte
2017-08-09 06:13:45 -07:00
committed by Commit Bot
parent f1e08d0b58
commit 3e69e5c2c0
14 changed files with 194 additions and 157 deletions

View File

@ -132,36 +132,62 @@ const size_t kRtxHeaderSize = 2;
struct RTCPReportBlock {
RTCPReportBlock()
: remoteSSRC(0), sourceSSRC(0), fractionLost(0), cumulativeLost(0),
extendedHighSeqNum(0), jitter(0), lastSR(0),
delaySinceLastSR(0) {}
: sender_ssrc(0),
source_ssrc(0),
fraction_lost(0),
packets_lost(0),
extended_highest_sequence_number(0),
jitter(0),
last_sender_report_timestamp(0),
delay_since_last_sender_report(0) {}
RTCPReportBlock(uint32_t remote_ssrc,
RTCPReportBlock(uint32_t sender_ssrc,
uint32_t source_ssrc,
uint8_t fraction_lost,
uint32_t cumulative_lost,
uint32_t extended_high_sequence_number,
uint32_t packets_lost,
uint32_t extended_highest_sequence_number,
uint32_t jitter,
uint32_t last_sender_report,
uint32_t last_sender_report_timestamp,
uint32_t delay_since_last_sender_report)
: remoteSSRC(remote_ssrc),
sourceSSRC(source_ssrc),
fractionLost(fraction_lost),
cumulativeLost(cumulative_lost),
extendedHighSeqNum(extended_high_sequence_number),
: sender_ssrc(sender_ssrc),
source_ssrc(source_ssrc),
fraction_lost(fraction_lost),
packets_lost(packets_lost),
extended_highest_sequence_number(extended_highest_sequence_number),
jitter(jitter),
lastSR(last_sender_report),
delaySinceLastSR(delay_since_last_sender_report) {}
last_sender_report_timestamp(last_sender_report_timestamp),
delay_since_last_sender_report(delay_since_last_sender_report) {}
// Fields as described by RFC 3550 6.4.2.
uint32_t remoteSSRC; // SSRC of sender of this report.
uint32_t sourceSSRC; // SSRC of the RTP packet sender.
uint8_t fractionLost;
uint32_t cumulativeLost; // 24 bits valid.
uint32_t extendedHighSeqNum;
union {
uint32_t sender_ssrc; // SSRC of sender of this report.
RTC_DEPRECATED uint32_t remoteSSRC;
};
union {
uint32_t source_ssrc; // SSRC of the RTP packet sender.
RTC_DEPRECATED uint32_t sourceSSRC;
};
union {
RTC_DEPRECATED uint8_t fractionLost;
uint8_t fraction_lost;
};
union {
uint32_t packets_lost; // 24 bits valid.
RTC_DEPRECATED uint32_t cumulativeLost;
};
union {
uint32_t extended_highest_sequence_number;
RTC_DEPRECATED uint32_t extendedHighSeqNum;
};
uint32_t jitter;
uint32_t lastSR;
uint32_t delaySinceLastSR;
union {
uint32_t last_sender_report_timestamp;
RTC_DEPRECATED uint32_t lastSR;
};
union {
uint32_t delay_since_last_sender_report;
RTC_DEPRECATED uint32_t delaySinceLastSR;
};
};
typedef std::list<RTCPReportBlock> ReportBlockList;