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

Side by Side Diff: webrtc/video/vie_receiver.h

Issue 1751903002: Replace scoped_ptr with unique_ptr in webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | « webrtc/video/vie_encoder.h ('k') | webrtc/video/vie_remb.h » ('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_VIDEO_VIE_RECEIVER_H_ 11 #ifndef WEBRTC_VIDEO_VIE_RECEIVER_H_
12 #define WEBRTC_VIDEO_VIE_RECEIVER_H_ 12 #define WEBRTC_VIDEO_VIE_RECEIVER_H_
13 13
14 #include <list> 14 #include <list>
15 #include <memory>
15 #include <string> 16 #include <string>
16 #include <vector> 17 #include <vector>
17 18
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/engine_configurations.h" 20 #include "webrtc/engine_configurations.h"
21 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" 21 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
23 #include "webrtc/typedefs.h" 23 #include "webrtc/typedefs.h"
24 24
25 namespace webrtc { 25 namespace webrtc {
26 26
27 class FecReceiver; 27 class FecReceiver;
28 class RemoteNtpTimeEstimator; 28 class RemoteNtpTimeEstimator;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 bool ParseAndHandleEncapsulatingHeader(const uint8_t* packet, 93 bool ParseAndHandleEncapsulatingHeader(const uint8_t* packet,
94 size_t packet_length, 94 size_t packet_length,
95 const RTPHeader& header); 95 const RTPHeader& header);
96 void NotifyReceiverOfFecPacket(const RTPHeader& header); 96 void NotifyReceiverOfFecPacket(const RTPHeader& header);
97 bool IsPacketInOrder(const RTPHeader& header) const; 97 bool IsPacketInOrder(const RTPHeader& header) const;
98 bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const; 98 bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
99 void UpdateHistograms(); 99 void UpdateHistograms();
100 100
101 rtc::CriticalSection receive_cs_; 101 rtc::CriticalSection receive_cs_;
102 Clock* clock_; 102 Clock* clock_;
103 rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_; 103 std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
104 rtc::scoped_ptr<RTPPayloadRegistry> rtp_payload_registry_; 104 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;
105 rtc::scoped_ptr<RtpReceiver> rtp_receiver_; 105 std::unique_ptr<RtpReceiver> rtp_receiver_;
106 const rtc::scoped_ptr<ReceiveStatistics> rtp_receive_statistics_; 106 const std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
107 rtc::scoped_ptr<FecReceiver> fec_receiver_; 107 std::unique_ptr<FecReceiver> fec_receiver_;
108 RtpRtcp* rtp_rtcp_; 108 RtpRtcp* rtp_rtcp_;
109 std::vector<RtpRtcp*> rtp_rtcp_simulcast_; 109 std::vector<RtpRtcp*> rtp_rtcp_simulcast_;
110 VideoCodingModule* vcm_; 110 VideoCodingModule* vcm_;
111 RemoteBitrateEstimator* remote_bitrate_estimator_; 111 RemoteBitrateEstimator* remote_bitrate_estimator_;
112 112
113 rtc::scoped_ptr<RemoteNtpTimeEstimator> ntp_estimator_; 113 std::unique_ptr<RemoteNtpTimeEstimator> ntp_estimator_;
114 114
115 bool receiving_; 115 bool receiving_;
116 uint8_t restored_packet_[IP_PACKET_SIZE]; 116 uint8_t restored_packet_[IP_PACKET_SIZE];
117 bool restored_packet_in_use_; 117 bool restored_packet_in_use_;
118 int64_t last_packet_log_ms_; 118 int64_t last_packet_log_ms_;
119 }; 119 };
120 120
121 } // namespace webrtc 121 } // namespace webrtc
122 122
123 #endif // WEBRTC_VIDEO_VIE_RECEIVER_H_ 123 #endif // WEBRTC_VIDEO_VIE_RECEIVER_H_
OLDNEW
« no previous file with comments | « webrtc/video/vie_encoder.h ('k') | webrtc/video/vie_remb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698