Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 /* | |
| 2 * libjingle | |
| 3 * Copyright 2015 Google Inc. | |
| 4 * | |
| 5 * Redistribution and use in source and binary forms, with or without | |
| 6 * modification, are permitted provided that the following conditions are met: | |
| 7 * | |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | |
| 9 * this list of conditions and the following disclaimer. | |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | |
| 11 * this list of conditions and the following disclaimer in the documentation | |
| 12 * and/or other materials provided with the distribution. | |
| 13 * 3. The name of the author may not be used to endorse or promote products | |
| 14 * derived from this software without specific prior written permission. | |
| 15 * | |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | |
| 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 26 */ | |
| 27 | |
| 28 #include "talk/app/webrtc/mediacontroller.h" | |
| 29 | |
| 30 #include "talk/media/base/mediaengine.h" | |
| 31 #include "talk/media/webrtc/webrtcvideoengine2.h" | |
| 32 #include "talk/session/media/channel.h" | |
| 33 #include "webrtc/base/bind.h" | |
| 34 #include "webrtc/base/checks.h" | |
| 35 | |
| 36 namespace webrtc { | |
| 37 | |
| 38 const int kMinBandwidthBps = 30000; | |
| 39 const int kStartBandwidthBps = 300000; | |
| 40 const int kMaxBandwidthBps = 2000000; | |
| 41 | |
| 42 MediaController::MediaController(rtc::Thread* worker_thread, | |
| 43 cricket::MediaEngineInterface* media_engine) | |
| 44 : worker_thread_(worker_thread), video_channel_(nullptr) { | |
| 45 DCHECK(nullptr != worker_thread); | |
| 46 worker_thread_->Invoke<void>( | |
| 47 rtc::Bind(&MediaController::Construct_w, this, media_engine)); | |
| 48 } | |
| 49 | |
| 50 MediaController::~MediaController() { | |
| 51 worker_thread_->Invoke<void>(rtc::Bind(&MediaController::Destruct_w, this)); | |
| 52 } | |
| 53 | |
| 54 void MediaController::set_video_channel(cricket::VideoChannel* video_channel) { | |
| 55 rtc::CritScope cs(&critical_section_); | |
| 56 video_channel_ = video_channel; | |
|
pthatcher1
2015/09/02 21:24:22
WebRtcVideoChannel2 implements webrtc::LoadObserve
the sun
2015/09/03 15:00:46
You have few comments about LoadObserver; let's ke
| |
| 57 } | |
| 58 | |
| 59 void MediaController::OnLoadUpdate(Load load) { | |
| 60 rtc::CritScope cs(&critical_section_); | |
| 61 if (video_channel_) { | |
| 62 cricket::VideoMediaChannel* mch = video_channel_->media_channel(); | |
| 63 static_cast<cricket::WebRtcVideoChannel2*>(mch)->OnLoadUpdate(load); | |
| 64 } | |
| 65 } | |
| 66 | |
| 67 void MediaController::Construct_w(cricket::MediaEngineInterface* media_engine) { | |
| 68 DCHECK(nullptr != media_engine); | |
| 69 DCHECK(rtc::Thread::Current() == worker_thread_); | |
|
pthatcher1
2015/09/02 21:24:22
I think we usually use worker_thread_->IsCurrent()
the sun
2015/09/03 15:00:46
Done.
| |
| 70 webrtc::Call::Config config; | |
| 71 config.overuse_callback = this; | |
|
pthatcher1
2015/09/02 21:24:22
Instead of passing in a MediaEngineInteface, webrt
the sun
2015/09/03 15:00:46
Done.
| |
| 72 config.voice_engine = media_engine->GetVoE(); | |
| 73 config.bitrate_config.min_bitrate_bps = kMinBandwidthBps; | |
| 74 config.bitrate_config.start_bitrate_bps = kStartBandwidthBps; | |
| 75 config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps; | |
| 76 call_.reset(webrtc::Call::Create(config)); | |
| 77 } | |
| 78 | |
| 79 void MediaController::Destruct_w() { | |
| 80 DCHECK(rtc::Thread::Current() == worker_thread_); | |
| 81 call_.reset(nullptr); | |
| 82 } | |
| 83 } // namespace webrtc | |
| OLD | NEW |