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

Side by Side Diff: webrtc/media/engine/webrtcvideoframe.h

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
13 13
14 #include <memory>
15
14 #include "webrtc/base/buffer.h" 16 #include "webrtc/base/buffer.h"
15 #include "webrtc/base/refcount.h" 17 #include "webrtc/base/refcount.h"
16 #include "webrtc/base/scoped_ref_ptr.h" 18 #include "webrtc/base/scoped_ref_ptr.h"
17 #include "webrtc/common_types.h" 19 #include "webrtc/common_types.h"
18 #include "webrtc/common_video/include/video_frame_buffer.h" 20 #include "webrtc/common_video/include/video_frame_buffer.h"
19 #include "webrtc/media/base/videoframe.h" 21 #include "webrtc/media/base/videoframe.h"
20 22
21 namespace cricket { 23 namespace cricket {
22 24
23 struct CapturedFrame; 25 struct CapturedFrame;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 VideoFrame* CreateEmptyFrame(int w, int h, 108 VideoFrame* CreateEmptyFrame(int w, int h,
107 int64_t time_stamp_ns) const override; 109 int64_t time_stamp_ns) const override;
108 110
109 // An opaque reference counted handle that stores the pixel data. 111 // An opaque reference counted handle that stores the pixel data.
110 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_; 112 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
111 int64_t time_stamp_ns_; 113 int64_t time_stamp_ns_;
112 webrtc::VideoRotation rotation_; 114 webrtc::VideoRotation rotation_;
113 115
114 // This is mutable as the calculation is expensive but once calculated, it 116 // This is mutable as the calculation is expensive but once calculated, it
115 // remains const. 117 // remains const.
116 mutable rtc::scoped_ptr<VideoFrame> rotated_frame_; 118 mutable std::unique_ptr<VideoFrame> rotated_frame_;
117 }; 119 };
118 120
119 } // namespace cricket 121 } // namespace cricket
120 122
121 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ 123 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2_unittest.cc ('k') | webrtc/media/engine/webrtcvideoframe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698