Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: talk/examples/objc/AppRTCDemo/RTCICECandidate+JSON.m

Issue 1241283004: iOS: Move AppRTC logging methods to public headers. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #import "RTCICECandidate+JSON.h" 28 #import "RTCICECandidate+JSON.h"
29 29
30 #import "ARDLogging.h" 30 #import "RTCLogging.h"
31 31
32 static NSString const *kRTCICECandidateTypeKey = @"type"; 32 static NSString const *kRTCICECandidateTypeKey = @"type";
33 static NSString const *kRTCICECandidateTypeValue = @"candidate"; 33 static NSString const *kRTCICECandidateTypeValue = @"candidate";
34 static NSString const *kRTCICECandidateMidKey = @"id"; 34 static NSString const *kRTCICECandidateMidKey = @"id";
35 static NSString const *kRTCICECandidateMLineIndexKey = @"label"; 35 static NSString const *kRTCICECandidateMLineIndexKey = @"label";
36 static NSString const *kRTCICECandidateSdpKey = @"candidate"; 36 static NSString const *kRTCICECandidateSdpKey = @"candidate";
37 37
38 @implementation RTCICECandidate (JSON) 38 @implementation RTCICECandidate (JSON)
39 39
40 + (RTCICECandidate *)candidateFromJSONDictionary:(NSDictionary *)dictionary { 40 + (RTCICECandidate *)candidateFromJSONDictionary:(NSDictionary *)dictionary {
(...skipping 10 matching lines...) Expand all
51 kRTCICECandidateMLineIndexKey : @(self.sdpMLineIndex), 51 kRTCICECandidateMLineIndexKey : @(self.sdpMLineIndex),
52 kRTCICECandidateMidKey : self.sdpMid, 52 kRTCICECandidateMidKey : self.sdpMid,
53 kRTCICECandidateSdpKey : self.sdp 53 kRTCICECandidateSdpKey : self.sdp
54 }; 54 };
55 NSError *error = nil; 55 NSError *error = nil;
56 NSData *data = 56 NSData *data =
57 [NSJSONSerialization dataWithJSONObject:json 57 [NSJSONSerialization dataWithJSONObject:json
58 options:NSJSONWritingPrettyPrinted 58 options:NSJSONWritingPrettyPrinted
59 error:&error]; 59 error:&error];
60 if (error) { 60 if (error) {
61 ARDLog(@"Error serializing JSON: %@", error); 61 RTCLogError(@"Error serializing JSON: %@", error);
62 return nil; 62 return nil;
63 } 63 }
64 return data; 64 return data;
65 } 65 }
66 66
67 @end 67 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698