From 84c1a15d3c3ddcf03048678926aa707a78cadb92 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 15 Nov 2017 16:28:20 +0100 Subject: [PATCH] Remove deprecated field names in struct RTCPReportBlock Bug: webrtc:8033 Change-Id: Ic7ea4fdd6cd30a2a490f1bd9fdd9a4f0a4d51f4a Reviewed-on: https://webrtc-review.googlesource.com/23262 Reviewed-by: Sebastian Jansson Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#20706} --- modules/rtp_rtcp/include/rtp_rtcp_defines.h | 35 +++++---------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index 9023d68541..0c8e389c04 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -194,35 +194,14 @@ struct RTCPReportBlock { delay_since_last_sender_report(delay_since_last_sender_report) {} // Fields as described by RFC 3550 6.4.2. - 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 sender_ssrc; // SSRC of sender of this report. + uint32_t source_ssrc; // SSRC of the RTP packet sender. + uint8_t fraction_lost; + uint32_t packets_lost; // 24 bits valid. + uint32_t extended_highest_sequence_number; uint32_t jitter; - 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; - }; + uint32_t last_sender_report_timestamp; + uint32_t delay_since_last_sender_report; }; typedef std::list ReportBlockList;