commit aed3070ad40c02d2298e6603a6cce8bb91f320c7
author Erik Språng <sprang@webrtc.org> Mon Nov 05 11:57:17 2018
committer Commit Bot <commit-bot@chromium.org> Mon Nov 05 13:58:14 2018
tree fa3cd56fe910a902df6427d28229ec4658656a29
parent f418bcbcf1e4908c5604ced65fadcefda61adde6

Replace GetScalingSettings() with GetEnocderInfo() in TestEncoder

Bug: webrtc:9890
Change-Id: I00c0d95739fe1e90df464a6a7402410ee070f840
Reviewed-on: https://webrtc-review.googlesource.com/c/109028
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25500}

video/video_stream_encoder_unittest.cc

diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
index 4b9de7b..6705695 100644
--- a/video/video_stream_encoder_unittest.cc
+++ b/video/video_stream_encoder_unittest.cc
@@ -508,11 +508,14 @@
       block_next_encode_ = true;
     }
 
-    VideoEncoder::ScalingSettings GetScalingSettings() const override {
+    VideoEncoder::EncoderInfo GetEncoderInfo() const override {
+      EncoderInfo info;
       rtc::CritScope lock(&local_crit_sect_);
-      if (quality_scaling_)
-        return VideoEncoder::ScalingSettings(1, 2, kMinPixelsPerFrame);
-      return VideoEncoder::ScalingSettings::kOff;
+      if (quality_scaling_) {
+        info.scaling_settings =
+            VideoEncoder::ScalingSettings(1, 2, kMinPixelsPerFrame);
+      }
+      return info;
     }
 
     void ContinueEncode() { continue_encode_event_.Set(); }