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

Side by Side Diff: webrtc/api/objc/RTCVideoTrack.mm

Issue 1817473002: Delete VideoRendererInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 9 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
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 NSParameterAssert(nativeMediaTrack); 45 NSParameterAssert(nativeMediaTrack);
46 NSParameterAssert(type == RTCMediaStreamTrackTypeVideo); 46 NSParameterAssert(type == RTCMediaStreamTrackTypeVideo);
47 if (self = [super initWithNativeTrack:nativeMediaTrack type:type]) { 47 if (self = [super initWithNativeTrack:nativeMediaTrack type:type]) {
48 _adapters = [NSMutableArray array]; 48 _adapters = [NSMutableArray array];
49 } 49 }
50 return self; 50 return self;
51 } 51 }
52 52
53 - (void)dealloc { 53 - (void)dealloc {
54 for (RTCVideoRendererAdapter *adapter in _adapters) { 54 for (RTCVideoRendererAdapter *adapter in _adapters) {
55 self.nativeVideoTrack->RemoveRenderer(adapter.nativeVideoRenderer); 55 self.nativeVideoTrack->RemoveSink(adapter.nativeVideoRenderer);
56 } 56 }
57 } 57 }
58 58
59 - (RTCVideoSource *)source { 59 - (RTCVideoSource *)source {
60 if (!_source) { 60 if (!_source) {
61 rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> source = 61 rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> source =
62 self.nativeVideoTrack->GetSource(); 62 self.nativeVideoTrack->GetSource();
63 if (source) { 63 if (source) {
64 _source = [[RTCVideoSource alloc] initWithNativeVideoSource:source.get()]; 64 _source = [[RTCVideoSource alloc] initWithNativeVideoSource:source.get()];
65 } 65 }
66 } 66 }
67 return _source; 67 return _source;
68 } 68 }
69 69
70 - (void)addRenderer:(id<RTCVideoRenderer>)renderer { 70 - (void)addRenderer:(id<RTCVideoRenderer>)renderer {
71 // Make sure we don't have this renderer yet. 71 // Make sure we don't have this renderer yet.
72 for (RTCVideoRendererAdapter *adapter in _adapters) { 72 for (RTCVideoRendererAdapter *adapter in _adapters) {
73 // Getting around unused variable error 73 // Getting around unused variable error
74 if (adapter.videoRenderer != renderer) { 74 if (adapter.videoRenderer != renderer) {
75 NSAssert(NO, @"|renderer| is already attached to this track"); 75 NSAssert(NO, @"|renderer| is already attached to this track");
76 } 76 }
77 } 77 }
78 // Create a wrapper that provides a native pointer for us. 78 // Create a wrapper that provides a native pointer for us.
79 RTCVideoRendererAdapter* adapter = 79 RTCVideoRendererAdapter* adapter =
80 [[RTCVideoRendererAdapter alloc] initWithNativeRenderer:renderer]; 80 [[RTCVideoRendererAdapter alloc] initWithNativeRenderer:renderer];
81 [_adapters addObject:adapter]; 81 [_adapters addObject:adapter];
82 self.nativeVideoTrack->AddRenderer(adapter.nativeVideoRenderer); 82 self.nativeVideoTrack->AddOrUpdateSink(adapter.nativeVideoRenderer,
83 rtc::VideoSinkWants());
83 } 84 }
84 85
85 - (void)removeRenderer:(id<RTCVideoRenderer>)renderer { 86 - (void)removeRenderer:(id<RTCVideoRenderer>)renderer {
86 __block NSUInteger indexToRemove = NSNotFound; 87 __block NSUInteger indexToRemove = NSNotFound;
87 [_adapters enumerateObjectsUsingBlock:^(RTCVideoRendererAdapter *adapter, 88 [_adapters enumerateObjectsUsingBlock:^(RTCVideoRendererAdapter *adapter,
88 NSUInteger idx, 89 NSUInteger idx,
89 BOOL *stop) { 90 BOOL *stop) {
90 if (adapter.videoRenderer == renderer) { 91 if (adapter.videoRenderer == renderer) {
91 indexToRemove = idx; 92 indexToRemove = idx;
92 *stop = YES; 93 *stop = YES;
93 } 94 }
94 }]; 95 }];
95 if (indexToRemove == NSNotFound) { 96 if (indexToRemove == NSNotFound) {
96 return; 97 return;
97 } 98 }
98 RTCVideoRendererAdapter *adapterToRemove = 99 RTCVideoRendererAdapter *adapterToRemove =
99 [_adapters objectAtIndex:indexToRemove]; 100 [_adapters objectAtIndex:indexToRemove];
100 self.nativeVideoTrack->RemoveRenderer(adapterToRemove.nativeVideoRenderer); 101 self.nativeVideoTrack->RemoveSink(adapterToRemove.nativeVideoRenderer);
101 [_adapters removeObjectAtIndex:indexToRemove]; 102 [_adapters removeObjectAtIndex:indexToRemove];
102 } 103 }
103 104
104 #pragma mark - Private 105 #pragma mark - Private
105 106
106 - (rtc::scoped_refptr<webrtc::VideoTrackInterface>)nativeVideoTrack { 107 - (rtc::scoped_refptr<webrtc::VideoTrackInterface>)nativeVideoTrack {
107 return static_cast<webrtc::VideoTrackInterface *>(self.nativeTrack.get()); 108 return static_cast<webrtc::VideoTrackInterface *>(self.nativeTrack.get());
108 } 109 }
109 110
110 @end 111 @end
OLDNEW
« no previous file with comments | « webrtc/api/objc/RTCVideoRendererAdapter+Private.h ('k') | webrtc/api/test/fakevideotrackrenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698