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

Side by Side Diff: webrtc/modules/video_coding/codec_database.h

Issue 1721353002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.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_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_
12 #define WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ 12 #define WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_
13 13
14 #include <map> 14 #include <map>
15 #include <memory>
15 16
16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 17 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
18 #include "webrtc/modules/video_coding/include/video_coding.h" 18 #include "webrtc/modules/video_coding/include/video_coding.h"
19 #include "webrtc/modules/video_coding/generic_decoder.h" 19 #include "webrtc/modules/video_coding/generic_decoder.h"
20 #include "webrtc/modules/video_coding/generic_encoder.h" 20 #include "webrtc/modules/video_coding/generic_encoder.h"
21 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 struct VCMDecoderMapItem { 25 struct VCMDecoderMapItem {
26 public: 26 public:
27 VCMDecoderMapItem(VideoCodec* settings, 27 VCMDecoderMapItem(VideoCodec* settings,
28 int number_of_cores, 28 int number_of_cores,
29 bool require_key_frame); 29 bool require_key_frame);
30 30
31 rtc::scoped_ptr<VideoCodec> settings; 31 std::unique_ptr<VideoCodec> settings;
32 int number_of_cores; 32 int number_of_cores;
33 bool require_key_frame; 33 bool require_key_frame;
34 }; 34 };
35 35
36 struct VCMExtDecoderMapItem { 36 struct VCMExtDecoderMapItem {
37 public: 37 public:
38 VCMExtDecoderMapItem(VideoDecoder* external_decoder_instance, 38 VCMExtDecoderMapItem(VideoDecoder* external_decoder_instance,
39 uint8_t payload_type); 39 uint8_t payload_type);
40 40
41 uint8_t payload_type; 41 uint8_t payload_type;
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 size_t max_payload_size_; 149 size_t max_payload_size_;
150 bool periodic_key_frames_; 150 bool periodic_key_frames_;
151 bool pending_encoder_reset_; 151 bool pending_encoder_reset_;
152 VideoCodec send_codec_; 152 VideoCodec send_codec_;
153 VideoCodec receive_codec_; 153 VideoCodec receive_codec_;
154 uint8_t encoder_payload_type_; 154 uint8_t encoder_payload_type_;
155 VideoEncoder* external_encoder_; 155 VideoEncoder* external_encoder_;
156 bool internal_source_; 156 bool internal_source_;
157 VideoEncoderRateObserver* const encoder_rate_observer_; 157 VideoEncoderRateObserver* const encoder_rate_observer_;
158 VCMEncodedFrameCallback* const encoded_frame_callback_; 158 VCMEncodedFrameCallback* const encoded_frame_callback_;
159 rtc::scoped_ptr<VCMGenericEncoder> ptr_encoder_; 159 std::unique_ptr<VCMGenericEncoder> ptr_encoder_;
160 VCMGenericDecoder* ptr_decoder_; 160 VCMGenericDecoder* ptr_decoder_;
161 DecoderMap dec_map_; 161 DecoderMap dec_map_;
162 ExternalDecoderMap dec_external_map_; 162 ExternalDecoderMap dec_external_map_;
163 }; // VCMCodecDataBase 163 }; // VCMCodecDataBase
164 164
165 } // namespace webrtc 165 } // namespace webrtc
166 166
167 #endif // WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ 167 #endif // WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698