NativeHandler: tweak signaling to support both JSON and SDP messages

Closes #68.
EricssonResearch · May 12, 2016 · c1f7faa · c1f7faa
1 parent 4cc1c38
commit c1f7faa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/SDK/OpenWebRTCNativeHandler.h b/SDK/OpenWebRTCNativeHandler.h
@@ -64,8 +64,8 @@
 - (void)terminateCall;
 - (void)enableTrickleICE;
 
-- (void)handleOfferReceived:(NSString *)offer;
-- (void)handleAnswerReceived:(NSString *)answer;
+- (void)handleOfferReceived:(NSDictionary *)offer;
+- (void)handleAnswerReceived:(NSDictionary *)answer;
 - (void)handleRemoteCandidateReceived:(NSDictionary *)candidate;
 
 - (void)setVideoCaptureSourceByName:(NSString *)name;

diff --git a/SDK/OpenWebRTCNativeHandler.m b/SDK/OpenWebRTCNativeHandler.m
@@ -211,10 +211,13 @@ - (void)terminateCall
     reset();
 }
 
-- (void)handleAnswerReceived:(NSString *)answer
+- (void)handleAnswerReceived:(NSDictionary *)answer
 {
-    NSDictionary *sdp = [OpenWebRTCUtils parseSDPFromString:answer];
-    NSLog(@"Parsed Answer SDP: %@", sdp);
+    NSDictionary *sdp = answer[@"sessionDescription"];
+    if (!sdp)
+        sdp = [OpenWebRTCUtils parseSDPFromString:answer[@"sdp"]];
+
+    NSLog(@"Answer SDP: %@", sdp);
 
     const gchar *mtype;
     OwrMediaType media_type = OWR_MEDIA_TYPE_UNKNOWN;
@@ -353,13 +356,16 @@ - (NSMutableArray *)remoteCandidatesCache
     return _remoteCandidatesCache;
 }
 
-- (void)handleOfferReceived:(NSString *)offer
+- (void)handleOfferReceived:(NSDictionary *)offer
 {
     is_answering = TRUE;
     is_offering = FALSE;
 
-    NSDictionary *sdp = [OpenWebRTCUtils parseSDPFromString:offer];
-    NSLog(@"Parsed Offer SDP: %@", sdp);
+    NSDictionary *sdp = offer[@"sessionDescription"];
+    if (!sdp)
+        sdp = [OpenWebRTCUtils parseSDPFromString:offer[@"sdp"]];
+
+    NSLog(@"Offer SDP: %@", sdp);
 
     const gchar *mtype;
     OwrMediaType media_type = OWR_MEDIA_TYPE_UNKNOWN;