Rename adaptation api methods, extended vie_encoder unit test.

webrtc/modules/video_coding/utility/quality_scaler_unittest.cc

 /*
  *  Copyright (c) 2014 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/modules/video_coding/utility/quality_scaler.h"
 
 #include <memory>
 
 #include "webrtc/base/event.h"
 #include "webrtc/base/task_queue.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 namespace {
 static const int kFramerate = 30;
 static const int kLowQp = 15;
 static const int kLowQpThreshold = 18;
 static const int kHighQp = 40;
 static const size_t kDefaultTimeoutMs = 150;
 }  // namespace
 
-class MockScaleObserver : public ScalingObserverInterface {
+class MockScaleObserver : public AdaptationObserverInterface {

[nisse-webrtc, 2017/01/30 09:16:45]

Could rename scale --> adapt everywhere in this class too, for consistency? If
that makes sense, I don't know if this is perhaps intended for scaling only.

[sprang_webrtc, 2017/01/30 09:55:05]

As related to the interface I think it makes sense to rename. I won't purge all
usage of the word scale here though. I haven't decided yet if we want to apply
this signal to eg a screenshare scenario.

  public:
   MockScaleObserver() : event(false, false) {}
   virtual ~MockScaleObserver() {}
 
-  void ScaleUp(ScaleReason r) override {
+  void AdaptUp(AdaptReason r) override {
     scaled_up++;
     event.Set();
   }
-  void ScaleDown(ScaleReason r) override {
+  void AdaptDown(AdaptReason r) override {
     scaled_down++;
     event.Set();
   }
 
   rtc::Event event;
   int scaled_up = 0;
   int scaled_down = 0;
 };
 
 // Pass a lower sampling period to speed up the tests.
 class QualityScalerUnderTest : public QualityScaler {
  public:
-  explicit QualityScalerUnderTest(ScalingObserverInterface* observer,
+  explicit QualityScalerUnderTest(AdaptationObserverInterface* observer,
                                   VideoEncoder::QpThresholds thresholds)
       : QualityScaler(observer, thresholds, 5) {}
 };
 
 class QualityScalerTest : public ::testing::Test {
  protected:
   enum ScaleDirection {
     kKeepScaleAtHighQp,
     kScaleDown,
     kScaleDownAboveHighQp,
@@ skipping 107 matching lines @@
   EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
   EXPECT_EQ(1, observer_->scaled_down);
   EXPECT_EQ(0, observer_->scaled_up);
   q_->PostTask([this] { TriggerScale(kScaleUp); });
   EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
   EXPECT_EQ(1, observer_->scaled_down);
   EXPECT_EQ(1, observer_->scaled_up);
 }
 #undef DISABLED_TEST
 }  // namespace webrtc