Renamed fields in common_types.h/RtcpStatistics.

webrtc/common_types.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_COMMON_TYPES_H_
 #define WEBRTC_COMMON_TYPES_H_
 
 #include <stddef.h>
 #include <string.h>
 #include <ostream>
 #include <string>
 #include <vector>
 
 #include "webrtc/api/video/video_content_type.h"
 #include "webrtc/api/video/video_rotation.h"
 #include "webrtc/api/video/video_timing.h"
 #include "webrtc/rtc_base/array_view.h"
 #include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/deprecation.h"
 #include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
 
 #if defined(_MSC_VER)
 // Disable "new behavior: elements of array will be default initialized"
 // warning. Affects OverUseDetectorOptions.
 #pragma warning(disable : 4351)
 #endif
 
 #if defined(WEBRTC_EXPORT)
@@ skipping 114 matching lines @@
   kAudioFrameSpeech = 1,
   kAudioFrameCN = 2,
   kVideoFrameKey = 3,
   kVideoFrameDelta = 4,
 };
 
 // Statistics for an RTCP channel
 struct RtcpStatistics {
   RtcpStatistics()
       : fraction_lost(0),
-        cumulative_lost(0),
-        extended_max_sequence_number(0),
+        packets_lost(0),
+        extended_highest_sequence_number(0),
         jitter(0) {}
 
   uint8_t fraction_lost;
-  uint32_t cumulative_lost;
-  uint32_t extended_max_sequence_number;
+  union {
+    uint32_t packets_lost;
+    RTC_DEPRECATED uint32_t cumulative_lost;
+  };

[kwiberg-webrtc, 2017/08/01 08:26:51]

Hmm, interesting. This actually appears to *not* be undefined behavior, because
the union members are standard-layout types whose common subsequence covers all
of them. I'll have to remember this trick. :-)

+  union {
+    uint32_t extended_highest_sequence_number;
+    RTC_DEPRECATED uint32_t extended_max_sequence_number;
+  };
   uint32_t jitter;
 };
 
 class RtcpStatisticsCallback {
  public:
   virtual ~RtcpStatisticsCallback() {}
 
   virtual void StatisticsUpdated(const RtcpStatistics& statistics,
                                  uint32_t ssrc) = 0;
   virtual void CNameChanged(const char* cname, uint32_t ssrc) = 0;
@@ skipping 758 matching lines @@
   // this value. If this value has already been negotiated, then some other
   // unused static payload type from table 5 of RFC 3551 shall be used and set
   // in |payload_type|.
   int64_t timeout_interval_ms = -1;
   uint8_t payload_type = 20;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_