Add the OnAddTrack callback for Objective-C wrapper.

webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.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 109 matching lines @@
     PeerConnectionInterface::SignalingState new_state) {
   RTCSignalingState state =
       [[RTCPeerConnection class] signalingStateForNativeState:new_state];
   RTCPeerConnection *peer_connection = peer_connection_;
   [peer_connection.delegate peerConnection:peer_connection
                    didChangeSignalingState:state];
 }
 
 void PeerConnectionDelegateAdapter::OnAddStream(
     rtc::scoped_refptr<MediaStreamInterface> stream) {
-  RTCMediaStream *mediaStream =
-      [[RTCMediaStream alloc] initWithNativeMediaStream:stream];
   RTCPeerConnection *peer_connection = peer_connection_;
+  RTCMediaStream *mediaStream = [peer_connection getOrCreateObjcStream:stream];
   [peer_connection.delegate peerConnection:peer_connection
                               didAddStream:mediaStream];
 }
 
 void PeerConnectionDelegateAdapter::OnRemoveStream(
     rtc::scoped_refptr<MediaStreamInterface> stream) {
   RTCMediaStream *mediaStream =
       [[RTCMediaStream alloc] initWithNativeMediaStream:stream];
   RTCPeerConnection *peer_connection = peer_connection_;
   [peer_connection.delegate peerConnection:peer_connection
                            didRemoveStream:mediaStream];
+  [peer_connection removeObjcStream:stream];
 }
 
 void PeerConnectionDelegateAdapter::OnDataChannel(
     rtc::scoped_refptr<DataChannelInterface> data_channel) {
   RTCDataChannel *dataChannel =
       [[RTCDataChannel alloc] initWithNativeDataChannel:data_channel];
   RTCPeerConnection *peer_connection = peer_connection_;
   [peer_connection.delegate peerConnection:peer_connection
                         didOpenDataChannel:dataChannel];
 }
@@ skipping 39 matching lines @@
         new JsepIceCandidate(candidate.transport_name(), -1, candidate));
     RTCIceCandidate* ice_candidate = [[RTCIceCandidate alloc]
         initWithNativeCandidate:candidate_wrapper.get()];
     [ice_candidates addObject:ice_candidate];
   }
   RTCPeerConnection* peer_connection = peer_connection_;
   [peer_connection.delegate peerConnection:peer_connection
                     didRemoveIceCandidates:ice_candidates];
 }
 
+void PeerConnectionDelegateAdapter::OnAddTrack(

[tkchin_webrtc, 2017/02/15 23:43:48]

strange that the method is OnAddTrack but it gives you a RtpReceiver
is this temporary or permanent? What's in the w3c spec?

[Taylor Brandstetter, 2017/02/16 01:07:06]

That's what's in the spec (it's called "ontrack" there). Yes, OnAddTrack gives
you an RtpReceiver, and RemoveTrack takes an RtpSender. Strange world we've come
to. :)

+    rtc::scoped_refptr<RtpReceiverInterface> receiver,
+    const std::vector<rtc::scoped_refptr<MediaStreamInterface>>& streams) {
+  RTCRtpReceiver *rtpReceiver =

[tkchin_webrtc, 2017/02/15 23:43:47]

use C++ style in C++ methods

[Zhi Huang, 2017/02/21 04:55:50]

Done.

+      [[RTCRtpReceiver alloc] initWithNativeRtpReceiver:receiver];
+  NSMutableArray *mediaStreams =
+      [NSMutableArray arrayWithCapacity:streams.size()];
+
+  RTCPeerConnection *peer_connection = peer_connection_;
+  for (const auto stream : streams) {
+    RTCMediaStream *mediaStream =
+        [peer_connection getOrCreateObjcStream:stream];
+    [mediaStreams addObject:mediaStream];
+  }
+  [peer_connection.delegate peerConnection:peer_connection
+                               didAddTrack:rtpReceiver

[tkchin_webrtc, 2017/02/15 23:43:48]

ObjC naming usually follows type (so I'd expect
peerConnection:didAddRtpReceiver:streams:).
But if spec is that the method name is track but the type is rtpreceiver then
we'll do that. attachedStreams->streams though

[Zhi Huang, 2017/02/21 04:55:50]

Done.

+                           attachedStreams:mediaStreams];
+}
+
 }  // namespace webrtc
 
 
 @implementation RTCPeerConnection {
   NSMutableArray<RTCMediaStream *> *_localStreams;
   std::unique_ptr<webrtc::PeerConnectionDelegateAdapter> _observer;
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> _peerConnection;
   std::unique_ptr<webrtc::MediaConstraints> _nativeConstraints;
   BOOL _hasStartedRtcEventLog;
+  NSMutableDictionary *_nativeToObjcMediaStream;

[tkchin_webrtc, 2017/02/15 23:43:48]

NSMutableDictionary<NSNumber, RTCMediaStream *> *_mediaStreamsByStreamId;

[Zhi Huang, 2017/02/21 04:55:50]

Done.

 }
 
 @synthesize delegate = _delegate;
 
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
                   configuration:(RTCConfiguration *)configuration
                     constraints:(RTCMediaConstraints *)constraints
                        delegate:(id<RTCPeerConnectionDelegate>)delegate {
   NSParameterAssert(factory);
   std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config(
       [configuration createNativeConfiguration]);
   if (!config) {
     return nil;
   }
   if (self = [super init]) {
     _observer.reset(new webrtc::PeerConnectionDelegateAdapter(self));
     _nativeConstraints = constraints.nativeConstraints;
     CopyConstraintsIntoRtcConfiguration(_nativeConstraints.get(),
                                         config.get());
     _peerConnection =
         factory.nativeFactory->CreatePeerConnection(*config,
                                                     nullptr,
                                                     nullptr,
                                                     _observer.get());
     if (!_peerConnection) {
       return nil;
     }
     _localStreams = [[NSMutableArray alloc] init];
     _delegate = delegate;
+    _nativeToObjcMediaStream = [NSMutableDictionary dictionary];
   }
   return self;
 }
 
 - (NSArray<RTCMediaStream *> *)localStreams {
   return [_localStreams copy];
 }
 
 - (RTCSessionDescription *)localDescription {
   const webrtc::SessionDescriptionInterface *description =
@@ skipping 330 matching lines @@
 + (webrtc::PeerConnectionInterface::StatsOutputLevel)
     nativeStatsOutputLevelForLevel:(RTCStatsOutputLevel)level {
   switch (level) {
     case RTCStatsOutputLevelStandard:
       return webrtc::PeerConnectionInterface::kStatsOutputLevelStandard;
     case RTCStatsOutputLevelDebug:
       return webrtc::PeerConnectionInterface::kStatsOutputLevelDebug;
   }
 }
 
+- (RTCMediaStream *)getOrCreateObjcStream:

[tkchin_webrtc, 2017/02/15 23:43:48]

"get" prefix is forbidden in ObjC style

- (RTCMediaStream
*)mediaStreamForNativeStream:(rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream
{

}

[Zhi Huang, 2017/02/21 04:55:50]

Done.

+    (rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream {
+  RTCMediaStream *mediaStream =
+      _nativeToObjcMediaStream[[NSNumber numberWithLong:(long)stream.get()]];

[tkchin_webrtc, 2017/02/15 23:43:48]

Is there anything better than pointer value to use as a key here?

use @((long)stream.get());

[Taylor Brandstetter, 2017/02/16 01:07:06]

They have an ID field which should be unique within a PeerConnection at any
given time.

+  if (!mediaStream) {
+    mediaStream =
+        [[RTCMediaStream alloc] initWithNativeMediaStream:stream.get()];
+    _nativeToObjcMediaStream[[NSNumber numberWithLong:(long)stream.get()]] =
+        mediaStream;
+  }
+  return mediaStream;
+}
+
+- (void)removeObjcStream:(rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream {

[tkchin_webrtc, 2017/02/15 23:43:47]

nit:
-
(void)removeNativeMediaStream:(rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream);

[Zhi Huang, 2017/02/21 04:55:50]

Done.

+  [_nativeToObjcMediaStream removeObjectForKey:[NSNumber numberWithLong:(long)stream.get()]];
+}
+
 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection {
   return _peerConnection;
 }
 
 @end