Fix stats for encoder target bitrate when target rate is zero.

webrtc/video/vie_encoder.h

 /*
  *  Copyright (c) 2012 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 30 matching lines @@
 
 // VieEncoder represent a video encoder that accepts raw video frames as input
 // and produces an encoded bit stream.
 // Usage:
 // 1. Instantiate
 // 2. Call Init
 // 3. Call RegisterExternalEncoder if available.
 // 4. Call SetEncoder with the codec settings and the object that shall receive
 //    the encoded bit stream.
 // 5. For each available raw video frame call EncodeVideoFrame.
-class ViEEncoder : public VideoEncoderRateObserver,
-                   public EncodedImageCallback,
+class ViEEncoder : public EncodedImageCallback,
                    public VCMSendStatisticsCallback {
  public:
   friend class ViEBitrateObserver;
 
   ViEEncoder(uint32_t number_of_cores,
              ProcessThread* module_process_thread,
              SendStatisticsProxy* stats_proxy,
              OveruseFrameDetector* overuse_detector,
              EncodedImageCallback* sink);
   ~ViEEncoder();
@@ skipping 11 matching lines @@
   void SetEncoder(const VideoCodec& video_codec,
                   size_t max_data_payload_length);
 
   void EncodeVideoFrame(const VideoFrame& video_frame);
   void SendKeyFrame();
 
   // Returns the time when the encoder last received an input frame or produced
   // an encoded frame.
   int64_t time_of_last_frame_activity_ms();
 
-  // Implements VideoEncoderRateObserver.
-  // TODO(perkj): Refactor VideoEncoderRateObserver. This is only used for
-  // stats. The stats should be set in VideoSendStream instead.
-  // |bitrate_bps| is the target bitrate and |framerate| is the input frame
-  // rate so it has nothing to do with the actual encoder.
-  void OnSetRates(uint32_t bitrate_bps, int framerate) override;
 
   // Implements EncodedImageCallback.
   int32_t Encoded(const EncodedImage& encoded_image,
                   const CodecSpecificInfo* codec_specific_info,
                   const RTPFragmentationHeader* fragmentation) override;
 
   // Implements VideoSendStatisticsCallback.
   void SendStatistics(uint32_t bit_rate,
                       uint32_t frame_rate,
                       const std::string& encoder_name) override;
@@ skipping 37 matching lines @@
   uint8_t picture_id_sli_ GUARDED_BY(data_cs_);
   bool has_received_rpsi_ GUARDED_BY(data_cs_);
   uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
 
   bool video_suspended_ GUARDED_BY(data_cs_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_ENCODER_H_