| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2013 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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 rtc::ToString(session_version_++))) { | 371 rtc::ToString(session_version_++))) { |
| 372 delete offer; | 372 delete offer; |
| 373 PostCreateSessionDescriptionFailed(request.observer, | 373 PostCreateSessionDescriptionFailed(request.observer, |
| 374 "Failed to initialize the offer."); | 374 "Failed to initialize the offer."); |
| 375 return; | 375 return; |
| 376 } | 376 } |
| 377 if (session_->local_description()) { | 377 if (session_->local_description()) { |
| 378 for (const cricket::ContentInfo& content : | 378 for (const cricket::ContentInfo& content : |
| 379 session_->local_description()->description()->contents()) { | 379 session_->local_description()->description()->contents()) { |
| 380 // Include all local ICE candidates in the SessionDescription unless | 380 // Include all local ICE candidates in the SessionDescription unless |
| 381 // the remote peer has requested an ICE restart. | 381 // an ICE restart was requested. |
| 382 if (!request.options.transport_options[content.name].ice_restart) { | 382 if (!request.options.transport_options[content.name].ice_restart) { |
| 383 CopyCandidatesFromSessionDescription(session_->local_description(), | 383 CopyCandidatesFromSessionDescription(session_->local_description(), |
| 384 content.name, offer); | 384 content.name, offer); |
| 385 } | 385 } |
| 386 } | 386 } |
| 387 } | 387 } |
| 388 PostCreateSessionDescriptionSucceeded(request.observer, offer); | 388 PostCreateSessionDescriptionSucceeded(request.observer, offer); |
| 389 } | 389 } |
| 390 | 390 |
| 391 void WebRtcSessionDescriptionFactory::InternalCreateAnswer( | 391 void WebRtcSessionDescriptionFactory::InternalCreateAnswer( |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 if (create_session_description_requests_.front().type == | 501 if (create_session_description_requests_.front().type == |
| 502 CreateSessionDescriptionRequest::kOffer) { | 502 CreateSessionDescriptionRequest::kOffer) { |
| 503 InternalCreateOffer(create_session_description_requests_.front()); | 503 InternalCreateOffer(create_session_description_requests_.front()); |
| 504 } else { | 504 } else { |
| 505 InternalCreateAnswer(create_session_description_requests_.front()); | 505 InternalCreateAnswer(create_session_description_requests_.front()); |
| 506 } | 506 } |
| 507 create_session_description_requests_.pop(); | 507 create_session_description_requests_.pop(); |
| 508 } | 508 } |
| 509 } | 509 } |
| 510 } // namespace webrtc | 510 } // namespace webrtc |
| OLD | NEW |