Fix perf test regression for screenshare and vp9.

webrtc/video/video_quality_test.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/video/video_quality_test.h"
@@ skipping 1149 matching lines @@
 // Static.
 VideoStream VideoQualityTest::DefaultVideoStream(const Params& params) {
   VideoStream stream;
   stream.width = params.video.width;
   stream.height = params.video.height;
   stream.max_framerate = params.video.fps;
   stream.min_bitrate_bps = params.video.min_bitrate_bps;
   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 layers. Will it work there?
Alternatevely, we have VP9 with 2TL. there will be no
temporal_layer_thresholds_bps in that case. Is it intended?

[sprang_webrtc, 2017/03/10 15:50:54]

Dammit. These settings are dcheck'd but not honored. :(
Reverted to old behavior.

+    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;
 }
 
 // Static.
 VideoStream VideoQualityTest::DefaultThumbnailStream() {
   VideoStream stream;
   stream.width = 320;
   stream.height = 180;
   stream.max_framerate = 7;
@@ skipping 707 matching lines @@
   if (!params_.video.encoded_frame_base_path.empty()) {
     std::ostringstream str;
     str << receive_logs_++;
     std::string path =
         params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
     stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
                                         10000000);
   }
 }
 }  // namespace webrtc