Index: webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m |
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m b/webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m |
index 3a8a578dc68fccf47cab303d315866749a494893..016829eeec4ce0624bd6baa2f1407a6758dc94ff 100644 |
--- a/webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m |
+++ b/webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m |
@@ -26,8 +26,21 @@ |
NSMutableArray *lines = |
[NSMutableArray arrayWithArray: |
[sdpString componentsSeparatedByString:lineSeparator]]; |
+ // Find the line starting with "m=video". |
NSInteger mLineIndex = -1; |
- NSString *codecRtpMap = nil; |
+ for (NSInteger i = 0; i < lines.count; ++i) { |
+ if ([lines[i] hasPrefix:@"m=video"]) { |
+ mLineIndex = i; |
+ break; |
+ } |
+ } |
+ if (mLineIndex == -1) { |
+ RTCLog(@"No m=video line, so can't prefer %@", codec); |
+ return description; |
+ } |
+ // An array with all payload types with name |codec|. The payload types are |
+ // integers in the range 96-127, but they are stored as strings here. |
+ NSMutableArray *codecPayloadTypes = [[NSMutableArray alloc] init]; |
// a=rtpmap:<payload type> <encoding name>/<clock rate> |
// [/<encoding parameters>] |
NSString *pattern = |
@@ -36,54 +49,47 @@ |
[NSRegularExpression regularExpressionWithPattern:pattern |
options:0 |
error:nil]; |
- for (NSInteger i = 0; (i < lines.count) && (mLineIndex == -1 || !codecRtpMap); |
- ++i) { |
- NSString *line = lines[i]; |
- if ([line hasPrefix:@"m=video"]) { |
- mLineIndex = i; |
- continue; |
- } |
+ for (NSString *line in lines) { |
NSTextCheckingResult *codecMatches = |
[regex firstMatchInString:line |
options:0 |
range:NSMakeRange(0, line.length)]; |
if (codecMatches) { |
- codecRtpMap = |
- [line substringWithRange:[codecMatches rangeAtIndex:1]]; |
- continue; |
+ [codecPayloadTypes |
+ addObject:[line substringWithRange:[codecMatches rangeAtIndex:1]]]; |
} |
} |
- if (mLineIndex == -1) { |
- RTCLog(@"No m=video line, so can't prefer %@", codec); |
- return description; |
- } |
- if (!codecRtpMap) { |
- RTCLog(@"No rtpmap for %@", codec); |
+ if ([codecPayloadTypes count] == 0) { |
+ RTCLog(@"No payload types with name %@", codec); |
return description; |
} |
NSArray *origMLineParts = |
[lines[mLineIndex] componentsSeparatedByString:mLineSeparator]; |
- if (origMLineParts.count > 3) { |
- NSMutableArray *newMLineParts = |
- [NSMutableArray arrayWithCapacity:origMLineParts.count]; |
- NSInteger origPartIndex = 0; |
- // Format is: m=<media> <port> <proto> <fmt> ... |
- [newMLineParts addObject:origMLineParts[origPartIndex++]]; |
- [newMLineParts addObject:origMLineParts[origPartIndex++]]; |
- [newMLineParts addObject:origMLineParts[origPartIndex++]]; |
- [newMLineParts addObject:codecRtpMap]; |
- for (; origPartIndex < origMLineParts.count; ++origPartIndex) { |
- if (![codecRtpMap isEqualToString:origMLineParts[origPartIndex]]) { |
- [newMLineParts addObject:origMLineParts[origPartIndex]]; |
- } |
- } |
- NSString *newMLine = |
- [newMLineParts componentsJoinedByString:mLineSeparator]; |
- [lines replaceObjectAtIndex:mLineIndex |
- withObject:newMLine]; |
- } else { |
+ // The format of ML should be: m=<media> <port> <proto> <fmt> ... |
+ const int kHeaderLength = 3; |
+ if (origMLineParts.count <= kHeaderLength) { |
RTCLogWarning(@"Wrong SDP media description format: %@", lines[mLineIndex]); |
+ return description; |
} |
+ // Split the line into header and payloadTypes. |
+ NSRange headerRange = NSMakeRange(0, kHeaderLength); |
+ NSRange payloadRange = |
+ NSMakeRange(kHeaderLength, origMLineParts.count - kHeaderLength); |
+ NSArray *header = [origMLineParts subarrayWithRange:headerRange]; |
+ NSMutableArray *payloadTypes = [NSMutableArray |
+ arrayWithArray:[origMLineParts subarrayWithRange:payloadRange]]; |
+ // Reconstruct the line with |codecPayloadTypes| moved to the beginning of the |
+ // payload types. |
+ NSMutableArray *newMLineParts = [NSMutableArray arrayWithCapacity:origMLineParts.count]; |
+ [newMLineParts addObjectsFromArray:header]; |
+ [newMLineParts addObjectsFromArray:codecPayloadTypes]; |
+ [payloadTypes removeObjectsInArray:codecPayloadTypes]; |
+ [newMLineParts addObjectsFromArray:payloadTypes]; |
+ |
+ NSString *newMLine = [newMLineParts componentsJoinedByString:mLineSeparator]; |
+ [lines replaceObjectAtIndex:mLineIndex |
+ withObject:newMLine]; |
+ |
NSString *mangledSdpString = [lines componentsJoinedByString:lineSeparator]; |
return [[RTCSessionDescription alloc] initWithType:description.type |
sdp:mangledSdpString]; |