Refactor how padding is calculated.

webrtc/video/vie_encoder.h

Index: webrtc/video/vie_encoder.h
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
index 4372bd11c905615def67adc198d51b6438619331..66898b3ecac0fa3f095851b6bb90b9d0a34ba282 100644
--- a/webrtc/video/vie_encoder.h
+++ b/webrtc/video/vie_encoder.h
@@ -60,7 +60,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
              SendStatisticsProxy* stats_proxy,
              OveruseFrameDetector* overuse_detector,
              EncodedImageCallback* sink);
-
   ~ViEEncoder();
 
   vcm::VideoSender* video_sender();
@@ -78,12 +77,18 @@ class ViEEncoder : public VideoEncoderRateObserver,
                                   bool internal_source);
   int32_t DeRegisterExternalEncoder(uint8_t pl_type);
   void SetEncoder(const VideoCodec& video_codec,
-                  int min_transmit_bitrate_bps,
                   size_t max_data_payload_length);
 
   void EncodeVideoFrame(const VideoFrame& video_frame);
   void SendKeyFrame();
 
+  // Checks to see if the encoder has produced anything during the last
+  // VideoEncoderSink::TimeOutMs period.
+  // TODO(perkj): CheckForActivity should be moved to VideoSendStream and
+  // handled internally  within VideoSendStream once  an internal timer

[stefan-webrtc, 2016/06/10 13:54:13]

Two extra spaces on this line.

[perkj_webrtc, 2016/06/14 10:58:02]

Acknowledged.

+  // once ViEncoder owns the encoder thread.

[stefan-webrtc, 2016/06/10 13:54:13]

And this comment doesnt seem correct...

[perkj_webrtc, 2016/06/14 10:58:02]

The whole comment is wrong.. sorry.


I still think this should be done internally in VideoSend stream so that we can
handle preencoded data the same way as this. But I will remove the todo for now
since its probably confusing.

+  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.
@@ -106,8 +111,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
   virtual void OnReceivedSLI(uint8_t picture_id);
   virtual void OnReceivedRPSI(uint64_t picture_id);
 
-  int GetPaddingNeededBps() const;
-
   void OnBitrateUpdated(uint32_t bitrate_bps,
                         uint8_t fraction_lost,
                         int64_t round_trip_time_ms);
@@ -133,7 +136,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
   // padding.
   int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
   VideoCodec encoder_config_ GUARDED_BY(data_cs_);
-  int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);
   uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
   bool encoder_paused_ GUARDED_BY(data_cs_);
   bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_);