| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2011 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 |
| 11 #ifndef WEBRTC_API_PEERCONNECTIONFACTORY_H_ | 11 #ifndef WEBRTC_PC_PEERCONNECTIONFACTORY_H_ |
| 12 #define WEBRTC_API_PEERCONNECTIONFACTORY_H_ | 12 #define WEBRTC_PC_PEERCONNECTIONFACTORY_H_ |
| 13 | 13 |
| 14 #include <memory> | 14 #include <memory> |
| 15 #include <string> | 15 #include <string> |
| 16 | 16 |
| 17 #include "webrtc/api/mediacontroller.h" | |
| 18 #include "webrtc/api/mediastreaminterface.h" | 17 #include "webrtc/api/mediastreaminterface.h" |
| 19 #include "webrtc/api/peerconnectioninterface.h" | 18 #include "webrtc/api/peerconnectioninterface.h" |
| 20 #include "webrtc/base/scoped_ref_ptr.h" | 19 #include "webrtc/base/scoped_ref_ptr.h" |
| 21 #include "webrtc/base/thread.h" | 20 #include "webrtc/base/thread.h" |
| 22 #include "webrtc/base/rtccertificategenerator.h" | 21 #include "webrtc/base/rtccertificategenerator.h" |
| 23 #include "webrtc/pc/channelmanager.h" | 22 #include "webrtc/pc/channelmanager.h" |
| 23 #include "webrtc/pc/mediacontroller.h" |
| 24 | 24 |
| 25 namespace rtc { | 25 namespace rtc { |
| 26 class BasicNetworkManager; | 26 class BasicNetworkManager; |
| 27 class BasicPacketSocketFactory; | 27 class BasicPacketSocketFactory; |
| 28 } | 28 } |
| 29 | 29 |
| 30 namespace webrtc { | 30 namespace webrtc { |
| 31 | 31 |
| 32 class RtcEventLog; | 32 class RtcEventLog; |
| 33 | 33 |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; | 136 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; |
| 137 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; | 137 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; |
| 138 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; | 138 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; |
| 139 // External audio mixer. This can be NULL. In that case, internal audio mixer | 139 // External audio mixer. This can be NULL. In that case, internal audio mixer |
| 140 // will be created and used. | 140 // will be created and used. |
| 141 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; | 141 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; |
| 142 }; | 142 }; |
| 143 | 143 |
| 144 } // namespace webrtc | 144 } // namespace webrtc |
| 145 | 145 |
| 146 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ | 146 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ |
| OLD | NEW |