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

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

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 <memory> 15 #include <memory>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/constructormagic.h" 18 #include "webrtc/base/constructormagic.h"
19 #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/include/rtp_rtcp_defines.h" // RTCPReportBloc k
20 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" 21 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
21 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" 22 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
22 #include "webrtc/typedefs.h" 23 #include "webrtc/typedefs.h"
23 24
24 namespace webrtc { 25 namespace webrtc {
25 namespace rtcp { 26 namespace rtcp {
26 class TransportFeedback; 27 class TransportFeedback;
27 } 28 }
28 namespace RTCPHelp 29 namespace RTCPHelp
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 uint32_t receiverEstimatedMaxBitrate; 83 uint32_t receiverEstimatedMaxBitrate;
83 84
84 uint32_t ntp_secs; 85 uint32_t ntp_secs;
85 uint32_t ntp_frac; 86 uint32_t ntp_frac;
86 uint32_t rtp_timestamp; 87 uint32_t rtp_timestamp;
87 88
88 uint32_t xr_originator_ssrc; 89 uint32_t xr_originator_ssrc;
89 bool xr_dlrr_item; 90 bool xr_dlrr_item;
90 std::unique_ptr<RTCPVoIPMetric> VoIPMetric; 91 std::unique_ptr<RTCPVoIPMetric> VoIPMetric;
91 92
92 std::unique_ptr<rtcp::TransportFeedback> transport_feedback_; 93 rtc::scoped_ptr<rtcp::TransportFeedback> transport_feedback_;
93 94
94 private: 95 private:
95 RTC_DISALLOW_COPY_AND_ASSIGN(RTCPPacketInformation); 96 RTC_DISALLOW_COPY_AND_ASSIGN(RTCPPacketInformation);
96 }; 97 };
97 98
98 class RTCPReceiveInformation 99 class RTCPReceiveInformation
99 { 100 {
100 public: 101 public:
101 RTCPReceiveInformation(); 102 RTCPReceiveInformation();
102 ~RTCPReceiveInformation(); 103 ~RTCPReceiveInformation();
(...skipping 25 matching lines...) Expand all
128 129
129 bool readyForDelete; 130 bool readyForDelete;
130 private: 131 private:
131 std::vector<int64_t> _tmmbrSetTimeouts; 132 std::vector<int64_t> _tmmbrSetTimeouts;
132 }; 133 };
133 134
134 } // end namespace RTCPHelp 135 } // end namespace RTCPHelp
135 } // namespace webrtc 136 } // namespace webrtc
136 137
137 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_ 138 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698