| Index: webrtc/video/vie_encoder.h
|
| diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
|
| index 621cf0b0201271b6dad70096af9a5fe3e41c5613..098d67f359f2cd7a676d6fb73c4915ae4e7b7a55 100644
|
| --- a/webrtc/video/vie_encoder.h
|
| +++ b/webrtc/video/vie_encoder.h
|
| @@ -47,8 +47,7 @@ class VideoEncoder;
|
| // 3. Call RegisterExternalEncoder if available.
|
| // 4. Call SetEncoder with the codec settings and the object that shall receive
|
| // the encoded bit stream.
|
| -// 5. Call Start.
|
| -// 6. For each available raw video frame call EncodeVideoFrame.
|
| +// 5. For each available raw video frame call EncodeVideoFrame.
|
| class ViEEncoder : public VideoEncoderRateObserver,
|
| public EncodedImageCallback,
|
| public VCMSendStatisticsCallback {
|
| @@ -67,10 +66,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
| // Returns the id of the owning channel.
|
| int Owner() const;
|
|
|
| - void Start();
|
| - // Drops incoming packets before they get to the encoder.
|
| - void Pause();
|
| -
|
| // Codec settings.
|
| int32_t RegisterExternalEncoder(VideoEncoder* encoder,
|
| uint8_t pl_type,
|
| @@ -134,7 +129,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
| 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_ GUARDED_BY(data_cs_);
|
| bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_);
|
|
|
| ProcessThread* module_process_thread_;
|
|
|