OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 | 260 |
261 VoiceChannel* ChannelManager::CreateVoiceChannel_w( | 261 VoiceChannel* ChannelManager::CreateVoiceChannel_w( |
262 webrtc::MediaControllerInterface* media_controller, | 262 webrtc::MediaControllerInterface* media_controller, |
263 TransportController* transport_controller, | 263 TransportController* transport_controller, |
264 const std::string& content_name, | 264 const std::string& content_name, |
265 bool rtcp, | 265 bool rtcp, |
266 const AudioOptions& options) { | 266 const AudioOptions& options) { |
267 ASSERT(initialized_); | 267 ASSERT(initialized_); |
268 ASSERT(worker_thread_ == rtc::Thread::Current()); | 268 ASSERT(worker_thread_ == rtc::Thread::Current()); |
269 ASSERT(nullptr != media_controller); | 269 ASSERT(nullptr != media_controller); |
270 VoiceMediaChannel* media_channel = | 270 VoiceMediaChannel* media_channel = media_engine_->CreateChannel( |
271 media_engine_->CreateChannel(media_controller->call_w(), options); | 271 media_controller->call_w(), media_controller->config(), options); |
272 if (!media_channel) | 272 if (!media_channel) |
273 return nullptr; | 273 return nullptr; |
274 | 274 |
275 VoiceChannel* voice_channel = | 275 VoiceChannel* voice_channel = |
276 new VoiceChannel(worker_thread_, media_engine_.get(), media_channel, | 276 new VoiceChannel(worker_thread_, media_engine_.get(), media_channel, |
277 transport_controller, content_name, rtcp); | 277 transport_controller, content_name, rtcp); |
278 if (!voice_channel->Init()) { | 278 if (!voice_channel->Init()) { |
279 delete voice_channel; | 279 delete voice_channel; |
280 return nullptr; | 280 return nullptr; |
281 } | 281 } |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 | 318 |
319 VideoChannel* ChannelManager::CreateVideoChannel_w( | 319 VideoChannel* ChannelManager::CreateVideoChannel_w( |
320 webrtc::MediaControllerInterface* media_controller, | 320 webrtc::MediaControllerInterface* media_controller, |
321 TransportController* transport_controller, | 321 TransportController* transport_controller, |
322 const std::string& content_name, | 322 const std::string& content_name, |
323 bool rtcp, | 323 bool rtcp, |
324 const VideoOptions& options) { | 324 const VideoOptions& options) { |
325 ASSERT(initialized_); | 325 ASSERT(initialized_); |
326 ASSERT(worker_thread_ == rtc::Thread::Current()); | 326 ASSERT(worker_thread_ == rtc::Thread::Current()); |
327 ASSERT(nullptr != media_controller); | 327 ASSERT(nullptr != media_controller); |
328 VideoMediaChannel* media_channel = | 328 VideoMediaChannel* media_channel = media_engine_->CreateVideoChannel( |
329 media_engine_->CreateVideoChannel(media_controller->call_w(), options); | 329 media_controller->call_w(), media_controller->config(), options); |
330 if (media_channel == NULL) { | 330 if (media_channel == NULL) { |
331 return NULL; | 331 return NULL; |
332 } | 332 } |
333 | 333 |
334 VideoChannel* video_channel = new VideoChannel( | 334 VideoChannel* video_channel = new VideoChannel( |
335 worker_thread_, media_channel, transport_controller, content_name, rtcp); | 335 worker_thread_, media_channel, transport_controller, content_name, rtcp); |
336 if (!video_channel->Init()) { | 336 if (!video_channel->Init()) { |
337 delete video_channel; | 337 delete video_channel; |
338 return NULL; | 338 return NULL; |
339 } | 339 } |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 return worker_thread_->Invoke<bool>( | 568 return worker_thread_->Invoke<bool>( |
569 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); | 569 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); |
570 } | 570 } |
571 | 571 |
572 void ChannelManager::StopRtcEventLog() { | 572 void ChannelManager::StopRtcEventLog() { |
573 worker_thread_->Invoke<void>( | 573 worker_thread_->Invoke<void>( |
574 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); | 574 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); |
575 } | 575 } |
576 | 576 |
577 } // namespace cricket | 577 } // namespace cricket |
OLD | NEW |