Chromium Code Reviews| Index: webrtc/video/video_send_stream.h |
| diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h |
| index 79f99a4bff18817b808763271cdef733066aa708..1d9c8fa994d8787ea41ccabf4862d4854cc8f04f 100644 |
| --- a/webrtc/video/video_send_stream.h |
| +++ b/webrtc/video/video_send_stream.h |
| @@ -138,8 +138,19 @@ class VideoSendStream : public webrtc::VideoSendStream, |
| rtc::CriticalSection encoder_settings_crit_; |
| std::unique_ptr<EncoderSettings> pending_encoder_settings_ |
| GUARDED_BY(encoder_settings_crit_); |
| + |
| + rtc::Optional<bool> pending_state_change_ GUARDED_BY(encoder_settings_crit_); |
|
pbos-webrtc
2016/06/17 12:38:21
Can you make this Optional<State> and just not use
perkj_webrtc
2016/06/17 13:06:32
Done.
|
| + |
| + enum State { |
| + kStopped, // VideoSendStream::Start has not yet been called. |
| + kStarted, // VideoSendStream::Start has been called. |
| + // VideoSendStream::Start has been called but the encoder have timed out. |
| + kEncoderTimedOut, |
| + }; |
| + |
| // Only used on the encoder thread. |
| - bool send_stream_registered_as_observer_; |
| + State state_; |
|
pbos-webrtc
2016/06/17 12:38:21
Can you make this GUARDED_BY a thread checker for
perkj_webrtc
2016/06/17 13:06:32
Done.
|
| + |
| std::unique_ptr<EncoderSettings> current_encoder_settings_; |
| OveruseFrameDetector overuse_detector_; |