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

Side by Side Diff: webrtc/video/vie_encoder.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/vie_channel.h ('k') | webrtc/video/vie_receiver.h » ('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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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_VIE_ENCODER_H_ 11 #ifndef WEBRTC_VIDEO_VIE_ENCODER_H_
12 #define WEBRTC_VIDEO_VIE_ENCODER_H_ 12 #define WEBRTC_VIDEO_VIE_ENCODER_H_
13 13
14 #include <memory>
14 #include <vector> 15 #include <vector>
15 16
16 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/base/scoped_ref_ptr.h" 18 #include "webrtc/base/scoped_ref_ptr.h"
19 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
20 #include "webrtc/call/bitrate_allocator.h" 20 #include "webrtc/call/bitrate_allocator.h"
21 #include "webrtc/common_types.h" 21 #include "webrtc/common_types.h"
22 #include "webrtc/frame_callback.h" 22 #include "webrtc/frame_callback.h"
23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
24 #include "webrtc/modules/video_coding/include/video_coding_defines.h" 24 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
25 #include "webrtc/modules/video_processing/include/video_processing.h" 25 #include "webrtc/modules/video_processing/include/video_processing.h"
26 #include "webrtc/typedefs.h" 26 #include "webrtc/typedefs.h"
27 #include "webrtc/video/video_capture_input.h" 27 #include "webrtc/video/video_capture_input.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 int64_t round_trip_time_ms); 132 int64_t round_trip_time_ms);
133 133
134 private: 134 private:
135 bool EncoderPaused() const EXCLUSIVE_LOCKS_REQUIRED(data_cs_); 135 bool EncoderPaused() const EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
136 void TraceFrameDropStart() EXCLUSIVE_LOCKS_REQUIRED(data_cs_); 136 void TraceFrameDropStart() EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
137 void TraceFrameDropEnd() EXCLUSIVE_LOCKS_REQUIRED(data_cs_); 137 void TraceFrameDropEnd() EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
138 138
139 const uint32_t number_of_cores_; 139 const uint32_t number_of_cores_;
140 const std::vector<uint32_t> ssrcs_; 140 const std::vector<uint32_t> ssrcs_;
141 141
142 const rtc::scoped_ptr<VideoProcessing> vp_; 142 const std::unique_ptr<VideoProcessing> vp_;
143 const rtc::scoped_ptr<QMVideoSettingsCallback> qm_callback_; 143 const std::unique_ptr<QMVideoSettingsCallback> qm_callback_;
144 const rtc::scoped_ptr<VideoCodingModule> vcm_; 144 const std::unique_ptr<VideoCodingModule> vcm_;
145 145
146 rtc::CriticalSection data_cs_; 146 rtc::CriticalSection data_cs_;
147 rtc::scoped_ptr<BitrateObserver> bitrate_observer_; 147 std::unique_ptr<BitrateObserver> bitrate_observer_;
148 148
149 SendStatisticsProxy* const stats_proxy_; 149 SendStatisticsProxy* const stats_proxy_;
150 I420FrameCallback* const pre_encode_callback_; 150 I420FrameCallback* const pre_encode_callback_;
151 OveruseFrameDetector* const overuse_detector_; 151 OveruseFrameDetector* const overuse_detector_;
152 PacedSender* const pacer_; 152 PacedSender* const pacer_;
153 PayloadRouter* const send_payload_router_; 153 PayloadRouter* const send_payload_router_;
154 BitrateAllocator* const bitrate_allocator_; 154 BitrateAllocator* const bitrate_allocator_;
155 155
156 // The time we last received an input frame or encoded frame. This is used to 156 // The time we last received an input frame or encoded frame. This is used to
157 // track when video is stopped long enough that we also want to stop sending 157 // track when video is stopped long enough that we also want to stop sending
(...skipping 13 matching lines...) Expand all
171 uint8_t picture_id_sli_ GUARDED_BY(data_cs_); 171 uint8_t picture_id_sli_ GUARDED_BY(data_cs_);
172 bool has_received_rpsi_ GUARDED_BY(data_cs_); 172 bool has_received_rpsi_ GUARDED_BY(data_cs_);
173 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); 173 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
174 174
175 bool video_suspended_ GUARDED_BY(data_cs_); 175 bool video_suspended_ GUARDED_BY(data_cs_);
176 }; 176 };
177 177
178 } // namespace webrtc 178 } // namespace webrtc
179 179
180 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_ 180 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_
OLDNEW
« no previous file with comments | « webrtc/video/vie_channel.h ('k') | webrtc/video/vie_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698