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

Side by Side Diff: webrtc/ortc/rtptransportadapter.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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/ortc/rtptransportadapter.h ('k') | webrtc/ortc/rtptransportcontroller_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 /* 1 /*
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 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 #include "webrtc/ortc/rtptransportadapter.h" 11 #include "webrtc/ortc/rtptransportadapter.h"
12 12
13 #include <algorithm> // For std::find. 13 #include <algorithm> // For std::find.
14 #include <set> 14 #include <set>
15 #include <sstream> 15 #include <sstream>
16 #include <utility> // For std::move. 16 #include <utility> // For std::move.
17 17
18 #include "webrtc/api/proxy.h" 18 #include "webrtc/api/proxy.h"
19 #include "webrtc/base/logging.h" 19 #include "webrtc/rtc_base/logging.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 BEGIN_OWNED_PROXY_MAP(RtpTransport) 23 BEGIN_OWNED_PROXY_MAP(RtpTransport)
24 PROXY_SIGNALING_THREAD_DESTRUCTOR() 24 PROXY_SIGNALING_THREAD_DESTRUCTOR()
25 PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtpPacketTransport) 25 PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtpPacketTransport)
26 PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtcpPacketTransport) 26 PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtcpPacketTransport)
27 PROXY_METHOD1(RTCError, SetRtcpParameters, const RtcpParameters&) 27 PROXY_METHOD1(RTCError, SetRtcpParameters, const RtcpParameters&)
28 PROXY_CONSTMETHOD0(RtcpParameters, GetRtcpParameters) 28 PROXY_CONSTMETHOD0(RtcpParameters, GetRtcpParameters)
29 protected: 29 protected:
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 if (send_key_ && send_key_->cipher_suite != params.cipher_suite) { 204 if (send_key_ && send_key_->cipher_suite != params.cipher_suite) {
205 LOG_AND_RETURN_ERROR( 205 LOG_AND_RETURN_ERROR(
206 webrtc::RTCErrorType::UNSUPPORTED_OPERATION, 206 webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
207 "The send key and receive key must have the same cipher suite."); 207 "The send key and receive key must have the same cipher suite.");
208 } 208 }
209 receive_key_ = rtc::Optional<cricket::CryptoParams>(params); 209 receive_key_ = rtc::Optional<cricket::CryptoParams>(params);
210 return RTCError::OK(); 210 return RTCError::OK();
211 } 211 }
212 212
213 } // namespace webrtc 213 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/ortc/rtptransportadapter.h ('k') | webrtc/ortc/rtptransportcontroller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698