OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 #ifndef WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ | 10 #ifndef WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ |
11 #define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ | 11 #define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ |
12 | 12 |
| 13 #include <memory> |
13 #include <string> | 14 #include <string> |
14 | 15 |
15 #include "webrtc/base/criticalsection.h" | 16 #include "webrtc/base/criticalsection.h" |
16 #include "webrtc/base/platform_thread.h" | 17 #include "webrtc/base/platform_thread.h" |
17 #include "webrtc/base/scoped_ptr.h" | 18 #include "webrtc/base/scoped_ptr.h" |
18 #include "webrtc/common_video/rotation.h" | 19 #include "webrtc/common_video/rotation.h" |
19 #include "webrtc/test/video_capturer.h" | 20 #include "webrtc/test/video_capturer.h" |
20 #include "webrtc/typedefs.h" | 21 #include "webrtc/typedefs.h" |
21 | 22 |
22 namespace webrtc { | 23 namespace webrtc { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 int target_fps); | 58 int target_fps); |
58 bool Init(); | 59 bool Init(); |
59 | 60 |
60 private: | 61 private: |
61 void InsertFrame(); | 62 void InsertFrame(); |
62 static bool Run(void* obj); | 63 static bool Run(void* obj); |
63 | 64 |
64 Clock* const clock_; | 65 Clock* const clock_; |
65 bool sending_; | 66 bool sending_; |
66 | 67 |
67 rtc::scoped_ptr<EventTimerWrapper> tick_; | 68 std::unique_ptr<EventTimerWrapper> tick_; |
68 rtc::CriticalSection lock_; | 69 rtc::CriticalSection lock_; |
69 rtc::PlatformThread thread_; | 70 rtc::PlatformThread thread_; |
70 rtc::scoped_ptr<FrameGenerator> frame_generator_; | 71 std::unique_ptr<FrameGenerator> frame_generator_; |
71 | 72 |
72 int target_fps_; | 73 int target_fps_; |
73 VideoRotation fake_rotation_ = kVideoRotation_0; | 74 VideoRotation fake_rotation_ = kVideoRotation_0; |
74 | 75 |
75 int64_t first_frame_capture_time_; | 76 int64_t first_frame_capture_time_; |
76 }; | 77 }; |
77 } // test | 78 } // test |
78 } // webrtc | 79 } // webrtc |
79 | 80 |
80 #endif // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ | 81 #endif // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ |
OLD | NEW |