Skip to content

Commit c1f7faa

Browse files
alessandrodsuperdump
authored andcommitted
NativeHandler: tweak signaling to support both JSON and SDP messages
Closes #68.
1 parent 4cc1c38 commit c1f7faa

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

SDK/OpenWebRTCNativeHandler.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
- (void)terminateCall;
6565
- (void)enableTrickleICE;
6666

67-
- (void)handleOfferReceived:(NSString *)offer;
68-
- (void)handleAnswerReceived:(NSString *)answer;
67+
- (void)handleOfferReceived:(NSDictionary *)offer;
68+
- (void)handleAnswerReceived:(NSDictionary *)answer;
6969
- (void)handleRemoteCandidateReceived:(NSDictionary *)candidate;
7070

7171
- (void)setVideoCaptureSourceByName:(NSString *)name;

SDK/OpenWebRTCNativeHandler.m

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,13 @@ - (void)terminateCall
211211
reset();
212212
}
213213

214-
- (void)handleAnswerReceived:(NSString *)answer
214+
- (void)handleAnswerReceived:(NSDictionary *)answer
215215
{
216-
NSDictionary *sdp = [OpenWebRTCUtils parseSDPFromString:answer];
217-
NSLog(@"Parsed Answer SDP: %@", sdp);
216+
NSDictionary *sdp = answer[@"sessionDescription"];
217+
if (!sdp)
218+
sdp = [OpenWebRTCUtils parseSDPFromString:answer[@"sdp"]];
219+
220+
NSLog(@"Answer SDP: %@", sdp);
218221

219222
const gchar *mtype;
220223
OwrMediaType media_type = OWR_MEDIA_TYPE_UNKNOWN;
@@ -353,13 +356,16 @@ - (NSMutableArray *)remoteCandidatesCache
353356
return _remoteCandidatesCache;
354357
}
355358

356-
- (void)handleOfferReceived:(NSString *)offer
359+
- (void)handleOfferReceived:(NSDictionary *)offer
357360
{
358361
is_answering = TRUE;
359362
is_offering = FALSE;
360363

361-
NSDictionary *sdp = [OpenWebRTCUtils parseSDPFromString:offer];
362-
NSLog(@"Parsed Offer SDP: %@", sdp);
364+
NSDictionary *sdp = offer[@"sessionDescription"];
365+
if (!sdp)
366+
sdp = [OpenWebRTCUtils parseSDPFromString:offer[@"sdp"]];
367+
368+
NSLog(@"Offer SDP: %@", sdp);
363369

364370
const gchar *mtype;
365371
OwrMediaType media_type = OWR_MEDIA_TYPE_UNKNOWN;

0 commit comments

Comments
 (0)