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

Remove overloaded CpuOveruseMeasure function.

Browse Source 
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
This commit is contained in:
asapersson@webrtc.org 2013-12-12 14:37:33 +00:00
parent df7b1d6e39
commit 88ac63abc6
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/video_engine/include/vie_base.h
View File

@ -131,11 +131,6 @@ class WEBRTC_DLLEXPORT ViEBase {
// processed. The delay is expressed in ms // processed. The delay is expressed in ms
// delay per second. // delay per second.
// TODO(asapersson): Remove default implementation. // 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, virtual int CpuOveruseMeasures(int channel,
int* capture_jitter_ms, int* capture_jitter_ms,
int* avg_encode_time_ms, int* avg_encode_time_ms,

12
webrtc/video_engine/vie_base_impl.cc
View File

@ -117,18 +117,6 @@ int ViEBaseImpl::RegisterCpuOveruseObserver(int video_channel,
return 0; 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 ViEBaseImpl::CpuOveruseMeasures(int video_channel,
int* capture_jitter_ms, int* capture_jitter_ms,
int* avg_encode_time_ms, int* avg_encode_time_ms,

3
webrtc/video_engine/vie_base_impl.h
View File

@ -33,9 +33,6 @@ class ViEBaseImpl
virtual int SetVoiceEngine(VoiceEngine* voice_engine); virtual int SetVoiceEngine(VoiceEngine* voice_engine);
virtual int RegisterCpuOveruseObserver(int channel, virtual int RegisterCpuOveruseObserver(int channel,
CpuOveruseObserver* observer); CpuOveruseObserver* observer);
virtual int CpuOveruseMeasures(int channel,
int* capture_jitter_ms,
int* avg_encode_time_ms);
virtual int CpuOveruseMeasures(int channel, virtual int CpuOveruseMeasures(int channel,
int* capture_jitter_ms, int* capture_jitter_ms,
int* avg_encode_time_ms, int* avg_encode_time_ms,