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

(Auto)update libjingle 69860953-> 70002228

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6542 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-06-26 08:08:40 +00:00
parent a2142caa2f
commit 420ca434b1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/media/webrtc/fakewebrtcvideoengine.h
View File

@ -684,7 +684,11 @@ class FakeWebRtcVideoEngine
channels_[channel]->overuse_observer_ = observer; channels_[channel]->overuse_observer_ = observer;
return 0; return 0;
} }
#ifdef USE_WEBRTC_DEV_BRANCH
WEBRTC_STUB(GetCpuOveruseMetrics, (int, webrtc::CpuOveruseMetrics*));
#else
WEBRTC_STUB(CpuOveruseMeasures, (int, int*, int*, int*, int*)); WEBRTC_STUB(CpuOveruseMeasures, (int, int*, int*, int*, int*));
#endif
WEBRTC_FUNC(SetCpuOveruseOptions, WEBRTC_FUNC(SetCpuOveruseOptions,
(int channel, const webrtc::CpuOveruseOptions& options)) { (int channel, const webrtc::CpuOveruseOptions& options)) {
WEBRTC_CHECK_CHANNEL(channel); WEBRTC_CHECK_CHANNEL(channel);