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

Side by Side Diff: webrtc/video/overuse_frame_detector.h

Issue 1751903002: Replace scoped_ptr with unique_ptr in webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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/video/end_to_end_tests.cc ('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 #ifndef WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_ 11 #ifndef WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_
12 #define WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_ 12 #define WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_
13 13
14 #include <list> 14 #include <list>
15 #include <memory>
15 16
16 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/optional.h" 19 #include "webrtc/base/optional.h"
19 #include "webrtc/base/scoped_ptr.h"
20 #include "webrtc/base/exp_filter.h" 20 #include "webrtc/base/exp_filter.h"
21 #include "webrtc/base/thread_annotations.h" 21 #include "webrtc/base/thread_annotations.h"
22 #include "webrtc/base/thread_checker.h" 22 #include "webrtc/base/thread_checker.h"
23 #include "webrtc/modules/include/module.h" 23 #include "webrtc/modules/include/module.h"
24 24
25 namespace webrtc { 25 namespace webrtc {
26 26
27 class Clock; 27 class Clock;
28 class EncodedFrameObserver; 28 class EncodedFrameObserver;
29 class VideoFrame; 29 class VideoFrame;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 int64_t next_process_time_ms_; 147 int64_t next_process_time_ms_;
148 int64_t last_overuse_time_ms_; 148 int64_t last_overuse_time_ms_;
149 int checks_above_threshold_; 149 int checks_above_threshold_;
150 int num_overuse_detections_; 150 int num_overuse_detections_;
151 int64_t last_rampup_time_ms_; 151 int64_t last_rampup_time_ms_;
152 bool in_quick_rampup_; 152 bool in_quick_rampup_;
153 int current_rampup_delay_ms_; 153 int current_rampup_delay_ms_;
154 154
155 // TODO(asapersson): Can these be regular members (avoid separate heap 155 // TODO(asapersson): Can these be regular members (avoid separate heap
156 // allocs)? 156 // allocs)?
157 const rtc::scoped_ptr<SendProcessingUsage> usage_ GUARDED_BY(crit_); 157 const std::unique_ptr<SendProcessingUsage> usage_ GUARDED_BY(crit_);
158 std::list<FrameTiming> frame_timing_ GUARDED_BY(crit_); 158 std::list<FrameTiming> frame_timing_ GUARDED_BY(crit_);
159 159
160 rtc::ThreadChecker processing_thread_; 160 rtc::ThreadChecker processing_thread_;
161 161
162 RTC_DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector); 162 RTC_DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector);
163 }; 163 };
164 164
165 } // namespace webrtc 165 } // namespace webrtc
166 166
167 #endif // WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_ 167 #endif // WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_
OLDNEW
« no previous file with comments | « webrtc/video/end_to_end_tests.cc ('k') | webrtc/video/overuse_frame_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698