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