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

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

Issue 1362923002: Revert of Wire up send-side bandwidth estimation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Manual merge of revert Created 5 years, 2 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 14
15 #include "webrtc/base/constructormagic.h" 15 #include "webrtc/base/constructormagic.h"
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" // RTCPReportBl ock 17 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" // RTCPReportBl ock
18 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" 18 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
19 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" 19 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
20 #include "webrtc/typedefs.h" 20 #include "webrtc/typedefs.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 namespace rtcp {
24 class TransportFeedback;
25 }
26 namespace RTCPHelp 23 namespace RTCPHelp
27 { 24 {
28 25
29 class RTCPReportBlockInformation 26 class RTCPReportBlockInformation
30 { 27 {
31 public: 28 public:
32 RTCPReportBlockInformation(); 29 RTCPReportBlockInformation();
33 ~RTCPReportBlockInformation(); 30 ~RTCPReportBlockInformation();
34 31
35 // Statistics 32 // Statistics
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 uint32_t receiverEstimatedMaxBitrate; 77 uint32_t receiverEstimatedMaxBitrate;
81 78
82 uint32_t ntp_secs; 79 uint32_t ntp_secs;
83 uint32_t ntp_frac; 80 uint32_t ntp_frac;
84 uint32_t rtp_timestamp; 81 uint32_t rtp_timestamp;
85 82
86 uint32_t xr_originator_ssrc; 83 uint32_t xr_originator_ssrc;
87 bool xr_dlrr_item; 84 bool xr_dlrr_item;
88 RTCPVoIPMetric* VoIPMetric; 85 RTCPVoIPMetric* VoIPMetric;
89 86
90 rtc::scoped_ptr<rtcp::TransportFeedback> transport_feedback_;
91
92 private: 87 private:
93 RTC_DISALLOW_COPY_AND_ASSIGN(RTCPPacketInformation); 88 RTC_DISALLOW_COPY_AND_ASSIGN(RTCPPacketInformation);
94 }; 89 };
95 90
96 class RTCPReceiveInformation 91 class RTCPReceiveInformation
97 { 92 {
98 public: 93 public:
99 RTCPReceiveInformation(); 94 RTCPReceiveInformation();
100 ~RTCPReceiveInformation(); 95 ~RTCPReceiveInformation();
101 96
(...skipping 24 matching lines...) Expand all
126 121
127 bool readyForDelete; 122 bool readyForDelete;
128 private: 123 private:
129 std::vector<int64_t> _tmmbrSetTimeouts; 124 std::vector<int64_t> _tmmbrSetTimeouts;
130 }; 125 };
131 126
132 } // end namespace RTCPHelp 127 } // end namespace RTCPHelp
133 } // namespace webrtc 128 } // namespace webrtc
134 129
135 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_ 130 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698