From 5e161616b17900c06809e7275afca96363d44ad5 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Fri, 30 Jan 2015 15:31:03 +0000 Subject: [PATCH] Remove CPU monitor from WebRtcVideoEngine2. CPU adaptation is based on timings done inside webrtc, not actual CPU values anymore. This code has never been wired up and is causing flakes on at least valgrind, but possibly also on actual platforms. BUG=1788 R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/34089004 Cr-Commit-Position: refs/heads/master@{#8221} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8221 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine2.cc | 10 ---------- talk/media/webrtc/webrtcvideoengine2.h | 4 ---- 2 files changed, 14 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index d77db235d5..22285d7262 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -330,7 +330,6 @@ WebRtcVideoEngine2::WebRtcVideoEngine2() FPS_TO_INTERVAL(kDefaultVideoMaxFramerate), FOURCC_ANY), initialized_(false), - cpu_monitor_(new rtc::CpuMonitor(NULL)), call_factory_(&default_call_factory_), external_decoder_factory_(NULL), external_encoder_factory_(NULL) { @@ -362,12 +361,6 @@ bool WebRtcVideoEngine2::Init(rtc::Thread* worker_thread) { worker_thread_ = worker_thread; ASSERT(worker_thread_ != NULL); - cpu_monitor_->set_thread(worker_thread_); - if (!cpu_monitor_->Start(kCpuMonitorPeriodMs)) { - LOG(LS_ERROR) << "Failed to start CPU monitor."; - cpu_monitor_.reset(); - } - initialized_ = true; return true; } @@ -375,9 +368,6 @@ bool WebRtcVideoEngine2::Init(rtc::Thread* worker_thread) { void WebRtcVideoEngine2::Terminate() { LOG(LS_INFO) << "WebRtcVideoEngine2::Terminate"; - if (cpu_monitor_.get() != NULL) - cpu_monitor_->Stop(); - initialized_ = false; } diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h index bb236591e6..7247c13de1 100644 --- a/talk/media/webrtc/webrtcvideoengine2.h +++ b/talk/media/webrtc/webrtcvideoengine2.h @@ -157,8 +157,6 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> { VideoFormat GetStartCaptureFormat() const { return default_codec_format_; } - rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); } - private: std::vector GetSupportedCodecs() const; @@ -170,8 +168,6 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> { bool initialized_; - rtc::scoped_ptr cpu_monitor_; - WebRtcCallFactory default_call_factory_; WebRtcCallFactory* call_factory_;