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

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.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 "RTCVideoRendererAdapter+Private.h" 11 #import "RTCVideoRendererAdapter+Private.h"
12 12
13 #import "RTCVideoFrame+Private.h" 13 #import "RTCVideoFrame+Private.h"
14 14
15 #include <memory>
16
15 #include "webrtc/media/engine/webrtcvideoframe.h" 17 #include "webrtc/media/engine/webrtcvideoframe.h"
16 18
17 namespace webrtc { 19 namespace webrtc {
18 20
19 class VideoRendererAdapter 21 class VideoRendererAdapter
20 : public rtc::VideoSinkInterface<cricket::VideoFrame> { 22 : public rtc::VideoSinkInterface<cricket::VideoFrame> {
21 public: 23 public:
22 VideoRendererAdapter(RTCVideoRendererAdapter* adapter) { 24 VideoRendererAdapter(RTCVideoRendererAdapter* adapter) {
23 adapter_ = adapter; 25 adapter_ = adapter;
24 size_ = CGSizeZero; 26 size_ = CGSizeZero;
(...skipping 28 matching lines...) Expand all
53 [adapter_.videoRenderer renderFrame:videoFrame]; 55 [adapter_.videoRenderer renderFrame:videoFrame];
54 } 56 }
55 57
56 private: 58 private:
57 __weak RTCVideoRendererAdapter *adapter_; 59 __weak RTCVideoRendererAdapter *adapter_;
58 CGSize size_; 60 CGSize size_;
59 }; 61 };
60 } 62 }
61 63
62 @implementation RTCVideoRendererAdapter { 64 @implementation RTCVideoRendererAdapter {
63 rtc::scoped_ptr<webrtc::VideoRendererAdapter> _adapter; 65 std::unique_ptr<webrtc::VideoRendererAdapter> _adapter;
64 } 66 }
65 67
66 @synthesize videoRenderer = _videoRenderer; 68 @synthesize videoRenderer = _videoRenderer;
67 69
68 - (instancetype)initWithNativeRenderer:(id<RTCVideoRenderer>)videoRenderer { 70 - (instancetype)initWithNativeRenderer:(id<RTCVideoRenderer>)videoRenderer {
69 NSParameterAssert(videoRenderer); 71 NSParameterAssert(videoRenderer);
70 if (self = [super init]) { 72 if (self = [super init]) {
71 _videoRenderer = videoRenderer; 73 _videoRenderer = videoRenderer;
72 _adapter.reset(new webrtc::VideoRendererAdapter(self)); 74 _adapter.reset(new webrtc::VideoRendererAdapter(self));
73 } 75 }
74 return self; 76 return self;
75 } 77 }
76 78
77 - (rtc::VideoSinkInterface<cricket::VideoFrame> *)nativeVideoRenderer { 79 - (rtc::VideoSinkInterface<cricket::VideoFrame> *)nativeVideoRenderer {
78 return _adapter.get(); 80 return _adapter.get();
79 } 81 }
80 82
81 @end 83 @end
OLDNEW
« no previous file with comments | « webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm ('k') | webrtc/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698