zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable CPU adaptation by default.

Browse Source 
WebRtcVideoEngine2 doesn't support CPU-monitor-based adaptation and as
such requires encoder-time-based CPU adaptation to perform any
adaptation at all.

BUG=4536
R=asapersson@webrtc.org, mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49679004

Cr-Commit-Position: refs/heads/master@{#9001}
This commit is contained in:
Peter Boström
2015-04-14 22:45:29 +02:00
parent fcf54bdabb
commit e432800aeb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talk/media/webrtc/webrtcvideoengine2.cc
View File

@ -641,7 +641,7 @@ WebRtcVideoChannel2::WebRtcVideoChannel2(
} }
void WebRtcVideoChannel2::SetDefaultOptions() { void WebRtcVideoChannel2::SetDefaultOptions() {
options_.cpu_overuse_detection.Set(false); options_.cpu_overuse_detection.Set(true);
options_.dscp.Set(false); options_.dscp.Set(false);
options_.suspend_below_min_bitrate.Set(false); options_.suspend_below_min_bitrate.Set(false);
options_.video_noise_reduction.Set(true); options_.video_noise_reduction.Set(true);

4
talk/media/webrtc/webrtcvideoengine2_unittest.cc
View File

@ -1732,9 +1732,9 @@ void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse) {
codecs.push_back(codec); codecs.push_back(codec);
EXPECT_TRUE(channel_->SetSendCodecs(codecs)); EXPECT_TRUE(channel_->SetSendCodecs(codecs));
if (enable_overuse) { if (!enable_overuse) {
VideoOptions options; VideoOptions options;
options.cpu_overuse_detection.Set(true); options.cpu_overuse_detection.Set(false);
channel_->SetOptions(options); channel_->SetOptions(options);
} }