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