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 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
415 ASSERT(initialized_); | 415 ASSERT(initialized_); |
416 ASSERT(worker_thread_ == rtc::Thread::Current()); | 416 ASSERT(worker_thread_ == rtc::Thread::Current()); |
417 VideoMediaChannel* media_channel = | 417 VideoMediaChannel* media_channel = |
418 // voice_channel can be NULL in case of NullVoiceEngine. | 418 // voice_channel can be NULL in case of NullVoiceEngine. |
419 media_engine_->CreateVideoChannel( | 419 media_engine_->CreateVideoChannel( |
420 options, voice_channel ? voice_channel->media_channel() : NULL); | 420 options, voice_channel ? voice_channel->media_channel() : NULL); |
421 if (media_channel == NULL) | 421 if (media_channel == NULL) |
422 return NULL; | 422 return NULL; |
423 | 423 |
424 VideoChannel* video_channel = new VideoChannel( | 424 VideoChannel* video_channel = new VideoChannel( |
425 worker_thread_, media_engine_.get(), media_channel, | 425 worker_thread_, media_channel, |
426 session, content_name, rtcp); | 426 session, content_name, rtcp); |
427 if (!video_channel->Init()) { | 427 if (!video_channel->Init()) { |
428 delete video_channel; | 428 delete video_channel; |
429 return NULL; | 429 return NULL; |
430 } | 430 } |
431 video_channels_.push_back(video_channel); | 431 video_channels_.push_back(video_channel); |
432 return video_channel; | 432 return video_channel; |
433 } | 433 } |
434 | 434 |
435 void ChannelManager::DestroyVideoChannel(VideoChannel* video_channel) { | 435 void ChannelManager::DestroyVideoChannel(VideoChannel* video_channel) { |
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
946 const VideoFormat& max_format) { | 946 const VideoFormat& max_format) { |
947 device_manager_->SetVideoCaptureDeviceMaxFormat(usb_id, max_format); | 947 device_manager_->SetVideoCaptureDeviceMaxFormat(usb_id, max_format); |
948 } | 948 } |
949 | 949 |
950 bool ChannelManager::StartAecDump(rtc::PlatformFile file) { | 950 bool ChannelManager::StartAecDump(rtc::PlatformFile file) { |
951 return worker_thread_->Invoke<bool>( | 951 return worker_thread_->Invoke<bool>( |
952 Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(), file)); | 952 Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(), file)); |
953 } | 953 } |
954 | 954 |
955 } // namespace cricket | 955 } // namespace cricket |
OLD | NEW |