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

Side by Side Diff: webrtc/video_encoder.h

Issue 1749103003: Replace scoped_ptr with unique_ptr in webrtc/common_video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up6
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_decoder.h ('k') | no next file » | 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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_ENCODER_H_ 11 #ifndef WEBRTC_VIDEO_ENCODER_H_
12 #define WEBRTC_VIDEO_ENCODER_H_ 12 #define WEBRTC_VIDEO_ENCODER_H_
13 13
14 #include <memory>
14 #include <string> 15 #include <string>
15 #include <vector> 16 #include <vector>
16 17
17 #include "webrtc/common_types.h" 18 #include "webrtc/common_types.h"
18 #include "webrtc/typedefs.h" 19 #include "webrtc/typedefs.h"
19 #include "webrtc/video_frame.h" 20 #include "webrtc/video_frame.h"
20 21
21 namespace webrtc { 22 namespace webrtc {
22 23
23 class RTPFragmentationHeader; 24 class RTPFragmentationHeader;
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 uint32_t framerate_; 171 uint32_t framerate_;
171 172
172 // The last channel parameters set, and a flag for noting they are set. 173 // The last channel parameters set, and a flag for noting they are set.
173 bool channel_parameters_set_; 174 bool channel_parameters_set_;
174 uint32_t packet_loss_; 175 uint32_t packet_loss_;
175 int64_t rtt_; 176 int64_t rtt_;
176 177
177 const EncoderType encoder_type_; 178 const EncoderType encoder_type_;
178 webrtc::VideoEncoder* const encoder_; 179 webrtc::VideoEncoder* const encoder_;
179 180
180 rtc::scoped_ptr<webrtc::VideoEncoder> fallback_encoder_; 181 std::unique_ptr<webrtc::VideoEncoder> fallback_encoder_;
181 std::string fallback_implementation_name_; 182 std::string fallback_implementation_name_;
182 EncodedImageCallback* callback_; 183 EncodedImageCallback* callback_;
183 }; 184 };
184 } // namespace webrtc 185 } // namespace webrtc
185 #endif // WEBRTC_VIDEO_ENCODER_H_ 186 #endif // WEBRTC_VIDEO_ENCODER_H_
OLDNEW
« no previous file with comments | « webrtc/video_decoder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698