Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Side by Side Diff: webrtc/common_types.h

Issue 2992043002: Renamed fields in common_types.h/RtcpStatistics. (Closed)
Patch Set: Rebase on new master Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_COMMON_TYPES_H_ 11 #ifndef WEBRTC_COMMON_TYPES_H_
12 #define WEBRTC_COMMON_TYPES_H_ 12 #define WEBRTC_COMMON_TYPES_H_
13 13
14 #include <stddef.h> 14 #include <stddef.h>
15 #include <string.h> 15 #include <string.h>
16 #include <ostream> 16 #include <ostream>
17 #include <string> 17 #include <string>
18 #include <vector> 18 #include <vector>
19 19
20 #include "webrtc/api/video/video_content_type.h" 20 #include "webrtc/api/video/video_content_type.h"
21 #include "webrtc/api/video/video_rotation.h" 21 #include "webrtc/api/video/video_rotation.h"
22 #include "webrtc/api/video/video_timing.h" 22 #include "webrtc/api/video/video_timing.h"
23 #include "webrtc/rtc_base/array_view.h" 23 #include "webrtc/rtc_base/array_view.h"
24 #include "webrtc/rtc_base/checks.h" 24 #include "webrtc/rtc_base/checks.h"
25 #include "webrtc/rtc_base/deprecation.h"
25 #include "webrtc/rtc_base/optional.h" 26 #include "webrtc/rtc_base/optional.h"
26 #include "webrtc/typedefs.h" 27 #include "webrtc/typedefs.h"
27 28
28 #if defined(_MSC_VER) 29 #if defined(_MSC_VER)
29 // Disable "new behavior: elements of array will be default initialized" 30 // Disable "new behavior: elements of array will be default initialized"
30 // warning. Affects OverUseDetectorOptions. 31 // warning. Affects OverUseDetectorOptions.
31 #pragma warning(disable : 4351) 32 #pragma warning(disable : 4351)
32 #endif 33 #endif
33 34
34 #if defined(WEBRTC_EXPORT) 35 #if defined(WEBRTC_EXPORT)
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 kAudioFrameSpeech = 1, 150 kAudioFrameSpeech = 1,
150 kAudioFrameCN = 2, 151 kAudioFrameCN = 2,
151 kVideoFrameKey = 3, 152 kVideoFrameKey = 3,
152 kVideoFrameDelta = 4, 153 kVideoFrameDelta = 4,
153 }; 154 };
154 155
155 // Statistics for an RTCP channel 156 // Statistics for an RTCP channel
156 struct RtcpStatistics { 157 struct RtcpStatistics {
157 RtcpStatistics() 158 RtcpStatistics()
158 : fraction_lost(0), 159 : fraction_lost(0),
159 cumulative_lost(0), 160 packets_lost(0),
160 extended_max_sequence_number(0), 161 extended_highest_sequence_number(0),
161 jitter(0) {} 162 jitter(0) {}
162 163
163 uint8_t fraction_lost; 164 uint8_t fraction_lost;
164 uint32_t cumulative_lost; 165 union {
165 uint32_t extended_max_sequence_number; 166 uint32_t packets_lost;
167 RTC_DEPRECATED uint32_t cumulative_lost;
168 };
169 union {
170 uint32_t extended_highest_sequence_number;
171 RTC_DEPRECATED uint32_t extended_max_sequence_number;
172 };
166 uint32_t jitter; 173 uint32_t jitter;
167 }; 174 };
168 175
169 class RtcpStatisticsCallback { 176 class RtcpStatisticsCallback {
170 public: 177 public:
171 virtual ~RtcpStatisticsCallback() {} 178 virtual ~RtcpStatisticsCallback() {}
172 179
173 virtual void StatisticsUpdated(const RtcpStatistics& statistics, 180 virtual void StatisticsUpdated(const RtcpStatistics& statistics,
174 uint32_t ssrc) = 0; 181 uint32_t ssrc) = 0;
175 virtual void CNameChanged(const char* cname, uint32_t ssrc) = 0; 182 virtual void CNameChanged(const char* cname, uint32_t ssrc) = 0;
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 // this value. If this value has already been negotiated, then some other 941 // this value. If this value has already been negotiated, then some other
935 // unused static payload type from table 5 of RFC 3551 shall be used and set 942 // unused static payload type from table 5 of RFC 3551 shall be used and set
936 // in |payload_type|. 943 // in |payload_type|.
937 int64_t timeout_interval_ms = -1; 944 int64_t timeout_interval_ms = -1;
938 uint8_t payload_type = 20; 945 uint8_t payload_type = 20;
939 }; 946 };
940 947
941 } // namespace webrtc 948 } // namespace webrtc
942 949
943 #endif // WEBRTC_COMMON_TYPES_H_ 950 #endif // WEBRTC_COMMON_TYPES_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698