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

Side by Side Diff: media/cast/net/rtcp/rtcp_defines.h

Issue 1905763002: Convert //media/cast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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
« no previous file with comments | « media/cast/net/rtcp/rtcp_builder_unittest.cc ('k') | media/cast/net/rtcp/rtcp_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CAST_NET_RTCP_RTCP_DEFINES_H_ 5 #ifndef MEDIA_CAST_NET_RTCP_RTCP_DEFINES_H_
6 #define MEDIA_CAST_NET_RTCP_RTCP_DEFINES_H_ 6 #define MEDIA_CAST_NET_RTCP_RTCP_DEFINES_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <list> 11 #include <list>
12 #include <memory>
12 #include <utility> 13 #include <utility>
13 #include <vector> 14 #include <vector>
14 15
15 #include "base/callback_forward.h" 16 #include "base/callback_forward.h"
16 #include "base/macros.h" 17 #include "base/macros.h"
17 #include "base/memory/scoped_ptr.h"
18 #include "media/cast/logging/logging_defines.h" 18 #include "media/cast/logging/logging_defines.h"
19 #include "media/cast/net/cast_transport_defines.h" 19 #include "media/cast/net/cast_transport_defines.h"
20 20
21 namespace media { 21 namespace media {
22 namespace cast { 22 namespace cast {
23 23
24 static const size_t kRtcpCastLogHeaderSize = 12; 24 static const size_t kRtcpCastLogHeaderSize = 12;
25 static const size_t kRtcpReceiverFrameLogSize = 8; 25 static const size_t kRtcpReceiverFrameLogSize = 8;
26 static const size_t kRtcpReceiverEventLogSize = 4; 26 static const size_t kRtcpReceiverEventLogSize = 4;
27 27
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 }; 149 };
150 150
151 // This struct is used to encapsulate all the parameters of the 151 // This struct is used to encapsulate all the parameters of the
152 // SendRtcpFromRtpReceiver for IPC transportation. 152 // SendRtcpFromRtpReceiver for IPC transportation.
153 struct SendRtcpFromRtpReceiver_Params { 153 struct SendRtcpFromRtpReceiver_Params {
154 SendRtcpFromRtpReceiver_Params(); 154 SendRtcpFromRtpReceiver_Params();
155 ~SendRtcpFromRtpReceiver_Params(); 155 ~SendRtcpFromRtpReceiver_Params();
156 uint32_t ssrc; 156 uint32_t ssrc;
157 uint32_t sender_ssrc; 157 uint32_t sender_ssrc;
158 RtcpTimeData time_data; 158 RtcpTimeData time_data;
159 scoped_ptr<RtcpCastMessage> cast_message; 159 std::unique_ptr<RtcpCastMessage> cast_message;
160 scoped_ptr<RtcpPliMessage> pli_message; 160 std::unique_ptr<RtcpPliMessage> pli_message;
161 base::TimeDelta target_delay; 161 base::TimeDelta target_delay;
162 scoped_ptr<std::vector<std::pair<RtpTimeTicks, RtcpEvent>>> rtcp_events; 162 std::unique_ptr<std::vector<std::pair<RtpTimeTicks, RtcpEvent>>> rtcp_events;
163 scoped_ptr<RtpReceiverStatistics> rtp_receiver_statistics; 163 std::unique_ptr<RtpReceiverStatistics> rtp_receiver_statistics;
164 }; 164 };
165 165
166 166
167 } // namespace cast 167 } // namespace cast
168 } // namespace media 168 } // namespace media
169 169
170 #endif // MEDIA_CAST_NET_RTCP_RTCP_DEFINES_H_ 170 #endif // MEDIA_CAST_NET_RTCP_RTCP_DEFINES_H_
OLDNEW
« no previous file with comments | « media/cast/net/rtcp/rtcp_builder_unittest.cc ('k') | media/cast/net/rtcp/rtcp_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698