Frame dropper improvements & cleanup

webrtc/modules/video_coding/video_sender.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 114 matching lines @@
   {
     rtc::CritScope cs(&params_crit_);
     next_frame_types_.clear();
     next_frame_types_.resize(VCM_MAX(sendCodec->numberOfSimulcastStreams, 1),
                              kVideoFrameKey);
     // Cache InternalSource() to have this available from IntraFrameRequest()
     // without having to acquire encoder_crit_ (avoid blocking on encoder use).
     encoder_has_internal_source_ = _encoder->InternalSource();
   }
 
+  LOG(LS_VERBOSE) << " max bitrate " << sendCodec->maxBitrate
+                  << " start bitrate " << sendCodec->startBitrate
+                  << " max frame rate " << sendCodec->maxFramerate
+                  << " max payload size " << maxPayloadSize;
   _mediaOpt.SetEncodingData(sendCodec->codecType, sendCodec->maxBitrate * 1000,
                             sendCodec->startBitrate * 1000, sendCodec->width,
                             sendCodec->height, sendCodec->maxFramerate,
                             numLayers, maxPayloadSize);
   return VCM_OK;
 }
 
 // Register an external decoder object.
 // This can not be used together with external decoder callbacks.
 void VideoSender::RegisterExternalEncoder(VideoEncoder* externalEncoder,
@@ skipping 127 matching lines @@
   {
     rtc::CritScope lock(&params_crit_);
     encoder_params = encoder_params_;
     next_frame_types = next_frame_types_;
   }
   rtc::CritScope lock(&encoder_crit_);
   if (_encoder == nullptr)
     return VCM_UNINITIALIZED;
   SetEncoderParameters(encoder_params);
   if (_mediaOpt.DropFrame()) {
+    LOG(LS_VERBOSE) << "Drop Frame "
+                    << "target bitrate " << encoder_params.target_bitrate
+                    << " loss rate " << encoder_params.loss_rate << " rtt "
+                    << encoder_params.rtt << " input frame rate "
+                    << encoder_params.input_frame_rate;
     _encoder->OnDroppedFrame();
     return VCM_OK;
   }
   _mediaOpt.UpdateContentData(contentMetrics);
   // TODO(pbos): Make sure setting send codec is synchronized with video
   // processing so frame size always matches.
   if (!_codecDataBase.MatchesCurrentResolution(videoFrame.width(),
                                                videoFrame.height())) {
     LOG(LS_ERROR) << "Incoming frame doesn't match set resolution. Dropping.";
     return VCM_PARAMETER_ERROR;
@@ skipping 77 matching lines @@
   // 10 kbps.
   int window_bps = std::max(threshold_bps / 10, 10000);
   _mediaOpt.SuspendBelowMinBitrate(threshold_bps, window_bps);
 }
 
 bool VideoSender::VideoSuspended() const {
   return _mediaOpt.IsVideoSuspended();
 }
 }  // namespace vcm
 }  // namespace webrtc