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

Side by Side Diff: media/cast/sender/video_encoder_impl.h

Issue 1905763002: Convert //media/cast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « media/cast/sender/video_encoder.cc ('k') | media/cast/sender/video_encoder_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_ 5 #ifndef MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
6 #define MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_ 6 #define MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "media/cast/cast_config.h" 11 #include "media/cast/cast_config.h"
11 #include "media/cast/cast_environment.h" 12 #include "media/cast/cast_environment.h"
12 #include "media/cast/sender/software_video_encoder.h" 13 #include "media/cast/sender/software_video_encoder.h"
13 #include "media/cast/sender/video_encoder.h" 14 #include "media/cast/sender/video_encoder.h"
14 15
15 namespace media { 16 namespace media {
16 class VideoFrame; 17 class VideoFrame;
17 18
18 namespace cast { 19 namespace cast {
19 20
(...skipping 24 matching lines...) Expand all
44 void GenerateKeyFrame() final; 45 void GenerateKeyFrame() final;
45 46
46 private: 47 private:
47 scoped_refptr<CastEnvironment> cast_environment_; 48 scoped_refptr<CastEnvironment> cast_environment_;
48 CodecDynamicConfig dynamic_config_; 49 CodecDynamicConfig dynamic_config_;
49 50
50 // This member belongs to the video encoder thread. It must not be 51 // This member belongs to the video encoder thread. It must not be
51 // dereferenced on the main thread. We manage the lifetime of this member 52 // dereferenced on the main thread. We manage the lifetime of this member
52 // manually because it needs to be initialize, used and destroyed on the 53 // manually because it needs to be initialize, used and destroyed on the
53 // video encoder thread and video encoder thread can out-live the main thread. 54 // video encoder thread and video encoder thread can out-live the main thread.
54 scoped_ptr<SoftwareVideoEncoder> encoder_; 55 std::unique_ptr<SoftwareVideoEncoder> encoder_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(VideoEncoderImpl); 57 DISALLOW_COPY_AND_ASSIGN(VideoEncoderImpl);
57 }; 58 };
58 59
59 } // namespace cast 60 } // namespace cast
60 } // namespace media 61 } // namespace media
61 62
62 #endif // MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_ 63 #endif // MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
OLDNEW
« no previous file with comments | « media/cast/sender/video_encoder.cc ('k') | media/cast/sender/video_encoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698