| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| 11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
| 12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
| 13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
| 14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
| 15 * | 15 * |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
| 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" | 28 #include "webrtc/api/webrtcsessiondescriptionfactory.h" |
| 29 | 29 |
| 30 #include <utility> | 30 #include <utility> |
| 31 | 31 |
| 32 #include "talk/app/webrtc/dtlsidentitystore.h" | 32 #include "webrtc/api/dtlsidentitystore.h" |
| 33 #include "talk/app/webrtc/jsep.h" | 33 #include "webrtc/api/jsep.h" |
| 34 #include "talk/app/webrtc/jsepsessiondescription.h" | 34 #include "webrtc/api/jsepsessiondescription.h" |
| 35 #include "talk/app/webrtc/mediaconstraintsinterface.h" | 35 #include "webrtc/api/mediaconstraintsinterface.h" |
| 36 #include "talk/app/webrtc/webrtcsession.h" | 36 #include "webrtc/api/webrtcsession.h" |
| 37 #include "webrtc/base/sslidentity.h" | 37 #include "webrtc/base/sslidentity.h" |
| 38 | 38 |
| 39 using cricket::MediaSessionOptions; | 39 using cricket::MediaSessionOptions; |
| 40 | 40 |
| 41 namespace webrtc { | 41 namespace webrtc { |
| 42 namespace { | 42 namespace { |
| 43 static const char kFailedDueToIdentityFailed[] = | 43 static const char kFailedDueToIdentityFailed[] = |
| 44 " failed because DTLS identity request failed"; | 44 " failed because DTLS identity request failed"; |
| 45 static const char kFailedDueToSessionShutdown[] = | 45 static const char kFailedDueToSessionShutdown[] = |
| 46 " failed because the session was shut down"; | 46 " failed because the session was shut down"; |
| (...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 if (create_session_description_requests_.front().type == | 518 if (create_session_description_requests_.front().type == |
| 519 CreateSessionDescriptionRequest::kOffer) { | 519 CreateSessionDescriptionRequest::kOffer) { |
| 520 InternalCreateOffer(create_session_description_requests_.front()); | 520 InternalCreateOffer(create_session_description_requests_.front()); |
| 521 } else { | 521 } else { |
| 522 InternalCreateAnswer(create_session_description_requests_.front()); | 522 InternalCreateAnswer(create_session_description_requests_.front()); |
| 523 } | 523 } |
| 524 create_session_description_requests_.pop(); | 524 create_session_description_requests_.pop(); |
| 525 } | 525 } |
| 526 } | 526 } |
| 527 } // namespace webrtc | 527 } // namespace webrtc |
| OLD | NEW |