generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 62948689-> 63019975

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5689 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-03-12 19:53:43 +00:00
parent 9269ba14f0
commit c7bec8484b
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/base/cpumonitor_unittest.cc
View File

@ -386,8 +386,8 @@ TEST(CpuMonitorTest, TestCpuMonitor) {
CpuLoadListener listener;
monitor.SignalUpdate.connect(&listener, &CpuLoadListener::OnCpuLoad);
EXPECT_TRUE(monitor.Start(10));
Thread::Current()->ProcessMessages(50);
EXPECT_GT(listener.count(), 2); // We have checked cpu load more than twice.
// We have checked cpu load more than twice.
EXPECT_TRUE_WAIT(listener.count() > 2, 1000);
EXPECT_GT(listener.current_cpus(), 0);
EXPECT_GT(listener.cpus(), 0);
EXPECT_GE(listener.process_load(), .0f);

20
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -612,9 +612,6 @@ class WebRtcVideoChannelSendInfo : public sigslot::has_slots<> {
}
return video_adapter()->adapt_reason();
}
webrtc::CpuOveruseObserver* overuse_observer() {
return overuse_observer_.get();
}
StreamParams* stream_params() { return stream_params_.get(); }
void set_stream_params(const StreamParams& sp) {
@ -631,7 +628,8 @@ class WebRtcVideoChannelSendInfo : public sigslot::has_slots<> {
VideoCapturer* video_capturer() {
return video_capturer_;
}
void set_video_capturer(VideoCapturer* video_capturer) {
void set_video_capturer(VideoCapturer* video_capturer,
ViEWrapper* vie_wrapper) {
if (video_capturer == video_capturer_) {
return;
}
@ -648,6 +646,7 @@ class WebRtcVideoChannelSendInfo : public sigslot::has_slots<> {
capturer_updated_ = true;
video_capturer_ = video_capturer;
vie_wrapper->base()->RegisterCpuOveruseObserver(channel_id_, NULL);
if (!video_capturer) {
overuse_observer_.reset();
return;
@ -659,6 +658,8 @@ class WebRtcVideoChannelSendInfo : public sigslot::has_slots<> {
UpdateAdapterCpuOptions();
overuse_observer_.reset(new WebRtcOveruseObserver(adapter));
vie_wrapper->base()->RegisterCpuOveruseObserver(channel_id_,
overuse_observer_.get());
// (Dis)connect the video adapter from the cpu monitor as appropriate.
SetCpuOveruseDetection(overuse_observer_enabled_);
@ -2204,7 +2205,7 @@ bool WebRtcVideoMediaChannel::DeleteSendChannel(uint32 ssrc_key) {
}
WebRtcVideoChannelSendInfo* send_channel = send_channels_[ssrc_key];
MaybeDisconnectCapturer(send_channel->video_capturer());
send_channel->set_video_capturer(NULL);
send_channel->set_video_capturer(NULL, engine()->vie());
int channel_id = send_channel->channel_id();
int capture_id = send_channel->capture_id();
@ -2244,7 +2245,7 @@ bool WebRtcVideoMediaChannel::RemoveCapturer(uint32 ssrc) {
return false;
}
MaybeDisconnectCapturer(capturer);
send_channel->set_video_capturer(NULL);
send_channel->set_video_capturer(NULL, engine()->vie());
const int64 timestamp = send_channel->local_stream_info()->time_stamp();
if (send_codec_) {
QueueBlackFrame(ssrc, timestamp, send_codec_->maxFramerate);
@ -2567,7 +2568,7 @@ bool WebRtcVideoMediaChannel::SetCapturer(uint32 ssrc,
VideoCapturer* old_capturer = send_channel->video_capturer();
MaybeDisconnectCapturer(old_capturer);
send_channel->set_video_capturer(capturer);
send_channel->set_video_capturer(capturer, engine()->vie());
MaybeConnectCapturer(capturer);
if (!capturer->IsScreencast() && ratio_w_ != 0 && ratio_h_ != 0) {
capturer->UpdateAspectRatio(ratio_w_, ratio_h_);
@ -3359,11 +3360,6 @@ bool WebRtcVideoMediaChannel::ConfigureSending(int channel_id,
new WebRtcVideoChannelSendInfo(channel_id, vie_capture,
external_capture,
engine()->cpu_monitor()));
if (engine()->vie()->base()->RegisterCpuOveruseObserver(
channel_id, send_channel->overuse_observer())) {
LOG_RTCERR1(RegisterCpuOveruseObserver, channel_id);
return false;
}
send_channel->ApplyCpuOptions(options_);
send_channel->SignalCpuAdaptationUnable.connect(this,
&WebRtcVideoMediaChannel::OnCpuAdaptationUnable);