commit f5b2e519b4067e209d2cebbd4b1ef485d2a5c289
author perkj <perkj@webrtc.org> Tue Jul 05 08:34:04 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 05 15:34:08 2016 +0000
tree 821b6f7bc8b5513d75b41096bef9dcd17f3b9ee1
parent 0e7000b20a5a3f7a420dfe1ef4fa7f3347cded75

Fix stats for encoder target bitrate when target rate is zero.
When the target bitrate is zero, currently  VideoSendStream.Stats.target_media_bitrate_bps show the last set rate before the target was set to zero.

BUG=webrtc::5687 b/29574845

Review-Url: https://codereview.webrtc.org/2122743003
Cr-Commit-Position: refs/heads/master@{#13386}

webrtc/modules/video_coding/video_coding_impl.cc

diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc
index 8955e54..077f336 100644
--- a/webrtc/modules/video_coding/video_coding_impl.cc
+++ b/webrtc/modules/video_coding/video_coding_impl.cc
@@ -73,12 +73,11 @@
  public:
   VideoCodingModuleImpl(Clock* clock,
                         EventFactory* event_factory,
-                        VideoEncoderRateObserver* encoder_rate_observer,
                         NackSender* nack_sender,
                         KeyFrameRequestSender* keyframe_request_sender,
                         EncodedImageCallback* pre_decode_image_callback)
       : VideoCodingModule(),
-        sender_(clock, &post_encode_callback_, encoder_rate_observer, nullptr),
+        sender_(clock, &post_encode_callback_, nullptr),
         receiver_(clock,
                   event_factory,
                   pre_decode_image_callback,
@@ -263,29 +262,15 @@
   VCMCodecDataBase::Codec(codecType, codec);
 }
 
-// Create method for current interface, will be removed when the
-// new jitter buffer is in place.
-VideoCodingModule* VideoCodingModule::Create(
-    Clock* clock,
-    VideoEncoderRateObserver* encoder_rate_observer,
-    VCMQMSettingsCallback* qm_settings_callback) {
-  return VideoCodingModule::Create(clock, encoder_rate_observer,
-                                   qm_settings_callback,
-                                   nullptr,   // NackSender
-                                   nullptr,   // KeyframeRequestSender
-                                   nullptr);  // Pre-decode image callback
-}
-
 // Create method for the new jitter buffer.
 VideoCodingModule* VideoCodingModule::Create(
     Clock* clock,
-    VideoEncoderRateObserver* encoder_rate_observer,
     VCMQMSettingsCallback* qm_settings_callback,
     NackSender* nack_sender,
     KeyFrameRequestSender* keyframe_request_sender,
     EncodedImageCallback* pre_decode_image_callback) {
-  return new VideoCodingModuleImpl(clock, nullptr, encoder_rate_observer,
-                                   nack_sender, keyframe_request_sender,
+  return new VideoCodingModuleImpl(clock, nullptr, nack_sender,
+                                   keyframe_request_sender,
                                    pre_decode_image_callback);
 }
 
@@ -306,7 +291,7 @@
     KeyFrameRequestSender* keyframe_request_sender) {
   assert(clock);
   assert(event_factory);
-  return new VideoCodingModuleImpl(clock, event_factory, nullptr, nack_sender,
+  return new VideoCodingModuleImpl(clock, event_factory, nack_sender,
                                    keyframe_request_sender, nullptr);
 }