Move usage of QualityScaler to ViEEncoder.

webrtc/video_encoder.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_VIDEO_ENCODER_H_
 #define WEBRTC_VIDEO_ENCODER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_frame.h"
+#include "webrtc/base/optional.h"
 
 namespace webrtc {
 
 class RTPFragmentationHeader;
 // TODO(pbos): Expose these through a public (root) header or change these APIs.
 struct CodecSpecificInfo;
 class VideoCodec;
 
 class EncodedImageCallback {
  public:
@@ skipping 30 matching lines @@
 };
 
 class VideoEncoder {
  public:
   enum EncoderType {
     kH264,
     kVp8,
     kVp9,
     kUnsupportedCodec,
   };
-
+  struct QPThresholds {

[stefan-webrtc, 2016/11/17 16:12:57]

QpThresholds

[kthelgason, 2016/11/21 13:06:53]

Done.

+    QPThresholds(int l, int h) : low(l), high(h) {}
+    QPThresholds() : low(-1), high(-1) {}
+    int low;
+    int high;
+  };
+  struct ScalingSettings {
+    ScalingSettings(bool on, int low, int high)
+        : enabled(on),
+          thresholds(rtc::Optional<QPThresholds>(QPThresholds(low, high))) {}
+    explicit ScalingSettings(bool on) : enabled(on) {}
+    const bool enabled;
+    const rtc::Optional<QPThresholds> thresholds;
+  };
   static VideoEncoder* Create(EncoderType codec_type);
   // Returns true if this type of encoder can be created using
   // VideoEncoder::Create.
   static bool IsSupportedSoftware(EncoderType codec_type);
   static EncoderType CodecToEncoderType(VideoCodecType codec_type);
 
   static VideoCodecVP8 GetDefaultVp8Settings();
   static VideoCodecVP9 GetDefaultVp9Settings();
   static VideoCodecH264 GetDefaultH264Settings();
 
@@ skipping 71 matching lines @@
     return -1;
   }
 
   // Default fallback: Just use the sum of bitrates as the single target rate.
   // TODO(sprang): Remove this default implementation when we remove SetRates().
   virtual int32_t SetRateAllocation(const BitrateAllocation& allocation,
                                     uint32_t framerate) {
     return SetRates(allocation.get_sum_kbps(), framerate);
   }
 
+  // Any encoder implementation wishing to use the WebRTC provided
+  // quality scaler must implement this method.
+  virtual ScalingSettings GetScalingSettings() const {
+    return ScalingSettings(false);
+  }
+
   virtual int32_t SetPeriodicKeyFrames(bool enable) { return -1; }
   virtual void OnDroppedFrame() {}

[stefan-webrtc, 2016/11/17 16:12:57]

TODO remove.

[kthelgason, 2016/11/21 13:06:53]

Should this be removed from the interface? If so, I don't think it should be
done as part of this CL.

[stefan-webrtc, 2016/11/24 09:36:55]

I thought it was only used for quality scaling? If it's not used for anything
else I don't see a reason to keep it.

   virtual bool SupportsNativeHandle() const { return false; }
   virtual const char* ImplementationName() const { return "unknown"; }
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_ENCODER_H_