| Index: webrtc/test/frame_generator_capturer.h
|
| diff --git a/webrtc/test/frame_generator_capturer.h b/webrtc/test/frame_generator_capturer.h
|
| index 75e48497bec35c65fa5a746e57e619c570c78b79..c1eca16ca942b0240ab1c4766b2b468214e94e42 100644
|
| --- a/webrtc/test/frame_generator_capturer.h
|
| +++ b/webrtc/test/frame_generator_capturer.h
|
| @@ -78,6 +78,7 @@ class FrameGeneratorCapturer : public VideoCapturer {
|
|
|
| void InsertFrame();
|
| static bool Run(void* obj);
|
| + int GetCurrentConfiguredFramerate();
|
|
|
| Clock* const clock_;
|
| bool sending_;
|
| @@ -87,7 +88,8 @@ class FrameGeneratorCapturer : public VideoCapturer {
|
| rtc::CriticalSection lock_;
|
| std::unique_ptr<FrameGenerator> frame_generator_;
|
|
|
| - int target_fps_;
|
| + int target_fps_ GUARDED_BY(&lock_);
|
| + rtc::Optional<int> wanted_fps_ GUARDED_BY(&lock_);
|
| VideoRotation fake_rotation_ = kVideoRotation_0;
|
|
|
| int64_t first_frame_capture_time_;
|
|
|