Tweaks for new Objective-C API.

webrtc/api/objc/RTCVideoTrack.mm

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
                          source:(RTCVideoSource *)source
                         trackId:(NSString *)trackId {
   NSParameterAssert(factory);
   NSParameterAssert(source);
   NSParameterAssert(trackId.length);
   std::string nativeId = [NSString stdStringForString:trackId];
   rtc::scoped_refptr<webrtc::VideoTrackInterface> track =
       factory.nativeFactory->CreateVideoTrack(nativeId,
                                               source.nativeVideoSource);
-  return [self initWithNativeTrack:track type:RTCMediaStreamTrackTypeVideo];
+  if ([self initWithNativeTrack:track type:RTCMediaStreamTrackTypeVideo]) {
+    _source = source;
+  }
+  return self;
 }
 
-- (instancetype)initWithNativeMediaTrack:
+- (instancetype)initWithNativeTrack:
     (rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeMediaTrack
-                                    type:(RTCMediaStreamTrackType)type {
+                               type:(RTCMediaStreamTrackType)type {
   NSParameterAssert(nativeMediaTrack);
   NSParameterAssert(type == RTCMediaStreamTrackTypeVideo);
   if (self = [super initWithNativeTrack:nativeMediaTrack type:type]) {
     _adapters = [NSMutableArray array];
-    rtc::scoped_refptr<webrtc::VideoSourceInterface> source =
-        self.nativeVideoTrack->GetSource();
-    if (source) {
-      _source = [[RTCVideoSource alloc] initWithNativeVideoSource:source.get()];
-    }
   }
   return self;
 }
 
 - (void)dealloc {
   for (RTCVideoRendererAdapter *adapter in _adapters) {
     self.nativeVideoTrack->RemoveRenderer(adapter.nativeVideoRenderer);
   }
 }
 
+- (RTCVideoSource *)source {
+  if (!_source) {
+    rtc::scoped_refptr<webrtc::VideoSourceInterface> source =
+        self.nativeVideoTrack->GetSource();
+    if (source) {
+      _source = [[RTCVideoSource alloc] initWithNativeVideoSource:source.get()];
+    }
+  }
+  return _source;
+}
+
 - (void)addRenderer:(id<RTCVideoRenderer>)renderer {
   // Make sure we don't have this renderer yet.
   for (RTCVideoRendererAdapter *adapter in _adapters) {
     // Getting around unused variable error
     if (adapter.videoRenderer != renderer) {
       NSAssert(NO, @"|renderer| is already attached to this track");
     }
   }
   // Create a wrapper that provides a native pointer for us.
   RTCVideoRendererAdapter* adapter =
       [[RTCVideoRendererAdapter alloc] initWithNativeRenderer:renderer];
   [_adapters addObject:adapter];
   self.nativeVideoTrack->AddRenderer(adapter.nativeVideoRenderer);
 }
 
 - (void)removeRenderer:(id<RTCVideoRenderer>)renderer {
-  RTCVideoRendererAdapter *adapter;
+  __block RTCVideoRendererAdapter *adapterToRemove;
   __block NSUInteger indexToRemove = NSNotFound;
   [_adapters enumerateObjectsUsingBlock:^(RTCVideoRendererAdapter *adapter,
                                           NSUInteger idx,
                                           BOOL *stop) {
     if (adapter.videoRenderer == renderer) {
+      adapterToRemove = adapter;
       indexToRemove = idx;
       *stop = YES;
     }
   }];
   if (indexToRemove == NSNotFound) {
     return;
   }
-  self.nativeVideoTrack->RemoveRenderer(adapter.nativeVideoRenderer);
+  self.nativeVideoTrack->RemoveRenderer(adapterToRemove.nativeVideoRenderer);

[tkchin_webrtc, 2016/02/20 00:17:32]

grab the adapter based on the index since we're already tracking that

[hjon_webrtc, 2016/02/22 23:03:06]

Done.

   [_adapters removeObjectAtIndex:indexToRemove];
 }
 
 #pragma mark - Private
 
 - (rtc::scoped_refptr<webrtc::VideoTrackInterface>)nativeVideoTrack {
   return static_cast<webrtc::VideoTrackInterface *>(self.nativeTrack.get());
 }
 
 @end