| 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 create_session_description_requests_.push(request); | 270 create_session_description_requests_.push(request); |
| 271 } else { | 271 } else { |
| 272 ASSERT(certificate_request_state_ == CERTIFICATE_SUCCEEDED || | 272 ASSERT(certificate_request_state_ == CERTIFICATE_SUCCEEDED || |
| 273 certificate_request_state_ == CERTIFICATE_NOT_NEEDED); | 273 certificate_request_state_ == CERTIFICATE_NOT_NEEDED); |
| 274 InternalCreateOffer(request); | 274 InternalCreateOffer(request); |
| 275 } | 275 } |
| 276 } | 276 } |
| 277 | 277 |
| 278 void WebRtcSessionDescriptionFactory::CreateAnswer( | 278 void WebRtcSessionDescriptionFactory::CreateAnswer( |
| 279 CreateSessionDescriptionObserver* observer, | 279 CreateSessionDescriptionObserver* observer, |
| 280 const MediaConstraintsInterface* constraints, | |
| 281 const cricket::MediaSessionOptions& session_options) { | 280 const cricket::MediaSessionOptions& session_options) { |
| 282 std::string error = "CreateAnswer"; | 281 std::string error = "CreateAnswer"; |
| 283 if (certificate_request_state_ == CERTIFICATE_FAILED) { | 282 if (certificate_request_state_ == CERTIFICATE_FAILED) { |
| 284 error += kFailedDueToIdentityFailed; | 283 error += kFailedDueToIdentityFailed; |
| 285 LOG(LS_ERROR) << error; | 284 LOG(LS_ERROR) << error; |
| 286 PostCreateSessionDescriptionFailed(observer, error); | 285 PostCreateSessionDescriptionFailed(observer, error); |
| 287 return; | 286 return; |
| 288 } | 287 } |
| 289 if (!session_->remote_description()) { | 288 if (!session_->remote_description()) { |
| 290 error += " can't be called before SetRemoteDescription."; | 289 error += " can't be called before SetRemoteDescription."; |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 if (create_session_description_requests_.front().type == | 507 if (create_session_description_requests_.front().type == |
| 509 CreateSessionDescriptionRequest::kOffer) { | 508 CreateSessionDescriptionRequest::kOffer) { |
| 510 InternalCreateOffer(create_session_description_requests_.front()); | 509 InternalCreateOffer(create_session_description_requests_.front()); |
| 511 } else { | 510 } else { |
| 512 InternalCreateAnswer(create_session_description_requests_.front()); | 511 InternalCreateAnswer(create_session_description_requests_.front()); |
| 513 } | 512 } |
| 514 create_session_description_requests_.pop(); | 513 create_session_description_requests_.pop(); |
| 515 } | 514 } |
| 516 } | 515 } |
| 517 } // namespace webrtc | 516 } // namespace webrtc |
| OLD | NEW |