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

Don't use CPU adaptation for screen content in the new API.

Browse Source 
BUG=4605
R=pbos@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#9116}
This commit is contained in:
Erik Språng 2015-04-29 16:21:28 +02:00
parent adf89b7e33
commit efbde3775b
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1416,8 +1416,12 @@ void WebRtcVideoChannel2::OnLoadUpdate(Load load) {
rtc::CritScope stream_lock(&capturer_crit_); rtc::CritScope stream_lock(&capturer_crit_);
if (!signal_cpu_adaptation_) if (!signal_cpu_adaptation_)
return; return;
// Do not adapt resolution for screen content as this will likely result in
// blurry and unreadable text.
for (auto& kv : capturers_) { for (auto& kv : capturers_) {
if (kv.second != nullptr && kv.second->video_adapter() != nullptr) { if (kv.second != nullptr
&& !kv.second->IsScreencast()
&& kv.second->video_adapter() != nullptr) {
kv.second->video_adapter()->OnCpuResolutionRequest( kv.second->video_adapter()->OnCpuResolutionRequest(
load == kOveruse ? CoordinatedVideoAdapter::DOWNGRADE load == kOveruse ? CoordinatedVideoAdapter::DOWNGRADE
: CoordinatedVideoAdapter::UPGRADE); : CoordinatedVideoAdapter::UPGRADE);

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

@ -973,7 +973,7 @@ class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test,
EXPECT_EQ(webrtc_ext, recv_stream->GetConfig().rtp.extensions[0].name); EXPECT_EQ(webrtc_ext, recv_stream->GetConfig().rtp.extensions[0].name);
} }
void TestCpuAdaptation(bool enable_overuse); void TestCpuAdaptation(bool enable_overuse, bool is_screenshare);
FakeVideoSendStream* SetDenoisingOption(bool enabled) { FakeVideoSendStream* SetDenoisingOption(bool enabled) {
VideoOptions options; VideoOptions options;
@ -1644,14 +1644,19 @@ TEST_F(WebRtcVideoChannel2Test, DISABLED_SendReceiveBitratesStats) {
} }
TEST_F(WebRtcVideoChannel2Test, AdaptsOnOveruse) { TEST_F(WebRtcVideoChannel2Test, AdaptsOnOveruse) {
TestCpuAdaptation(true); TestCpuAdaptation(true, false);
} }
TEST_F(WebRtcVideoChannel2Test, DoesNotAdaptOnOveruseWhenDisabled) { TEST_F(WebRtcVideoChannel2Test, DoesNotAdaptOnOveruseWhenDisabled) {
TestCpuAdaptation(false); TestCpuAdaptation(false, false);
} }
void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse) { TEST_F(WebRtcVideoChannel2Test, DoesNotAdaptOnOveruseWhenScreensharing) {
TestCpuAdaptation(true, true);
}
void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse,
bool is_screenshare) {
cricket::VideoCodec codec = kVp8Codec720p; cricket::VideoCodec codec = kVp8Codec720p;
std::vector<cricket::VideoCodec> codecs; std::vector<cricket::VideoCodec> codecs;
codecs.push_back(codec); codecs.push_back(codec);
@ -1666,6 +1671,7 @@ void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse) {
AddSendStream(); AddSendStream();
cricket::FakeVideoCapturer capturer; cricket::FakeVideoCapturer capturer;
capturer.SetScreencast(is_screenshare);
EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer)); EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
EXPECT_EQ(cricket::CS_RUNNING, EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front())); capturer.Start(capturer.GetSupportedFormats()->front()));
@ -1684,7 +1690,7 @@ void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse) {
EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames()); EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames());
if (enable_overuse) { if (enable_overuse && !is_screenshare) {
EXPECT_LT(send_stream->GetLastWidth(), codec.width); EXPECT_LT(send_stream->GetLastWidth(), codec.width);
EXPECT_LT(send_stream->GetLastHeight(), codec.height); EXPECT_LT(send_stream->GetLastHeight(), codec.height);
} else { } else {