OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 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 |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "webrtc/pc/channelmanager.h" | 26 #include "webrtc/pc/channelmanager.h" |
27 | 27 |
28 namespace cricket { | 28 namespace cricket { |
29 using rtc::Bind; | 29 using rtc::Bind; |
30 | 30 |
31 namespace { | 31 namespace { |
32 // See comment below for why we need to use a pointer to a scoped_ptr. | 32 // See comment below for why we need to use a pointer to a scoped_ptr. |
33 bool SetRawAudioSink_w(VoiceMediaChannel* channel, | 33 bool SetRawAudioSink_w(VoiceMediaChannel* channel, |
34 uint32_t ssrc, | 34 uint32_t ssrc, |
35 rtc::scoped_ptr<webrtc::AudioSinkInterface>* sink) { | 35 rtc::scoped_ptr<webrtc::AudioSinkInterface>* sink) { |
36 channel->SetRawAudioSink(ssrc, std::move(*sink)); | 36 channel->SetRawAudioSink(ssrc, rtc::ScopedToUnique(std::move(*sink))); |
37 return true; | 37 return true; |
38 } | 38 } |
39 } // namespace | 39 } // namespace |
40 | 40 |
41 enum { | 41 enum { |
42 MSG_EARLYMEDIATIMEOUT = 1, | 42 MSG_EARLYMEDIATIMEOUT = 1, |
43 MSG_SCREENCASTWINDOWEVENT, | 43 MSG_SCREENCASTWINDOWEVENT, |
44 MSG_RTPPACKET, | 44 MSG_RTPPACKET, |
45 MSG_RTCPPACKET, | 45 MSG_RTCPPACKET, |
46 MSG_CHANNEL_ERROR, | 46 MSG_CHANNEL_ERROR, |
(...skipping 2201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2248 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); | 2248 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); |
2249 } | 2249 } |
2250 | 2250 |
2251 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { | 2251 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { |
2252 rtc::TypedMessageData<uint32_t>* message = | 2252 rtc::TypedMessageData<uint32_t>* message = |
2253 new rtc::TypedMessageData<uint32_t>(sid); | 2253 new rtc::TypedMessageData<uint32_t>(sid); |
2254 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); | 2254 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); |
2255 } | 2255 } |
2256 | 2256 |
2257 } // namespace cricket | 2257 } // namespace cricket |
OLD | NEW |