From 88ac63abc6ce526c55c9b3a0b280e285d6b664ab Mon Sep 17 00:00:00 2001 From: "asapersson@webrtc.org" Date: Thu, 12 Dec 2013 14:37:33 +0000 Subject: [PATCH] Remove overloaded CpuOveruseMeasure function. R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5199005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5272 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/include/vie_base.h | 5 ----- webrtc/video_engine/vie_base_impl.cc | 12 ------------ webrtc/video_engine/vie_base_impl.h | 3 --- 3 files changed, 20 deletions(-) diff --git a/webrtc/video_engine/include/vie_base.h b/webrtc/video_engine/include/vie_base.h index 0ca3182ac0..cd5f3856e1 100644 --- a/webrtc/video_engine/include/vie_base.h +++ b/webrtc/video_engine/include/vie_base.h @@ -131,11 +131,6 @@ class WEBRTC_DLLEXPORT ViEBase { // processed. The delay is expressed in ms // delay per second. // TODO(asapersson): Remove default implementation. - // TODO(asapersson): Remove this function. - virtual int CpuOveruseMeasures(int channel, - int* capture_jitter_ms, - int* avg_encode_time_ms) { return -1; } - virtual int CpuOveruseMeasures(int channel, int* capture_jitter_ms, int* avg_encode_time_ms, diff --git a/webrtc/video_engine/vie_base_impl.cc b/webrtc/video_engine/vie_base_impl.cc index 6198694d98..83f156dccf 100644 --- a/webrtc/video_engine/vie_base_impl.cc +++ b/webrtc/video_engine/vie_base_impl.cc @@ -117,18 +117,6 @@ int ViEBaseImpl::RegisterCpuOveruseObserver(int video_channel, return 0; } -int ViEBaseImpl::CpuOveruseMeasures(int video_channel, - int* capture_jitter_ms, - int* avg_encode_time_ms) { - int encode_usage_percent; - int capture_queue_delay_ms_per_s; - return CpuOveruseMeasures(video_channel, - capture_jitter_ms, - avg_encode_time_ms, - &encode_usage_percent, - &capture_queue_delay_ms_per_s); -} - int ViEBaseImpl::CpuOveruseMeasures(int video_channel, int* capture_jitter_ms, int* avg_encode_time_ms, diff --git a/webrtc/video_engine/vie_base_impl.h b/webrtc/video_engine/vie_base_impl.h index 779042b071..231efc9a60 100644 --- a/webrtc/video_engine/vie_base_impl.h +++ b/webrtc/video_engine/vie_base_impl.h @@ -33,9 +33,6 @@ class ViEBaseImpl virtual int SetVoiceEngine(VoiceEngine* voice_engine); virtual int RegisterCpuOveruseObserver(int channel, CpuOveruseObserver* observer); - virtual int CpuOveruseMeasures(int channel, - int* capture_jitter_ms, - int* avg_encode_time_ms); virtual int CpuOveruseMeasures(int channel, int* capture_jitter_ms, int* avg_encode_time_ms,