Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: webrtc/test/frame_generator_capturer.cc

Issue 2845333002: Revert of Delete deprecated and transitional stuff related to video frame refactoring. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/test/fake_texture_frame.h ('k') | webrtc/video/overuse_frame_detector.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 10
11 #include "webrtc/test/frame_generator_capturer.h" 11 #include "webrtc/test/frame_generator_capturer.h"
12 12
13 #include <utility> 13 #include <utility>
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/logging.h" 17 #include "webrtc/base/logging.h"
18 #include "webrtc/base/platform_thread.h" 18 #include "webrtc/base/platform_thread.h"
19 #include "webrtc/base/task_queue.h" 19 #include "webrtc/base/task_queue.h"
20 #include "webrtc/base/timeutils.h"
21 #include "webrtc/system_wrappers/include/clock.h" 20 #include "webrtc/system_wrappers/include/clock.h"
22 #include "webrtc/system_wrappers/include/sleep.h" 21 #include "webrtc/system_wrappers/include/sleep.h"
23 #include "webrtc/test/frame_generator.h" 22 #include "webrtc/test/frame_generator.h"
24 #include "webrtc/video_send_stream.h" 23 #include "webrtc/video_send_stream.h"
25 24
26 namespace webrtc { 25 namespace webrtc {
27 namespace test { 26 namespace test {
28 27
29 class FrameGeneratorCapturer::InsertFrameTask : public rtc::QueuedTask { 28 class FrameGeneratorCapturer::InsertFrameTask : public rtc::QueuedTask {
30 public: 29 public:
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 233
235 int FrameGeneratorCapturer::GetCurrentConfiguredFramerate() { 234 int FrameGeneratorCapturer::GetCurrentConfiguredFramerate() {
236 rtc::CritScope cs(&lock_); 235 rtc::CritScope cs(&lock_);
237 if (wanted_fps_ && *wanted_fps_ < target_fps_) 236 if (wanted_fps_ && *wanted_fps_ < target_fps_)
238 return *wanted_fps_; 237 return *wanted_fps_;
239 return target_fps_; 238 return target_fps_;
240 } 239 }
241 240
242 } // namespace test 241 } // namespace test
243 } // namespace webrtc 242 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/fake_texture_frame.h ('k') | webrtc/video/overuse_frame_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698