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

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

Issue 1921233002: 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, 8 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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_RTP_RECEIVER_IMPL_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
13 13
14 #include <memory>
15
14 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
15 #include "webrtc/base/scoped_ptr.h"
16 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" 17 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
17 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
18 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" 19 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
19 #include "webrtc/typedefs.h" 20 #include "webrtc/typedefs.h"
20 21
21 namespace webrtc { 22 namespace webrtc {
22 23
23 class RtpReceiverImpl : public RtpReceiver { 24 class RtpReceiverImpl : public RtpReceiver {
24 public: 25 public:
25 // Callbacks passed in here may not be NULL (use Null Object callbacks if you 26 // Callbacks passed in here may not be NULL (use Null Object callbacks if you
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 69
69 void CheckSSRCChanged(const RTPHeader& rtp_header); 70 void CheckSSRCChanged(const RTPHeader& rtp_header);
70 void CheckCSRC(const WebRtcRTPHeader& rtp_header); 71 void CheckCSRC(const WebRtcRTPHeader& rtp_header);
71 int32_t CheckPayloadChanged(const RTPHeader& rtp_header, 72 int32_t CheckPayloadChanged(const RTPHeader& rtp_header,
72 const int8_t first_payload_byte, 73 const int8_t first_payload_byte,
73 bool* is_red, 74 bool* is_red,
74 PayloadUnion* payload); 75 PayloadUnion* payload);
75 76
76 Clock* clock_; 77 Clock* clock_;
77 RTPPayloadRegistry* rtp_payload_registry_; 78 RTPPayloadRegistry* rtp_payload_registry_;
78 rtc::scoped_ptr<RTPReceiverStrategy> rtp_media_receiver_; 79 std::unique_ptr<RTPReceiverStrategy> rtp_media_receiver_;
79 80
80 RtpFeedback* cb_rtp_feedback_; 81 RtpFeedback* cb_rtp_feedback_;
81 82
82 rtc::CriticalSection critical_section_rtp_receiver_; 83 rtc::CriticalSection critical_section_rtp_receiver_;
83 int64_t last_receive_time_; 84 int64_t last_receive_time_;
84 size_t last_received_payload_length_; 85 size_t last_received_payload_length_;
85 86
86 // SSRCs. 87 // SSRCs.
87 uint32_t ssrc_; 88 uint32_t ssrc_;
88 uint8_t num_csrcs_; 89 uint8_t num_csrcs_;
89 uint32_t current_remote_csrc_[kRtpCsrcSize]; 90 uint32_t current_remote_csrc_[kRtpCsrcSize];
90 91
91 uint32_t last_received_timestamp_; 92 uint32_t last_received_timestamp_;
92 int64_t last_received_frame_time_ms_; 93 int64_t last_received_frame_time_ms_;
93 uint16_t last_received_sequence_number_; 94 uint16_t last_received_sequence_number_;
94 95
95 NACKMethod nack_method_; 96 NACKMethod nack_method_;
96 }; 97 };
97 } // namespace webrtc 98 } // namespace webrtc
98 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ 99 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698