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