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