Chromium Code Reviews| Index: webrtc/video/video_quality_test.cc |
| diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc |
| index cfee0a37933b37c2fedbcf85cd4390520ce98483..63c766c1ed19e3d0e46a54d3f288acba1dbb4cc0 100644 |
| --- a/webrtc/video/video_quality_test.cc |
| +++ b/webrtc/video/video_quality_test.cc |
| @@ -1167,15 +1167,14 @@ VideoStream VideoQualityTest::DefaultVideoStream(const Params& params) { |
| stream.target_bitrate_bps = params.video.target_bitrate_bps; |
| stream.max_bitrate_bps = params.video.max_bitrate_bps; |
| stream.max_qp = 52; |
| - if (params.video.num_temporal_layers > 1) { |
| - RTC_CHECK_LE(params.video.num_temporal_layers, kMaxTemporalStreams); |
| - if (params.video.codec == "VP8") { |
| - for (int i = 0; i < params.video.num_temporal_layers - 1; ++i) { |
| - stream.temporal_layer_thresholds_bps.push_back(static_cast<int>( |
| - stream.target_bitrate_bps * |
| - kVp8LayerRateAlloction[params.video.num_temporal_layers][i])); |
| - } |
| - } |
| + // TODO(sprang): Can we make this less of a hack? |
| + if (params.screenshare.enabled && params.video.codec == "VP8" && |
| + params.video.num_temporal_layers == 2) { |
| + // Hack for VP8 screenshare_layers. |
|
ilnik
2017/03/10 13:43:39
We have a VP8 simulcast tests with 3 temporal laye
sprang_webrtc
2017/03/10 15:50:54
Dammit. These settings are dcheck'd but not honore
|
| + stream.temporal_layer_thresholds_bps.push_back(stream.target_bitrate_bps); |
| + } else if (params.video.num_temporal_layers == 3) { |
| + stream.temporal_layer_thresholds_bps.push_back(stream.max_bitrate_bps / 4); |
| + stream.temporal_layer_thresholds_bps.push_back(stream.target_bitrate_bps); |
| } |
| return stream; |
| } |