OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 2658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2669 return false; | 2669 return false; |
2670 } | 2670 } |
2671 *content_name = mline_id; | 2671 *content_name = mline_id; |
2672 } else if (HasAttribute(line, kAttributeBundleOnly)) { | 2672 } else if (HasAttribute(line, kAttributeBundleOnly)) { |
2673 *bundle_only = true; | 2673 *bundle_only = true; |
2674 } else if (HasAttribute(line, kAttributeCandidate)) { | 2674 } else if (HasAttribute(line, kAttributeCandidate)) { |
2675 Candidate candidate; | 2675 Candidate candidate; |
2676 if (!ParseCandidate(line, &candidate, error, false)) { | 2676 if (!ParseCandidate(line, &candidate, error, false)) { |
2677 return false; | 2677 return false; |
2678 } | 2678 } |
| 2679 // ParseCandidate will parse non-standard ufrag and password attributes, |
| 2680 // since it's used for candidate trickling, but we only want to process |
| 2681 // the "a=ice-ufrag"/"a=ice-pwd" values in a session description, so |
| 2682 // strip them off at this point. |
| 2683 candidate.set_username(std::string()); |
| 2684 candidate.set_password(std::string()); |
2679 candidates_orig.push_back(candidate); | 2685 candidates_orig.push_back(candidate); |
2680 } else if (HasAttribute(line, kAttributeIceUfrag)) { | 2686 } else if (HasAttribute(line, kAttributeIceUfrag)) { |
2681 if (!GetValue(line, kAttributeIceUfrag, &transport->ice_ufrag, error)) { | 2687 if (!GetValue(line, kAttributeIceUfrag, &transport->ice_ufrag, error)) { |
2682 return false; | 2688 return false; |
2683 } | 2689 } |
2684 } else if (HasAttribute(line, kAttributeIcePwd)) { | 2690 } else if (HasAttribute(line, kAttributeIcePwd)) { |
2685 if (!GetValue(line, kAttributeIcePwd, &transport->ice_pwd, error)) { | 2691 if (!GetValue(line, kAttributeIcePwd, &transport->ice_pwd, error)) { |
2686 return false; | 2692 return false; |
2687 } | 2693 } |
2688 } else if (HasAttribute(line, kAttributeIceOption)) { | 2694 } else if (HasAttribute(line, kAttributeIceOption)) { |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3225 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( | 3231 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( |
3226 media_desc, payload_type, feedback_param); | 3232 media_desc, payload_type, feedback_param); |
3227 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { | 3233 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { |
3228 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( | 3234 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( |
3229 media_desc, payload_type, feedback_param); | 3235 media_desc, payload_type, feedback_param); |
3230 } | 3236 } |
3231 return true; | 3237 return true; |
3232 } | 3238 } |
3233 | 3239 |
3234 } // namespace webrtc | 3240 } // namespace webrtc |
OLD | NEW |