c1815cf084
Reason for revert: Internal project is updated. Original issue's description: > Revert of Rename AppRTCDemo on Android and iOS to AppRTCMobile (patchset #2 id:20001 of https://codereview.webrtc.org/2343403002/ ) > > Reason for revert: > Breaks internal project. > > Original issue's description: > > Rename AppRTCDemo on Android and iOS to AppRTCMobile > > > > The purpose is to make it clearer it is a mobile application. > > > > BUG=webrtc:6359 > > NOPRESUBMIT=true > > > > Committed: https://crrev.com/d3af58bdab5b25acd62cd816363becc7003d3e5a > > Cr-Commit-Position: refs/heads/master@{#14356} > > TBR=sakal@webrtc.org,kthelgason@webrtc.org,tommi@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6359 > > Committed: https://crrev.com/87ef6f750126f9f17f4714d696a8e77a2dd0a3f1 > Cr-Commit-Position: refs/heads/master@{#14358} TBR=sakal@webrtc.org,kthelgason@webrtc.org,tommi@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:6359 Review URL: https://codereview.webrtc.org/2373443005 . Cr-Commit-Position: refs/heads/master@{#14391}
101 lines
3.4 KiB
Objective-C
101 lines
3.4 KiB
Objective-C
/*
|
|
* Copyright 2014 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 "RTCIceCandidate+JSON.h"
|
|
|
|
#import "WebRTC/RTCLogging.h"
|
|
|
|
static NSString const *kRTCICECandidateTypeKey = @"type";
|
|
static NSString const *kRTCICECandidateTypeValue = @"candidate";
|
|
static NSString const *kRTCICECandidateMidKey = @"id";
|
|
static NSString const *kRTCICECandidateMLineIndexKey = @"label";
|
|
static NSString const *kRTCICECandidateSdpKey = @"candidate";
|
|
static NSString const *kRTCICECandidatesTypeKey = @"candidates";
|
|
|
|
|
|
@implementation RTCIceCandidate (JSON)
|
|
|
|
+ (RTCIceCandidate *)candidateFromJSONDictionary:(NSDictionary *)dictionary {
|
|
NSString *mid = dictionary[kRTCICECandidateMidKey];
|
|
NSString *sdp = dictionary[kRTCICECandidateSdpKey];
|
|
NSNumber *num = dictionary[kRTCICECandidateMLineIndexKey];
|
|
NSInteger mLineIndex = [num integerValue];
|
|
return [[RTCIceCandidate alloc] initWithSdp:sdp
|
|
sdpMLineIndex:mLineIndex
|
|
sdpMid:mid];
|
|
}
|
|
|
|
+ (NSData *)JSONDataForIceCandidates:(NSArray<RTCIceCandidate *> *)candidates
|
|
withType:(NSString *)typeValue {
|
|
NSMutableArray *jsonCandidates =
|
|
[NSMutableArray arrayWithCapacity:candidates.count];
|
|
for (RTCIceCandidate *candidate in candidates) {
|
|
NSDictionary *jsonCandidate = [candidate JSONDictionary];
|
|
[jsonCandidates addObject:jsonCandidate];
|
|
}
|
|
NSDictionary *json = @{
|
|
kRTCICECandidateTypeKey : typeValue,
|
|
kRTCICECandidatesTypeKey : jsonCandidates
|
|
};
|
|
NSError *error = nil;
|
|
NSData *data =
|
|
[NSJSONSerialization dataWithJSONObject:json
|
|
options:NSJSONWritingPrettyPrinted
|
|
error:&error];
|
|
if (error) {
|
|
RTCLogError(@"Error serializing JSON: %@", error);
|
|
return nil;
|
|
}
|
|
return data;
|
|
}
|
|
|
|
+ (NSArray<RTCIceCandidate *> *)candidatesFromJSONDictionary:
|
|
(NSDictionary *)dictionary {
|
|
NSArray *jsonCandidates = dictionary[kRTCICECandidatesTypeKey];
|
|
NSMutableArray<RTCIceCandidate *> *candidates =
|
|
[NSMutableArray arrayWithCapacity:jsonCandidates.count];
|
|
for (NSDictionary *jsonCandidate in jsonCandidates) {
|
|
RTCIceCandidate *candidate =
|
|
[RTCIceCandidate candidateFromJSONDictionary:jsonCandidate];
|
|
[candidates addObject:candidate];
|
|
}
|
|
return candidates;
|
|
}
|
|
|
|
- (NSData *)JSONData {
|
|
NSDictionary *json = @{
|
|
kRTCICECandidateTypeKey : kRTCICECandidateTypeValue,
|
|
kRTCICECandidateMLineIndexKey : @(self.sdpMLineIndex),
|
|
kRTCICECandidateMidKey : self.sdpMid,
|
|
kRTCICECandidateSdpKey : self.sdp
|
|
};
|
|
NSError *error = nil;
|
|
NSData *data =
|
|
[NSJSONSerialization dataWithJSONObject:json
|
|
options:NSJSONWritingPrettyPrinted
|
|
error:&error];
|
|
if (error) {
|
|
RTCLogError(@"Error serializing JSON: %@", error);
|
|
return nil;
|
|
}
|
|
return data;
|
|
}
|
|
|
|
- (NSDictionary *)JSONDictionary{
|
|
NSDictionary *json = @{
|
|
kRTCICECandidateMLineIndexKey : @(self.sdpMLineIndex),
|
|
kRTCICECandidateMidKey : self.sdpMid,
|
|
kRTCICECandidateSdpKey : self.sdp
|
|
};
|
|
return json;
|
|
}
|
|
|
|
@end
|