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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 <string> | 71 #include <string> |
72 #include <utility> | 72 #include <utility> |
73 #include <vector> | 73 #include <vector> |
74 | 74 |
75 #include "webrtc/api/audio_codecs/audio_decoder_factory.h" | 75 #include "webrtc/api/audio_codecs/audio_decoder_factory.h" |
76 #include "webrtc/api/audio_codecs/audio_encoder_factory.h" | 76 #include "webrtc/api/audio_codecs/audio_encoder_factory.h" |
77 // TODO(ossu): Remove this once downstream projects have been updated. | |
78 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" | |
79 #include "webrtc/api/datachannelinterface.h" | 77 #include "webrtc/api/datachannelinterface.h" |
80 #include "webrtc/api/dtmfsenderinterface.h" | 78 #include "webrtc/api/dtmfsenderinterface.h" |
81 #include "webrtc/api/jsep.h" | 79 #include "webrtc/api/jsep.h" |
82 #include "webrtc/api/mediastreaminterface.h" | 80 #include "webrtc/api/mediastreaminterface.h" |
83 #include "webrtc/api/rtcerror.h" | 81 #include "webrtc/api/rtcerror.h" |
84 #include "webrtc/api/rtpreceiverinterface.h" | 82 #include "webrtc/api/rtpreceiverinterface.h" |
85 #include "webrtc/api/rtpsenderinterface.h" | 83 #include "webrtc/api/rtpsenderinterface.h" |
86 #include "webrtc/api/stats/rtcstatscollectorcallback.h" | 84 #include "webrtc/api/stats/rtcstatscollectorcallback.h" |
87 #include "webrtc/api/statstypes.h" | 85 #include "webrtc/api/statstypes.h" |
88 #include "webrtc/api/umametrics.h" | 86 #include "webrtc/api/umametrics.h" |
(...skipping 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1107 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 1105 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
1108 cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 1106 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
1109 return CreatePeerConnectionFactory( | 1107 return CreatePeerConnectionFactory( |
1110 worker_and_network_thread, worker_and_network_thread, signaling_thread, | 1108 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
1111 default_adm, encoder_factory, decoder_factory); | 1109 default_adm, encoder_factory, decoder_factory); |
1112 } | 1110 } |
1113 | 1111 |
1114 } // namespace webrtc | 1112 } // namespace webrtc |
1115 | 1113 |
1116 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 1114 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
OLD | NEW |