Move usage of QualityScaler to ViEEncoder.

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

 /*
  *  Copyright (c) 2015 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 195 matching lines @@
 
   SEncParamExt encoder_params = CreateEncoderParams();
   // Initialize.
   if (openh264_encoder_->InitializeExt(&encoder_params) != 0) {
     LOG(LS_ERROR) << "Failed to initialize OpenH264 encoder";
     Release();
     ReportError();
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
   // TODO(pbos): Base init params on these values before submitting.
-  quality_scaler_.Init(codec_settings_.codecType, codec_settings_.startBitrate,
-                       codec_settings_.width, codec_settings_.height,
-                       codec_settings_.maxFramerate);
   int video_format = EVideoFormatType::videoFormatI420;
   openh264_encoder_->SetOption(ENCODER_OPTION_DATAFORMAT,
                                &video_format);
 
   // Initialize encoded image. Default buffer size: size of unencoded data.
   encoded_image_._size = CalcBufferSize(
       kI420, codec_settings_.width, codec_settings_.height);
   encoded_image_._buffer = new uint8_t[encoded_image_._size];
   encoded_image_buffer_.reset(encoded_image_._buffer);
   encoded_image_._completeFrame = true;
@@ skipping 19 matching lines @@
   encoded_image_callback_ = callback;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 int32_t H264EncoderImpl::SetRates(uint32_t bitrate, uint32_t framerate) {
   if (bitrate <= 0 || framerate <= 0) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
   codec_settings_.targetBitrate = bitrate;
   codec_settings_.maxFramerate = framerate;
-  quality_scaler_.ReportFramerate(framerate);
 
   SBitrateInfo target_bitrate;
   memset(&target_bitrate, 0, sizeof(SBitrateInfo));
   target_bitrate.iLayer = SPATIAL_LAYER_ALL,
   target_bitrate.iBitrate = codec_settings_.targetBitrate * 1000;
   openh264_encoder_->SetOption(ENCODER_OPTION_BITRATE,
                                &target_bitrate);
   float max_framerate = static_cast<float>(codec_settings_.maxFramerate);
   openh264_encoder_->SetOption(ENCODER_OPTION_FRAME_RATE,
                                &max_framerate);
@@ skipping 11 matching lines @@
     ReportError();
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
   if (!encoded_image_callback_) {
     LOG(LS_WARNING) << "InitEncode() has been called, but a callback function "
                     << "has not been set with RegisterEncodeCompleteCallback()";
     ReportError();
     return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
   }
 
-  quality_scaler_.OnEncodeFrame(input_frame.width(), input_frame.height());

[magjed_webrtc, 2016/10/07 12:02:54]

Can this class handle that the resolution of |input_frame| changes dynamically?
Maybe you need the same same logic as below for detecting resolution changes?

-  rtc::scoped_refptr<const VideoFrameBuffer> frame_buffer =
-      quality_scaler_.GetScaledBuffer(input_frame.video_frame_buffer());
-  if (frame_buffer->width() != codec_settings_.width ||
-      frame_buffer->height() != codec_settings_.height) {
-    LOG(LS_INFO) << "Encoder reinitialized from " << codec_settings_.width
-                 << "x" << codec_settings_.height << " to "
-                 << frame_buffer->width() << "x" << frame_buffer->height();
-    codec_settings_.width = frame_buffer->width();
-    codec_settings_.height = frame_buffer->height();
-    SEncParamExt encoder_params = CreateEncoderParams();
-    openh264_encoder_->SetOption(ENCODER_OPTION_SVC_ENCODE_PARAM_EXT,
-                                 &encoder_params);
-  }
-
   bool force_key_frame = false;
   if (frame_types != nullptr) {
     // We only support a single stream.
     RTC_DCHECK_EQ(frame_types->size(), static_cast<size_t>(1));
     // Skip frame?
     if ((*frame_types)[0] == kEmptyFrame) {
       return WEBRTC_VIDEO_CODEC_OK;
     }
     // Force key frame?
     force_key_frame = (*frame_types)[0] == kVideoFrameKey;
@@ skipping 46 matching lines @@
                  &frag_header);
 
   // Encoder can skip frames to save bandwidth in which case
   // |encoded_image_._length| == 0.
   if (encoded_image_._length > 0) {
     // Deliver encoded image.
     CodecSpecificInfo codec_specific;
     codec_specific.codecType = kVideoCodecH264;
     encoded_image_callback_->Encoded(encoded_image_, &codec_specific,
                                      &frag_header);
-
-    // Parse and report QP.
-    h264_bitstream_parser_.ParseBitstream(encoded_image_._buffer,
-                                          encoded_image_._length);
-    int qp = -1;

[magjed_webrtc, 2016/10/07 12:02:54]

You still need to parse the qp and put it in encoded_image_.qp_. You need to do
this before calling the Encoded() function above.

[kthelgason, 2016/10/07 13:54:48]

Acknowledged.

-    if (h264_bitstream_parser_.GetLastSliceQp(&qp))
-      quality_scaler_.ReportQP(qp);
-  } else {
-    quality_scaler_.ReportDroppedFrame();
   }
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 const char* H264EncoderImpl::ImplementationName() const {
   return "OpenH264";
 }
 
 bool H264EncoderImpl::IsInitialized() const {
   return openh264_encoder_ != nullptr;
@@ skipping 74 matching lines @@
 
 int32_t H264EncoderImpl::SetChannelParameters(
     uint32_t packet_loss, int64_t rtt) {
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 int32_t H264EncoderImpl::SetPeriodicKeyFrames(bool enable) {
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-void H264EncoderImpl::OnDroppedFrame() {
-  quality_scaler_.ReportDroppedFrame();
-}
-
 }  // namespace webrtc