| Index: webrtc/modules/video_coding/video_coding_impl.h
|
| diff --git a/webrtc/modules/video_coding/video_coding_impl.h b/webrtc/modules/video_coding/video_coding_impl.h
|
| index adeb980072e7ec020f161c0429460cb55ed8a1d7..e6739c2919b30bae80ff5c9253013718eb216783 100644
|
| --- a/webrtc/modules/video_coding/video_coding_impl.h
|
| +++ b/webrtc/modules/video_coding/video_coding_impl.h
|
| @@ -40,6 +40,8 @@ namespace vcm {
|
|
|
| class VCMProcessTimer {
|
| public:
|
| + static const int64_t kDefaultProcessIntervalMs = 1000;
|
| +
|
| VCMProcessTimer(int64_t periodMs, Clock* clock)
|
| : _clock(clock),
|
| _periodMs(periodMs),
|
| @@ -103,7 +105,7 @@ class VideoSender : public Module {
|
| EncoderParameters UpdateEncoderParameters(
|
| const EncoderParameters& params,
|
| VideoBitrateAllocator* bitrate_allocator,
|
| - uint32_t target_bitrate_bps);
|
| + uint32_t target_bitrate_bps) EXCLUSIVE_LOCKS_REQUIRED(params_crit_);
|
| void SetEncoderParameters(EncoderParameters params, bool has_internal_source)
|
| EXCLUSIVE_LOCKS_REQUIRED(encoder_crit_);
|
|
|
| @@ -124,6 +126,7 @@ class VideoSender : public Module {
|
|
|
| rtc::CriticalSection params_crit_;
|
| EncoderParameters encoder_params_ GUARDED_BY(params_crit_);
|
| + bool has_received_frame_ GUARDED_BY(params_crit_);
|
| bool encoder_has_internal_source_ GUARDED_BY(params_crit_);
|
| std::vector<FrameType> next_frame_types_ GUARDED_BY(params_crit_);
|
| };
|
|
|