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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.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
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 11
12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_ 12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_
13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_ 13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_
14 14
15 #include <memory>
15 #include <string> 16 #include <string>
16 #include <vector> 17 #include <vector>
17 18
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" 19 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 class VideoEncoderFactory { 23 class VideoEncoderFactory {
24 public: 24 public:
25 virtual VideoEncoder* Create() = 0; 25 virtual VideoEncoder* Create() = 0;
26 virtual void Destroy(VideoEncoder* encoder) = 0; 26 virtual void Destroy(VideoEncoder* encoder) = 0;
27 virtual ~VideoEncoderFactory() {} 27 virtual ~VideoEncoderFactory() {}
28 }; 28 };
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 // Populate the codec settings for each stream. 103 // Populate the codec settings for each stream.
104 void PopulateStreamCodec(const webrtc::VideoCodec* inst, 104 void PopulateStreamCodec(const webrtc::VideoCodec* inst,
105 int stream_index, 105 int stream_index,
106 size_t total_number_of_streams, 106 size_t total_number_of_streams,
107 bool highest_resolution_stream, 107 bool highest_resolution_stream,
108 webrtc::VideoCodec* stream_codec, 108 webrtc::VideoCodec* stream_codec,
109 bool* send_stream); 109 bool* send_stream);
110 110
111 bool Initialized() const; 111 bool Initialized() const;
112 112
113 rtc::scoped_ptr<VideoEncoderFactory> factory_; 113 std::unique_ptr<VideoEncoderFactory> factory_;
114 rtc::scoped_ptr<TemporalLayersFactory> screensharing_tl_factory_; 114 std::unique_ptr<TemporalLayersFactory> screensharing_tl_factory_;
115 VideoCodec codec_; 115 VideoCodec codec_;
116 std::vector<StreamInfo> streaminfos_; 116 std::vector<StreamInfo> streaminfos_;
117 EncodedImageCallback* encoded_complete_callback_; 117 EncodedImageCallback* encoded_complete_callback_;
118 std::string implementation_name_; 118 std::string implementation_name_;
119 }; 119 };
120 120
121 } // namespace webrtc 121 } // namespace webrtc
122 122
123 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_ 123 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698