Move usage of QualityScaler to ViEEncoder.

webrtc/video/send_statistics_proxy_unittest.cc

 /*
  *  Copyright (c) 2013 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.
  */
 
@@ skipping 585 matching lines @@
 
 TEST_F(SendStatisticsProxyTest, GetStatsReportsBandwidthLimitedResolution) {
   // Initially false.
   EXPECT_FALSE(statistics_proxy_->GetStats().bw_limited_resolution);
   // No resolution scale by default.
   EncodedImage encoded_image;
   statistics_proxy_->OnSendEncodedImage(encoded_image, nullptr);
   EXPECT_FALSE(statistics_proxy_->GetStats().bw_limited_resolution);
   // Resolution not scaled.
   encoded_image.adapt_reason_.bw_resolutions_disabled = 0;
-  encoded_image.adapt_reason_.quality_resolution_downscales = 0;
   statistics_proxy_->OnSendEncodedImage(encoded_image, nullptr);
   EXPECT_FALSE(statistics_proxy_->GetStats().bw_limited_resolution);
   // Resolution scaled due to bandwidth.
   encoded_image.adapt_reason_.bw_resolutions_disabled = 1;
-  encoded_image.adapt_reason_.quality_resolution_downscales = 0;
-  statistics_proxy_->OnSendEncodedImage(encoded_image, nullptr);
-  EXPECT_TRUE(statistics_proxy_->GetStats().bw_limited_resolution);
-  // Resolution not scaled.
-  encoded_image.adapt_reason_.bw_resolutions_disabled = 0;
-  encoded_image.adapt_reason_.quality_resolution_downscales = 0;
-  statistics_proxy_->OnSendEncodedImage(encoded_image, nullptr);
-  EXPECT_FALSE(statistics_proxy_->GetStats().bw_limited_resolution);
-  // Resolution scaled due to quality.
-  encoded_image.adapt_reason_.bw_resolutions_disabled = 0;
-  encoded_image.adapt_reason_.quality_resolution_downscales = 1;

[perkj_webrtc, 2016/11/14 07:21:16]

So GetStats previously reported bw_limited_resolution when quality scaling
kicked in.  I guess that make sense since if bw had been enough the quality
should be good enough. 
So please make sure this behaviour is not changed or start a discussion with
Åsa, Stefan and Pbos. 

[sprang_webrtc, 2016/11/14 10:25:39]

+1, so you don't get this reverted because of a perceived stats regression.

[kthelgason, 2016/11/14 14:36:44]

This behaviour has not changed, only how it's reported. This used to be done via
a hack, setting this property on the |encoded_image| that eventually finds it's
way to the stats proxy. This was necessary because scaling happened all the way
down in the encoders. Now we can just report this directly to the stats_proxy
without having to stick a note on the frame. 

   statistics_proxy_->OnSendEncodedImage(encoded_image, nullptr);
   EXPECT_TRUE(statistics_proxy_->GetStats().bw_limited_resolution);
 }
 
 TEST_F(SendStatisticsProxyTest, NoSubstreams) {
   uint32_t excluded_ssrc =
       std::max(
           *std::max_element(config_.rtp.ssrcs.begin(), config_.rtp.ssrcs.end()),
           *std::max_element(config_.rtp.rtx.ssrcs.begin(),
                             config_.rtp.rtx.ssrcs.end())) +
@@ skipping 331 matching lines @@
 
   EXPECT_EQ(
       1, metrics::NumSamples("WebRTC.Video.Screenshare.FecBitrateSentInKbps"));
   EXPECT_EQ(1, metrics::NumEvents(
                    "WebRTC.Video.Screenshare.FecBitrateSentInKbps",
                    static_cast<int>((rtx_counters.fec.TotalBytes() * 2 * 8) /
                                     metrics::kMinRunTimeInSeconds / 1000)));
 }
 
 }  // namespace webrtc