| Index: webrtc/video/vie_encoder.h
|
| diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
|
| index 098d67f359f2cd7a676d6fb73c4915ae4e7b7a55..c05bc7aeb7b30c6a0dfb8c19ac893619ac31bdf3 100644
|
| --- a/webrtc/video/vie_encoder.h
|
| +++ b/webrtc/video/vie_encoder.h
|
| @@ -55,11 +55,16 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
| friend class ViEBitrateObserver;
|
|
|
| ViEEncoder(uint32_t number_of_cores,
|
| - ProcessThread* module_process_thread,
|
| SendStatisticsProxy* stats_proxy,
|
| OveruseFrameDetector* overuse_detector,
|
| EncodedImageCallback* sink);
|
| ~ViEEncoder();
|
| + // RegisterProcessThread register |module_process_thread| with those objects
|
| + // that use it. Registration have to happen on the thread where
|
| + // |module_process_thread| where created (libjingles worker thread).
|
| + // TODO(perkj): Replace the use of |module_process_thread| with a TaskQueue.
|
| + void RegisterProcessThread(ProcessThread* module_process_thread);
|
| + void DeRegisterProcessThread();
|
|
|
| vcm::VideoSender* video_sender();
|
|
|
| @@ -123,10 +128,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
| SendStatisticsProxy* const stats_proxy_;
|
| OveruseFrameDetector* const overuse_detector_;
|
|
|
| - // The time we last received an input frame or encoded frame. This is used to
|
| - // track when video is stopped long enough that we also want to stop sending
|
| - // padding.
|
| - int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
|
| VideoCodec encoder_config_ GUARDED_BY(data_cs_);
|
| uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
|
| bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_);
|
|
|