| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 // | 61 // |
| 62 // 6. Provide the remote ICE candidates by calling AddIceCandidate. | 62 // 6. Provide the remote ICE candidates by calling AddIceCandidate. |
| 63 // | 63 // |
| 64 // 7. Once a candidate has been gathered, the PeerConnection will call the | 64 // 7. Once a candidate has been gathered, the PeerConnection will call the |
| 65 // observer function OnIceCandidate. Send these candidates to the remote peer. | 65 // observer function OnIceCandidate. Send these candidates to the remote peer. |
| 66 | 66 |
| 67 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 67 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| 68 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 68 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| 69 | 69 |
| 70 #include <memory> | 70 #include <memory> |
| 71 #include <ostream> | |
| 72 #include <string> | 71 #include <string> |
| 73 #include <utility> | 72 #include <utility> |
| 74 #include <vector> | 73 #include <vector> |
| 75 | 74 |
| 76 #include "webrtc/api/audio_codecs/audio_decoder_factory.h" | 75 #include "webrtc/api/audio_codecs/audio_decoder_factory.h" |
| 77 #include "webrtc/api/datachannelinterface.h" | 76 #include "webrtc/api/datachannelinterface.h" |
| 78 #include "webrtc/api/dtmfsenderinterface.h" | 77 #include "webrtc/api/dtmfsenderinterface.h" |
| 79 #include "webrtc/api/jsep.h" | 78 #include "webrtc/api/jsep.h" |
| 80 #include "webrtc/api/mediastreaminterface.h" | 79 #include "webrtc/api/mediastreaminterface.h" |
| 81 #include "webrtc/api/rtcerror.h" | 80 #include "webrtc/api/rtcerror.h" |
| (...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 1100 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
| 1102 cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 1101 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
| 1103 return CreatePeerConnectionFactory( | 1102 return CreatePeerConnectionFactory( |
| 1104 worker_and_network_thread, worker_and_network_thread, signaling_thread, | 1103 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
| 1105 default_adm, encoder_factory, decoder_factory); | 1104 default_adm, encoder_factory, decoder_factory); |
| 1106 } | 1105 } |
| 1107 | 1106 |
| 1108 } // namespace webrtc | 1107 } // namespace webrtc |
| 1109 | 1108 |
| 1110 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 1109 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| OLD | NEW |