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

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm

Issue 1937693002: Replace scoped_ptr with unique_ptr everywhere (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@unique5
Patch Set: Created 4 years, 7 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 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 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 #import "RTCVideoFrame+Private.h" 11 #import "RTCVideoFrame+Private.h"
12 12
13 #include "webrtc/base/scoped_ptr.h" 13 #include <memory>
14 14
15 @implementation RTCVideoFrame { 15 @implementation RTCVideoFrame {
16 rtc::scoped_ptr<cricket::VideoFrame> _videoFrame; 16 std::unique_ptr<cricket::VideoFrame> _videoFrame;
17 rtc::scoped_refptr<webrtc::VideoFrameBuffer> _i420Buffer; 17 rtc::scoped_refptr<webrtc::VideoFrameBuffer> _i420Buffer;
18 } 18 }
19 19
20 - (size_t)width { 20 - (size_t)width {
21 return _videoFrame->width(); 21 return _videoFrame->width();
22 } 22 }
23 23
24 - (size_t)height { 24 - (size_t)height {
25 return _videoFrame->height(); 25 return _videoFrame->height();
26 } 26 }
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 } 108 }
109 return self; 109 return self;
110 } 110 }
111 111
112 - (rtc::scoped_refptr<webrtc::VideoFrameBuffer>)i420Buffer { 112 - (rtc::scoped_refptr<webrtc::VideoFrameBuffer>)i420Buffer {
113 [self convertBufferIfNeeded]; 113 [self convertBufferIfNeeded];
114 return _i420Buffer; 114 return _i420Buffer;
115 } 115 }
116 116
117 @end 117 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698