| 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 VoiceChannel* ChannelManager::CreateVoiceChannel_w( | 260 VoiceChannel* ChannelManager::CreateVoiceChannel_w( |
| 261 webrtc::MediaControllerInterface* media_controller, | 261 webrtc::MediaControllerInterface* media_controller, |
| 262 TransportController* transport_controller, | 262 TransportController* transport_controller, |
| 263 const std::string& content_name, | 263 const std::string& content_name, |
| 264 bool rtcp, | 264 bool rtcp, |
| 265 const AudioOptions& options) { | 265 const AudioOptions& options) { |
| 266 ASSERT(initialized_); | 266 ASSERT(initialized_); |
| 267 ASSERT(worker_thread_ == rtc::Thread::Current()); | 267 ASSERT(worker_thread_ == rtc::Thread::Current()); |
| 268 ASSERT(nullptr != media_controller); | 268 ASSERT(nullptr != media_controller); |
| 269 VoiceMediaChannel* media_channel = | 269 VoiceMediaChannel* media_channel = |
| 270 media_engine_->CreateChannel(media_controller->call_w(), options); | 270 media_engine_->CreateChannel(media_controller->call_w(), |
| 271 media_controller->config(), |
| 272 options); |
| 271 if (!media_channel) | 273 if (!media_channel) |
| 272 return nullptr; | 274 return nullptr; |
| 273 | 275 |
| 274 VoiceChannel* voice_channel = | 276 VoiceChannel* voice_channel = |
| 275 new VoiceChannel(worker_thread_, media_engine_.get(), media_channel, | 277 new VoiceChannel(worker_thread_, media_engine_.get(), media_channel, |
| 276 transport_controller, content_name, rtcp); | 278 transport_controller, content_name, rtcp); |
| 277 if (!voice_channel->Init()) { | 279 if (!voice_channel->Init()) { |
| 278 delete voice_channel; | 280 delete voice_channel; |
| 279 return nullptr; | 281 return nullptr; |
| 280 } | 282 } |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 VideoChannel* ChannelManager::CreateVideoChannel_w( | 320 VideoChannel* ChannelManager::CreateVideoChannel_w( |
| 319 webrtc::MediaControllerInterface* media_controller, | 321 webrtc::MediaControllerInterface* media_controller, |
| 320 TransportController* transport_controller, | 322 TransportController* transport_controller, |
| 321 const std::string& content_name, | 323 const std::string& content_name, |
| 322 bool rtcp, | 324 bool rtcp, |
| 323 const VideoOptions& options) { | 325 const VideoOptions& options) { |
| 324 ASSERT(initialized_); | 326 ASSERT(initialized_); |
| 325 ASSERT(worker_thread_ == rtc::Thread::Current()); | 327 ASSERT(worker_thread_ == rtc::Thread::Current()); |
| 326 ASSERT(nullptr != media_controller); | 328 ASSERT(nullptr != media_controller); |
| 327 VideoMediaChannel* media_channel = | 329 VideoMediaChannel* media_channel = |
| 328 media_engine_->CreateVideoChannel(media_controller->call_w(), options); | 330 media_engine_->CreateVideoChannel(media_controller->call_w(), |
| 331 media_controller->config(), |
| 332 options); |
| 329 if (media_channel == NULL) { | 333 if (media_channel == NULL) { |
| 330 return NULL; | 334 return NULL; |
| 331 } | 335 } |
| 332 | 336 |
| 333 VideoChannel* video_channel = new VideoChannel( | 337 VideoChannel* video_channel = new VideoChannel( |
| 334 worker_thread_, media_channel, transport_controller, content_name, rtcp); | 338 worker_thread_, media_channel, transport_controller, content_name, rtcp); |
| 335 if (!video_channel->Init()) { | 339 if (!video_channel->Init()) { |
| 336 delete video_channel; | 340 delete video_channel; |
| 337 return NULL; | 341 return NULL; |
| 338 } | 342 } |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 return worker_thread_->Invoke<bool>( | 571 return worker_thread_->Invoke<bool>( |
| 568 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); | 572 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); |
| 569 } | 573 } |
| 570 | 574 |
| 571 void ChannelManager::StopRtcEventLog() { | 575 void ChannelManager::StopRtcEventLog() { |
| 572 worker_thread_->Invoke<void>( | 576 worker_thread_->Invoke<void>( |
| 573 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); | 577 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); |
| 574 } | 578 } |
| 575 | 579 |
| 576 } // namespace cricket | 580 } // namespace cricket |
| OLD | NEW |