| 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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 ret = worker_thread_->Invoke<bool>( | 493 ret = worker_thread_->Invoke<bool>( |
| 494 Bind(&MediaEngineInterface::SetDefaultVideoEncoderConfig, | 494 Bind(&MediaEngineInterface::SetDefaultVideoEncoderConfig, |
| 495 media_engine_.get(), c)); | 495 media_engine_.get(), c)); |
| 496 } | 496 } |
| 497 if (ret) { | 497 if (ret) { |
| 498 default_video_encoder_config_ = c; | 498 default_video_encoder_config_ = c; |
| 499 } | 499 } |
| 500 return ret; | 500 return ret; |
| 501 } | 501 } |
| 502 | 502 |
| 503 void ChannelManager::SetVoiceLogging(int level, const char* filter) { | |
| 504 if (initialized_) { | |
| 505 worker_thread_->Invoke<void>( | |
| 506 Bind(&MediaEngineInterface::SetVoiceLogging, | |
| 507 media_engine_.get(), level, filter)); | |
| 508 } else { | |
| 509 media_engine_->SetVoiceLogging(level, filter); | |
| 510 } | |
| 511 } | |
| 512 | |
| 513 void ChannelManager::SetVideoLogging(int level, const char* filter) { | |
| 514 if (initialized_) { | |
| 515 worker_thread_->Invoke<void>( | |
| 516 Bind(&MediaEngineInterface::SetVideoLogging, | |
| 517 media_engine_.get(), level, filter)); | |
| 518 } else { | |
| 519 media_engine_->SetVideoLogging(level, filter); | |
| 520 } | |
| 521 } | |
| 522 | |
| 523 std::vector<cricket::VideoFormat> ChannelManager::GetSupportedFormats( | 503 std::vector<cricket::VideoFormat> ChannelManager::GetSupportedFormats( |
| 524 VideoCapturer* capturer) const { | 504 VideoCapturer* capturer) const { |
| 525 ASSERT(capturer != NULL); | 505 ASSERT(capturer != NULL); |
| 526 std::vector<VideoFormat> formats; | 506 std::vector<VideoFormat> formats; |
| 527 worker_thread_->Invoke<void>(rtc::Bind(&ChannelManager::GetSupportedFormats_w, | 507 worker_thread_->Invoke<void>(rtc::Bind(&ChannelManager::GetSupportedFormats_w, |
| 528 this, capturer, &formats)); | 508 this, capturer, &formats)); |
| 529 return formats; | 509 return formats; |
| 530 } | 510 } |
| 531 | 511 |
| 532 void ChannelManager::GetSupportedFormats_w( | 512 void ChannelManager::GetSupportedFormats_w( |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 639 return worker_thread_->Invoke<bool>( | 619 return worker_thread_->Invoke<bool>( |
| 640 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); | 620 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); |
| 641 } | 621 } |
| 642 | 622 |
| 643 void ChannelManager::StopRtcEventLog() { | 623 void ChannelManager::StopRtcEventLog() { |
| 644 worker_thread_->Invoke<void>( | 624 worker_thread_->Invoke<void>( |
| 645 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); | 625 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); |
| 646 } | 626 } |
| 647 | 627 |
| 648 } // namespace cricket | 628 } // namespace cricket |
| OLD | NEW |