Removed libjingle_peerconnection pod; added WebRTC library; added Dat…

…aChannel support (currently not working)

Classes/Room/NBMRoom.h

@@ -52,11 +52,12 @@ typedef NS_ENUM(NSInteger, NBMRoomErrorCode) {
 
 @interface NBMRoom : NSObject
 
-- (instancetype)initWithUsername:(NSString *)username roomName:(NSString *)name roomURL:(NSURL *)url;
+- (instancetype)initWithUsername:(NSString *)username roomName:(NSString *)name roomURL:(NSURL *)url dataChannels:(BOOL)dataChannels;
 
 @property (nonatomic, copy, readonly) NSString *name;
 @property (nonatomic, strong, readonly) NSURL *url;
 @property (nonatomic, copy, readonly) NBMPeer *localPeer;
 @property (nonatomic, strong, readonly) NSSet *peers;
+@property (nonatomic, assign, readonly) BOOL dataChannels;
 
 @end

Classes/Room/NBMRoom.m

@@ -31,7 +31,7 @@ @interface NBMRoom ()
 
 @implementation NBMRoom
 
-- (instancetype)initWithUsername:(NSString *)username roomName:(NSString *)name roomURL:(NSURL *)url {
+- (instancetype)initWithUsername:(NSString *)username roomName:(NSString *)name roomURL:(NSURL *)url dataChannels:(BOOL)dataChannels {
     NSParameterAssert(username);
     NSParameterAssert(name);
     NSParameterAssert(url);
@@ -42,6 +42,7 @@ - (instancetype)initWithUsername:(NSString *)username roomName:(NSString *)name
         _localPeer = [[NBMPeer alloc] initWithId:username];
         _name = name;
         _url = url;
+        _dataChannels = dataChannels;
     }
     return self;
 }

Classes/Room/NBMRoomClient.h

@@ -24,7 +24,7 @@
 
 @class NBMRoom;
 @class NBMPeer;
-@class RTCICECandidate;
+@class RTCIceCandidate;
 @protocol NBMRoomClientDelegate;
 
 /**
@@ -127,6 +127,8 @@ typedef NS_ENUM(NSInteger, NBMRoomClientConnectionState) {
  */
 - (void)joinRoom;
 
+- (void)joinRoomWithDataChannels:(BOOL)dataChannels;
+
 /**
  *  Represents a client's request to join a room. If the room does not exists, it is created.
  *  @note No message is sent to client's delegate.
@@ -135,6 +137,8 @@ typedef NS_ENUM(NSInteger, NBMRoomClientConnectionState) {
  */
 - (void)joinRoom:(void (^)(NSSet *peers, NSError *error))block;
 
+- (void)joinRoom:(void (^)(NSSet *peers, NSError *error))completionBlock dataChannels:(BOOL)dataChannels;
+
 /**
  *  Represent a client's notification that it's leaving the room.
  *  When the request is processed, the [NBMRoomClientDelegate client:didLeaveRoom:] message is sent to the client's delegate.
@@ -226,7 +230,7 @@ typedef NS_ENUM(NSInteger, NBMRoomClientConnectionState) {
  *  @param candidate The RTCICECandidate object to send.
  *  @param peer      The NBMPeer whose ICE candidate was found.
  */
-- (void)sendICECandidate:(RTCICECandidate *)candidate forPeer:(NBMPeer *)peer;
+- (void)sendICECandidate:(RTCIceCandidate *)candidate forPeer:(NBMPeer *)peer;
 
 /**
  *  Request that carries info about an ICE candidate gathered on the client side. This information is required to implement the trickle ICE mechanism.
@@ -236,7 +240,7 @@ typedef NS_ENUM(NSInteger, NBMRoomClientConnectionState) {
  *  @param peer      The NBMPeer whose ICE candidate was found.
  *  @param block     A block object to be executed when the request is processed. This block has no return value and takes an error if the request failed.
  */
-- (void)sendICECandidate:(RTCICECandidate *)candidate forPeer:(NBMPeer *)peer completion:(void (^)(NSError *error))block;
+- (void)sendICECandidate:(RTCIceCandidate *)candidate forPeer:(NBMPeer *)peer completion:(void (^)(NSError *error))block;
 
 /**
  *  Represents a client's request to send written message to all other participants in the room.

Classes/Room/NBMRoomClient.m

@@ -36,7 +36,7 @@
 
 #import "NBMLog.h"
 
-#import <libjingle_peerconnection/RTCICECandidate.h>
+#import <WebRTC/RTCIceCandidate.h>
 
 //CLIENT REQUESTS
 
@@ -53,6 +53,7 @@
 static NSString* const kJoinRoomMethod = @"joinRoom";
 static NSString* const kJoinRoomUserParam = @"user";
 static NSString* const kJoinRoomParam = @"room";
+static NSString* const kJoinDataChannelsParam = @"dataChannels";
 static NSString* const kJoinRoomPeerIdParam = @"id";
 static NSString* const kJoinRoomPeerStreamsParam = @"streams";
 static NSString* const kJoinRoomPeerStramIdParam = @"id";
@@ -204,16 +205,24 @@ - (NBMRoomClientConnectionState)connectionState {
 
 #pragma mark Join room
 
+- (void)joinRoom:(JoinRoomBlock)completionBlock dataChannels:(BOOL)dataChannels {
+    return [self nbm_joinRoom:self.room.name username:self.room.localPeer.identifier dataChannels:dataChannels completion:completionBlock];
+}
+
 - (void)joinRoom:(JoinRoomBlock)completionBlock {
-    return [self nbm_joinRoom:self.room.name username:self.room.localPeer.identifier completion:completionBlock];
+    [self joinRoom:completionBlock dataChannels:NO];
 }
 
-- (void)joinRoom {
+- (void)joinRoomWithDataChannels:(BOOL)dataChannels {
     return [self joinRoom:^(NSSet *peers, NSError *error) {
         if ([self.delegate respondsToSelector:@selector(client:didJoinRoom:)]) {
             [self.delegate client:self didJoinRoom:error];
         }
-    }];
+    } dataChannels:dataChannels];
+}
+
+- (void)joinRoom {
+    [self joinRoomWithDataChannels:NO];
 }
 
 #pragma mark Leave room
@@ -290,15 +299,15 @@ - (void)unsubscribeVideoFromPeer:(NBMPeer *)peer completion:(void (^)(NSString *
 
 #pragma mark Send ICE candidate
 
-- (void)sendICECandidate:(RTCICECandidate *)candidate forPeer:(NBMPeer *)peer {
+- (void)sendICECandidate:(RTCIceCandidate *)candidate forPeer:(NBMPeer *)peer {
     return [self sendICECandidate:candidate forPeer:peer completion:^(NSError *error) {
         if ([self.delegate respondsToSelector:@selector(client:didSentICECandidate:forPeer:)]) {
             [self.delegate client:self didSentICECandidate:error forPeer:peer];
         }
     }];
 }
 
-- (void)sendICECandidate:(RTCICECandidate *)candidate forPeer:(NBMPeer *)peer completion:(void (^)(NSError *))block {
+- (void)sendICECandidate:(RTCIceCandidate *)candidate forPeer:(NBMPeer *)peer completion:(void (^)(NSError *))block {
     [self nbm_sendICECandidate:candidate forPeer:peer completion:block];
 }
 
@@ -342,10 +351,11 @@ - (void)setupRpcClient:(NSTimeInterval)timeout {
 
 #pragma mark Join room
 
-- (void)nbm_joinRoom:(NSString *)roomName username:(NSString *)username completion:(JoinRoomBlock)block {
+- (void)nbm_joinRoom:(NSString *)roomName username:(NSString *)username dataChannels:(BOOL)dataChannels completion:(JoinRoomBlock)block {
     [self.jsonRpcClient sendRequestWithMethod:kJoinRoomMethod
                                    parameters:@{kJoinRoomParam: roomName ?: @"",
-                                                kJoinRoomUserParam: username ?: @""}
+                                                kJoinRoomUserParam: username ?: @"",
+                                                kJoinDataChannelsParam: dataChannels ? @YES : @NO}
                                    completion:^(NBMResponse *response) {
                                        NSError *error;
                                        NSSet *peers = [self peersFromResponse:response error:&error];
@@ -357,9 +367,10 @@ - (void)nbm_joinRoom:(NSString *)roomName username:(NSString *)username completi
                                        if (block) {
                                            block (peers, error);
                                        }
-    }];
+                                   }];
 }
 
+
 - (NSSet *)peersFromResponse:(NBMResponse *)response error:(NSError **)error {
     NSMutableDictionary *peers;
     id result = response.result;
@@ -521,7 +532,7 @@ - (void)nbm_unsubscribeVideoFormPeer:(NBMPeer *)peer completion:(void (^)(NSStri
 
 #pragma mark Send ICE candidate
 
-- (void)nbm_sendICECandidate:(RTCICECandidate *)candidate forPeer:(NBMPeer *)peer completion:(void (^)(NSError *error))block {
+- (void)nbm_sendICECandidate:(RTCIceCandidate *)candidate forPeer:(NBMPeer *)peer completion:(void (^)(NSError *error))block {
     NSDictionary *params = @{kOnIceCandidateEpnameParam: peer.identifier,
                              kOnIceCandidateCandidateParam: candidate.sdp ?: @"",
                              kOnIceCandidateSdpMidParam: candidate.sdpMid ?: @"",
@@ -680,9 +691,9 @@ - (void)iceCandidateReceived:(id)params {
     NSString *sdpMid = [NBMRoomClient element:params getStringPropertyWithName:kIceCandidateSdpMidParam error:&error];
     NSString *sdp = [NBMRoomClient element:params getStringPropertyWithName:kIceCandidateCandidateParam error:&error];
     NSNumber *sdpMLineIndexNumber = [NBMRoomClient element:params getPropertyWithName:kIceCandidateSdpMLineIndex ofClass:[NSNumber class] error:&error];
-    RTCICECandidate *candidate;
+    RTCIceCandidate *candidate;
     if (sdpMid && sdp && sdpMLineIndexNumber) {
-        candidate = [[RTCICECandidate alloc] initWithMid:sdpMid index:sdpMLineIndexNumber.integerValue sdp:sdp];
+        candidate = [[RTCIceCandidate alloc] initWithSdp:sdp sdpMLineIndex:[sdpMLineIndexNumber intValue] sdpMid:sdpMid];
     }
     if ([self.delegate respondsToSelector:@selector(client:didReceiveICECandidate:fromParticipant:)]) {
         [self.delegate client:self didReceiveICECandidate:candidate fromParticipant:peer];

Classes/Room/NBMRoomClientDelegate.h

@@ -58,7 +58,7 @@
 - (void)client:(NBMRoomClient *)client participantPublished:(NBMPeer *)peer;
 - (void)client:(NBMRoomClient *)client participantUnpublished:(NBMPeer *)peer;
 
-- (void)client:(NBMRoomClient *)client didReceiveICECandidate:(RTCICECandidate *)candidate fromParticipant:(NBMPeer *)peer;
+- (void)client:(NBMRoomClient *)client didReceiveICECandidate:(RTCIceCandidate *)candidate fromParticipant:(NBMPeer *)peer;
 
 - (void)client:(NBMRoomClient *)client didReceiveMessage:(NSString *)message fromParticipant:(NBMPeer *)peer;
 - (void)client:(NBMRoomClient *)client mediaErrorOccurred:(NSError *)error;

Classes/Tree/NBMTreeClient.h

@@ -23,7 +23,7 @@
 #import <Foundation/Foundation.h>
 
 @class NBMJSONRPCClient;
-@class RTCICECandidate;
+@class RTCIceCandidate;
 @class NBMTreeEndpoint;
 @protocol NBMTreeClientDelegate;
 
@@ -184,6 +184,6 @@ typedef NS_ENUM(NSInteger, NBMTreeMode) {
  *  @param treeId    Tree id to which belongs this candidate.
  *  @param block     A block object to be executed when the request is processed. This block has no return value and takes an error if the request failed.
  */
-- (void)sendICECandidate:(RTCICECandidate *)candidate forSink:(NSString *)sinkId tree:(NSString *)treeId completion:(void(^)(NSError *error))block;
+- (void)sendICECandidate:(RTCIceCandidate *)candidate forSink:(NSString *)sinkId tree:(NSString *)treeId completion:(void(^)(NSError *error))block;
 
 @end

Classes/Tree/NBMTreeClient.m

@@ -32,7 +32,7 @@
 #import "NBMRequest.h"
 #import "NBMResponse.h"
 
-#import <libjingle_peerconnection/RTCICECandidate.h>
+#import <WebRTC/RTCIceCandidate.h>
 
 static NSString* const kAddICECandidateMethod = @"addIceCandidate";
 static NSString* const kICECandidateEvent = @"iceCandidate";
@@ -180,7 +180,7 @@ - (void)removeSink:(NSString *)sinkId tree:(NSString *)treeId completion:(void (
     }];
 }
 
-- (void)sendICECandidate:(RTCICECandidate *)candidate forSink:(NSString *)sinkId tree:(NSString *)treeId completion:(void (^)(NSError *))block {
+- (void)sendICECandidate:(RTCIceCandidate *)candidate forSink:(NSString *)sinkId tree:(NSString *)treeId completion:(void (^)(NSError *))block {
     NSParameterAssert(candidate);
     NSParameterAssert(treeId);
     return [self nbm_sendICECandidate:candidate forSink:sinkId tree:treeId completion:block];
@@ -310,7 +310,7 @@ - (void)nbm_removeSink:(NSString *)sinkId tree:(NSString *)treeId completion:(vo
                                    }];
 }
 
-- (void)nbm_sendICECandidate:(RTCICECandidate *)candidate forSink:(NSString *)sinkId tree:(NSString *)treeId completion:(void(^)(NSError *error))block {
+- (void)nbm_sendICECandidate:(RTCIceCandidate *)candidate forSink:(NSString *)sinkId tree:(NSString *)treeId completion:(void(^)(NSError *error))block {
     NSMutableDictionary *params = [NSMutableDictionary dictionary];
     [params setObject:treeId forKey:kTreeId];
     if (sinkId.length > 0) {
@@ -430,9 +430,9 @@ - (void)iceCandidateReceived:(id)params {
     NSString *sdp = [NBMTreeClient element:params getStringPropertyWithName:kICECandidate error:&error];
     NSString *sdpMid = [NBMTreeClient element:params getStringPropertyWithName:kICESdpMid error:&error];
     NSNumber *index = [NBMTreeClient element:params getPropertyWithName:kICESdpMLineIndex ofClass:[NSNumber class] error:&error];
-    RTCICECandidate *candidate;
+    RTCIceCandidate *candidate;
     if (!error) {
-        candidate = [[RTCICECandidate alloc] initWithMid:sdpMid index:index.integerValue sdp:sdp];
+        candidate = [[RTCIceCandidate alloc] initWithSdp:sdp sdpMLineIndex:index.integerValue sdpMid:sdpMid];
     }
 
     NSString *treeId = [NBMTreeClient element:params getStringPropertyWithName:kTreeId error:&error];

Classes/Tree/NBMTreeClientDelegate.h

@@ -23,7 +23,7 @@
 #import <Foundation/Foundation.h>
 
 @class NBMTreeClient;
-@class RTCICECandidate;
+@class RTCIceCandidate;
 
 @protocol NBMTreeClientDelegate <NSObject>
 
@@ -42,6 +42,6 @@
  *  @param sinkId    Sink id to which belongs the candidate, 'nil' when the candidate is referred to the tree source.
  *  @param treeId    Tree id to which belongs this candidate.
  */
-- (void)client:(NBMTreeClient *)client iceCandidateReceived:(RTCICECandidate *)candidate ofSink:(NSString *)sinkId tree:(NSString *)treeId;
+- (void)client:(NBMTreeClient *)client iceCandidateReceived:(RTCIceCandidate *)candidate ofSink:(NSString *)sinkId tree:(NSString *)treeId;
 
 @end

Classes/WebRTC/Internals/NBMSessionDescriptionFactory.m

@@ -8,9 +8,8 @@
 
 #import "NBMSessionDescriptionFactory.h"
 
-#import "RTCMediaConstraints.h"
-#import "RTCPair.h"
-#import "RTCSessionDescription.h"
+#import <WebRTC/RTCMediaConstraints.h>
+#import <WebRTC/RTCSessionDescription.h>
 
 @implementation NBMSessionDescriptionFactory
 
@@ -21,11 +20,10 @@ + (RTCMediaConstraints *)offerConstraints {
 + (RTCMediaConstraints *)offerConstraintsRestartIce:(BOOL)restartICE;
 {
     // In the AppRTC example optional offer contraints are nil
-    NSArray *optional = nil;
+    NSMutableDictionary *optional = [NSMutableDictionary dictionaryWithDictionary:[self optionalConstraints]];
 
     if (restartICE) {
-        RTCPair *icePair = [[RTCPair alloc] initWithKey:@"IceRestart" value:@"true"];
-        optional = @[icePair];
+        [optional setObject:@"true" forKey:@"IceRestart"];
     }
 
     RTCMediaConstraints *constraints = [[RTCMediaConstraints alloc] initWithMandatoryConstraints:[self mandatoryConstraints]
@@ -59,10 +57,10 @@ + (RTCSessionDescription *)conditionedSessionDescription:(RTCSessionDescription
     // Audio
 
     if (audioCodec == NBMAudioCodecOpus) {
-        sdpString = sessionDescription.description;
+        sdpString = sessionDescription.sdp;
     }
     else {
-        sdpString = [self preferISACSimple:sessionDescription.description];
+        sdpString = [self preferISACSimple:sessionDescription.sdp];
     }
 
     // Video
@@ -83,29 +81,30 @@ + (RTCSessionDescription *)conditionedSessionDescription:(RTCSessionDescription
 
 #pragma mark - Private
 
-+ (NSArray *)constraintsForVideoFormat:(NBMVideoFormat)format
++ (NSDictionary *)constraintsForVideoFormat:(NBMVideoFormat)format
 {
-    RTCPair *maxWidth = [[RTCPair alloc] initWithKey:@"maxWidth" value:[NSString stringWithFormat:@"%d", format.dimensions.width]];
-    RTCPair *maxHeight = [[RTCPair alloc] initWithKey:@"maxHeight" value:[NSString stringWithFormat:@"%d", format.dimensions.height]];
-    RTCPair *minWidth = [[RTCPair alloc] initWithKey:@"minWidth" value:@"240"];
-    RTCPair *minHeight = [[RTCPair alloc] initWithKey:@"minHeight" value:@"160"];
-
-    return @[maxWidth, maxHeight, minWidth, minHeight];
+    return @{
+             @"maxWidth": [NSString stringWithFormat:@"%d", format.dimensions.width],
+             @"maxHeight": [NSString stringWithFormat:@"%d", format.dimensions.height],
+             @"minWidth": @"240",
+             @"minHeight": @"160"
+             };
 }
 
-+ (NSArray *)mandatoryConstraints
++ (NSDictionary *)mandatoryConstraints
 {
-    RTCPair *audioPair = [[RTCPair alloc] initWithKey:@"OfferToReceiveAudio" value:@"true"];
-    RTCPair *videoPair = [[RTCPair alloc] initWithKey:@"OfferToReceiveVideo" value:@"true"];
-
-    return @[ audioPair, videoPair ];
+    return @{
+             @"OfferToReceiveAudio": @"true",
+             @"OfferToReceiveVideo": @"true"
+             };
 }
 
-+ (NSArray *)optionalConstraints
++ (NSDictionary *)optionalConstraints
 {
-    //[[RTCPair alloc] initWithKey:@"internalSctpDataChannels" value:@"true"] ??
-    NSArray *optionalConstraints = @[[[RTCPair alloc] initWithKey:@"DtlsSrtpKeyAgreement" value:@"true"]];
-    return optionalConstraints;
+    return @{
+             @"internalSctpDataChannels": @"true",
+             @"DtlsSrtpKeyAgreement": @"true"
+             };
 }
 
 + (NSString *)preferISACSimple:(NSString *)sdp

Classes/WebRTC/Internals/RTCMediaStream+Configuration.h

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import "RTCMediaStream.h"
+#import <WebRTC/RTCMediaStream.h>
 
 @interface RTCMediaStream (Configuration)
 

Classes/WebRTC/Internals/RTCMediaStream+Configuration.m

@@ -21,8 +21,8 @@
 // THE SOFTWARE.
 
 #import "RTCMediaStream+Configuration.h"
-#import "RTCAudioTrack.h"
-#import "RTCVideoTrack.h"
+#import <WebRTC/RTCAudioTrack.h>
+#import <WebRTC/RTCVideoTrack.h>
 
 @implementation RTCMediaStream (Configuration)
 
@@ -35,7 +35,7 @@ - (BOOL)isAudioEnabled
 - (void)setAudioEnabled:(BOOL)audioEnabled
 {
     RTCAudioTrack *audioTrack = [self.audioTracks firstObject];
-    [audioTrack setEnabled:audioEnabled];
+    [audioTrack setIsEnabled:audioEnabled];
 }
 
 - (BOOL)isVideoEnabled
@@ -47,7 +47,7 @@ - (BOOL)isVideoEnabled
 - (void)setVideoEnabled:(BOOL)videoEnabled
 {
     RTCVideoTrack *videoTrack = [self.videoTracks firstObject];
-    [videoTrack setEnabled:videoEnabled];
+    [videoTrack setIsEnabled:videoEnabled];
 }