Move usage of QualityScaler to ViEEncoder.

webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h

Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
index cb7ca34e61ef255e3e0e75fbe7da5b0416b4fb4d..1cef626d21ca68355441cd1c90ebaf4feaf13e1f 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
+++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
@@ -17,7 +17,6 @@
 #include "webrtc/common_video/rotation.h"
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
 #include "webrtc/modules/video_coding/utility/h264_bitstream_parser.h"
-#include "webrtc/modules/video_coding/utility/quality_scaler.h"
 
 #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
 
@@ -31,6 +30,8 @@
 
 namespace webrtc {
 
+using QPThresholds = VideoEncoder::QPThresholds;

[perkj_webrtc, 2016/10/07 07:41:15]

nit: prefer VideoEncoder::QPThresholds on line 71. Avoid "using" in a large
scope. 
You may if you wish have using inside the class definitions but not at top level
in a header.

+
 class H264VideoToolboxEncoder : public H264Encoder {
  public:
   H264VideoToolboxEncoder();
@@ -47,7 +48,6 @@ class H264VideoToolboxEncoder : public H264Encoder {
 
   int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;
 
-  void OnDroppedFrame() override;
   int SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
 
   int SetRates(uint32_t new_bitrate_kbit, uint32_t frame_rate) override;
@@ -68,6 +68,8 @@ class H264VideoToolboxEncoder : public H264Encoder {
                       uint32_t timestamp,
                       VideoRotation rotation);
 
+  rtc::Optional<QPThresholds> GetQPThresholds() override;
+
  private:
   int ResetCompressionSession();
   void ConfigureCompressionSession();
@@ -85,8 +87,6 @@ class H264VideoToolboxEncoder : public H264Encoder {
   int32_t width_;
   int32_t height_;
 
-  rtc::CriticalSection quality_scaler_crit_;
-  QualityScaler quality_scaler_ GUARDED_BY(quality_scaler_crit_);
   H264BitstreamParser h264_bitstream_parser_;
   bool enable_scaling_;

[kthelgason, 2016/10/06 18:05:47]

TODO: remove

 };  // H264VideoToolboxEncoder