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

Screen content simulcast layers should not be downscaled.

Browse Source 
Fix config so, size isn't downscaled, add unit test coverage.

BUG=webrtc:7171, webrtc:4172

Review-Url: https://codereview.webrtc.org/2692343007
Cr-Commit-Position: refs/heads/master@{#16648}
This commit is contained in:
sprang
2017-02-16 07:35:22 -08:00
committed by Commit bot
parent d103f4ba4a
commit 3ebabf1c29
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/media/engine/simulcast.cc
View File

@ -230,8 +230,10 @@ std::vector<webrtc::VideoStream> GetSimulcastConfig(size_t max_streams,
streams[s].max_framerate = max_framerate; streams[s].max_framerate = max_framerate;
} }
width /= 2; if (!is_screencast) {
height /= 2; width /= 2;
height /= 2;
}
if (s == 0) if (s == 0)
break; break;
} }

7
webrtc/media/engine/webrtcvideoengine2_unittest.cc
View File

@ -4124,6 +4124,13 @@ class WebRtcVideoChannel2SimulcastTest : public testing::Test {
expected_streams = GetSimulcastConfig( expected_streams = GetSimulcastConfig(
num_configured_streams, capture_width, capture_height, 0, num_configured_streams, capture_width, capture_height, 0,
kDefaultQpMax, kDefaultVideoMaxFramerate, screenshare); kDefaultQpMax, kDefaultVideoMaxFramerate, screenshare);
if (screenshare) {
for (const webrtc::VideoStream& stream : expected_streams) {
// Never scale screen content.
EXPECT_EQ(stream.width, capture_width);
EXPECT_EQ(stream.height, capture_height);
}
}
} else { } else {
webrtc::VideoStream stream; webrtc::VideoStream stream;
stream.width = capture_width; stream.width = capture_width;