OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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, |
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
778 // CreatePeerConnection with IceServers. | 778 // CreatePeerConnection with IceServers. |
779 webrtc::PeerConnectionInterface::IceServers ice_servers; | 779 webrtc::PeerConnectionInterface::IceServers ice_servers; |
780 webrtc::PeerConnectionInterface::IceServer ice_server; | 780 webrtc::PeerConnectionInterface::IceServer ice_server; |
781 ice_server.uri = "stun:stun.l.google.com:19302"; | 781 ice_server.uri = "stun:stun.l.google.com:19302"; |
782 ice_servers.push_back(ice_server); | 782 ice_servers.push_back(ice_server); |
783 | 783 |
784 FakeIdentityService* dtls_service = | 784 FakeIdentityService* dtls_service = |
785 rtc::SSLStreamAdapter::HaveDtlsSrtp() ? | 785 rtc::SSLStreamAdapter::HaveDtlsSrtp() ? |
786 new FakeIdentityService() : NULL; | 786 new FakeIdentityService() : NULL; |
787 return peer_connection_factory()->CreatePeerConnection( | 787 return peer_connection_factory()->CreatePeerConnection( |
788 ice_servers, constraints, factory, dtls_service, this); | 788 ice_servers, constraints, factory, dtls_service, rtc::KT_DEFAULT, this); |
789 } | 789 } |
790 | 790 |
791 void HandleIncomingOffer(const std::string& msg) { | 791 void HandleIncomingOffer(const std::string& msg) { |
792 LOG(INFO) << id() << "HandleIncomingOffer "; | 792 LOG(INFO) << id() << "HandleIncomingOffer "; |
793 if (NumberOfLocalMediaStreams() == 0) { | 793 if (NumberOfLocalMediaStreams() == 0) { |
794 // If we are not sending any streams ourselves it is time to add some. | 794 // If we are not sending any streams ourselves it is time to add some. |
795 AddMediaStream(true, true); | 795 AddMediaStream(true, true); |
796 } | 796 } |
797 rtc::scoped_ptr<SessionDescriptionInterface> desc( | 797 rtc::scoped_ptr<SessionDescriptionInterface> desc( |
798 webrtc::CreateSessionDescription("offer", msg, NULL)); | 798 webrtc::CreateSessionDescription("offer", msg, NULL)); |
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1576 // TODO(holmer): Disabled due to sometimes crashing on buildbots. | 1576 // TODO(holmer): Disabled due to sometimes crashing on buildbots. |
1577 // See issue webrtc/2378. | 1577 // See issue webrtc/2378. |
1578 TEST_F(JsepPeerConnectionP2PTestClient, | 1578 TEST_F(JsepPeerConnectionP2PTestClient, |
1579 DISABLED_LocalP2PTestWithVideoDecoderFactory) { | 1579 DISABLED_LocalP2PTestWithVideoDecoderFactory) { |
1580 ASSERT_TRUE(CreateTestClients()); | 1580 ASSERT_TRUE(CreateTestClients()); |
1581 EnableVideoDecoderFactory(); | 1581 EnableVideoDecoderFactory(); |
1582 LocalP2PTest(); | 1582 LocalP2PTest(); |
1583 } | 1583 } |
1584 | 1584 |
1585 #endif // if !defined(THREAD_SANITIZER) | 1585 #endif // if !defined(THREAD_SANITIZER) |
OLD | NEW |