Update API for Objective-C RTCAudioTrack and RTCVideoTrack.

webrtc/api/objc/RTCMediaStreamTrack.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.
  */
 
 #import "RTCMediaStreamTrack.h"
 
 #import "webrtc/api/objc/RTCMediaStreamTrack+Private.h"
 #import "webrtc/base/objc/NSString+StdString.h"
 
 @implementation RTCMediaStreamTrack {
-  rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> _nativeTrack;
+  rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> _nativeAudioTrack;
+  rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> _nativeVideoTrack;
+  RTCMediaStreamTrackType _type;
 }
 
 - (NSString *)kind {
-  return [NSString stringForStdString:_nativeTrack->kind()];
+  return [NSString stringForStdString:self.nativeMediaTrack->kind()];
 }
 
 - (NSString *)trackId {
-  return [NSString stringForStdString:_nativeTrack->id()];
+  return [NSString stringForStdString:self.nativeMediaTrack->id()];
 }
 
 - (BOOL)isEnabled {
-  return _nativeTrack->enabled();
+  return self.nativeMediaTrack->enabled();
 }
 
 - (void)setIsEnabled:(BOOL)isEnabled {
-  _nativeTrack->set_enabled(isEnabled);
+  self.nativeMediaTrack->set_enabled(isEnabled);
 }
 
 - (RTCMediaStreamTrackState)readyState {
-  return [[self class] trackStateForNativeState:_nativeTrack->state()];
+  return [[self class] trackStateForNativeState:self.nativeMediaTrack->state()];
 }
 
 - (NSString *)description {
   NSString *readyState = [[self class] stringForState:self.readyState];
   return [NSString stringWithFormat:@"RTCMediaStreamTrack:\n%@\n%@\n%@\n%@",
                                     self.kind,
                                     self.trackId,
                                     self.isEnabled ? @"enabled" : @"disabled",
                                     readyState];
 }
 
 #pragma mark - Private
 
-- (rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeTrack {
-  return _nativeTrack;
+- (rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeMediaTrack {
+  switch (_type) {
+    case RTCMediaStreamTrackTypeAudio:
+      return _nativeAudioTrack;
+    case RTCMediaStreamTrackTypeVideo:
+      return _nativeVideoTrack;
+  }
 }
 
-- (instancetype)initWithNativeTrack:
-    (rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeTrack {
-  NSParameterAssert(nativeTrack);
+- (rtc::scoped_refptr<webrtc::AudioTrackInterface>)nativeAudioTrack {
+  return static_cast<webrtc::AudioTrackInterface *>(_nativeAudioTrack.get());

[tkchin_webrtc, 2016/01/21 01:23:30]

If we're static casting on the getter, might as well just not store it in
separate ivars and keep it in just _nativeMediaTrack. At which point, you might
as well move nativeAudioTrack to RTCAudioTrack instead and assert on the type.

So we keep the added type in the ctor, but otherwise keep things the way they
were.

[hjon, 2016/01/21 19:53:27]

This should be taken care of.

+}
+
+- (rtc::scoped_refptr<webrtc::VideoTrackInterface>)nativeVideoTrack {
+  return static_cast<webrtc::VideoTrackInterface *>(_nativeVideoTrack.get());
+}
+
+- (instancetype)initWithNativeMediaTrack:
+    (rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeMediaTrack
+                                    type:(RTCMediaStreamTrackType)type {
+  NSParameterAssert(nativeMediaTrack);
   if (self = [super init]) {
-    _nativeTrack = nativeTrack;
+    switch (_type) {
+      case RTCMediaStreamTrackTypeAudio:
+        _nativeAudioTrack = nativeMediaTrack;
+      case RTCMediaStreamTrackTypeVideo:
+        _nativeVideoTrack = nativeMediaTrack;
+    }
+    _type = type;
   }
   return self;
 }
 
 + (webrtc::MediaStreamTrackInterface::TrackState)nativeTrackStateForState:
     (RTCMediaStreamTrackState)state {
   switch (state) {
     case RTCMediaStreamTrackStateInitializing:
       return webrtc::MediaStreamTrackInterface::kInitializing;
     case RTCMediaStreamTrackStateLive:
@@ skipping 26 matching lines @@
     case RTCMediaStreamTrackStateLive:
       return @"Live";
     case RTCMediaStreamTrackStateEnded:
       return @"Ended";
     case RTCMediaStreamTrackStateFailed:
       return @"Failed";
   }
 }
 
 @end