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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/codec_database.h
diff --git a/webrtc/modules/video_coding/codec_database.h b/webrtc/modules/video_coding/codec_database.h
index 62ec30a46eed2bf7f5dca77373eaeded29d20713..4ba72f7b36ef8339da06e1388dc989466584003e 100644
--- a/webrtc/modules/video_coding/codec_database.h
+++ b/webrtc/modules/video_coding/codec_database.h
@@ -12,8 +12,8 @@
#define WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_
#include <map>
+#include <memory>
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
#include "webrtc/modules/video_coding/generic_decoder.h"
@@ -28,7 +28,7 @@ struct VCMDecoderMapItem {
int number_of_cores,
bool require_key_frame);
- rtc::scoped_ptr<VideoCodec> settings;
+ std::unique_ptr<VideoCodec> settings;
int number_of_cores;
bool require_key_frame;
};
@@ -156,7 +156,7 @@ class VCMCodecDataBase {
bool internal_source_;
VideoEncoderRateObserver* const encoder_rate_observer_;
VCMEncodedFrameCallback* const encoded_frame_callback_;
- rtc::scoped_ptr<VCMGenericEncoder> ptr_encoder_;
+ std::unique_ptr<VCMGenericEncoder> ptr_encoder_;
VCMGenericDecoder* ptr_decoder_;
DecoderMap dec_map_;
ExternalDecoderMap dec_external_map_;
« 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