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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h

Issue 1540383002: [rtp_rtcp] ReportBlockInformation cleaned and moved out of the rtcp_receiver_help. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
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_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_
13 13
14 #include <list> 14 #include <list>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" // RTCPReportBloc k
20 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" 19 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
21 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" 20 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
22 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 namespace rtcp { 24 namespace rtcp {
25 class ReportBlockInformation;
26 class TransportFeedback; 26 class TransportFeedback;
27 } 27 }
28 namespace RTCPHelp 28 namespace RTCPHelp
29 { 29 {
30 30
31 class RTCPReportBlockInformation
32 {
33 public:
34 RTCPReportBlockInformation();
35 ~RTCPReportBlockInformation();
36
37 // Statistics
38 RTCPReportBlock remoteReceiveBlock;
39 uint32_t remoteMaxJitter;
40
41 // RTT
42 int64_t RTT;
43 int64_t minRTT;
44 int64_t maxRTT;
45 int64_t avgRTT;
46 uint32_t numAverageCalcs;
47 };
48
49 class RTCPPacketInformation 31 class RTCPPacketInformation
50 { 32 {
51 public: 33 public:
52 RTCPPacketInformation(); 34 RTCPPacketInformation();
53 ~RTCPPacketInformation(); 35 ~RTCPPacketInformation();
54 36
55 void AddVoIPMetric(const RTCPVoIPMetric* metric); 37 void AddVoIPMetric(const RTCPVoIPMetric* metric);
56 38
57 void AddApplicationData(const uint8_t* data, 39 void AddApplicationData(const uint8_t* data,
58 const uint16_t size); 40 const uint16_t size);
59 41
60 void AddNACKPacket(const uint16_t packetID); 42 void AddNACKPacket(const uint16_t packetID);
61 void ResetNACKPacketIdArray(); 43 void ResetNACKPacketIdArray();
62 44
63 void AddReportInfo(const RTCPReportBlockInformation& report_block_info); 45 void AddReportInfo(const rtcp::ReportBlockInformation& report_block_info);
64 46
65 uint32_t rtcpPacketTypeFlags; // RTCPPacketTypeFlags bit field 47 uint32_t rtcpPacketTypeFlags; // RTCPPacketTypeFlags bit field
66 uint32_t remoteSSRC; 48 uint32_t remoteSSRC;
67 49
68 std::list<uint16_t> nackSequenceNumbers; 50 std::list<uint16_t> nackSequenceNumbers;
69 51
70 uint8_t applicationSubType; 52 uint8_t applicationSubType;
71 uint32_t applicationName; 53 uint32_t applicationName;
72 uint8_t* applicationData; 54 uint8_t* applicationData;
73 uint16_t applicationLength; 55 uint16_t applicationLength;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 110
129 bool readyForDelete; 111 bool readyForDelete;
130 private: 112 private:
131 std::vector<int64_t> _tmmbrSetTimeouts; 113 std::vector<int64_t> _tmmbrSetTimeouts;
132 }; 114 };
133 115
134 } // end namespace RTCPHelp 116 } // end namespace RTCPHelp
135 } // namespace webrtc 117 } // namespace webrtc
136 118
137 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_ 119 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698