Chromium Code Reviews| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 50 | 50 |
| 51 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 51 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| 52 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 52 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| 53 | 53 |
| 54 #include <memory> | 54 #include <memory> |
| 55 #include <ostream> | 55 #include <ostream> |
| 56 #include <string> | 56 #include <string> |
| 57 #include <utility> | 57 #include <utility> |
| 58 #include <vector> | 58 #include <vector> |
| 59 | 59 |
| 60 #include "webrtc/api/audio_codec/audio_decoder_factory.h" | |
|
the sun
2017/02/02 21:02:29
Here's another bike shed: audio_codecs feels like
kwiberg-webrtc
2017/02/03 09:50:11
OK, fine. As long as I don't have to do the renami
| |
| 60 #include "webrtc/api/datachannelinterface.h" | 61 #include "webrtc/api/datachannelinterface.h" |
| 61 #include "webrtc/api/dtmfsenderinterface.h" | 62 #include "webrtc/api/dtmfsenderinterface.h" |
| 62 #include "webrtc/api/jsep.h" | 63 #include "webrtc/api/jsep.h" |
| 63 #include "webrtc/api/mediastreaminterface.h" | 64 #include "webrtc/api/mediastreaminterface.h" |
| 64 #include "webrtc/api/stats/rtcstatscollectorcallback.h" | |
| 65 #include "webrtc/api/rtpreceiverinterface.h" | 65 #include "webrtc/api/rtpreceiverinterface.h" |
| 66 #include "webrtc/api/rtpsenderinterface.h" | 66 #include "webrtc/api/rtpsenderinterface.h" |
| 67 #include "webrtc/api/stats/rtcstatscollectorcallback.h" | |
| 67 #include "webrtc/api/statstypes.h" | 68 #include "webrtc/api/statstypes.h" |
| 68 #include "webrtc/api/umametrics.h" | 69 #include "webrtc/api/umametrics.h" |
| 69 #include "webrtc/base/fileutils.h" | 70 #include "webrtc/base/fileutils.h" |
| 70 #include "webrtc/base/network.h" | 71 #include "webrtc/base/network.h" |
| 71 #include "webrtc/base/rtccertificate.h" | 72 #include "webrtc/base/rtccertificate.h" |
| 72 #include "webrtc/base/rtccertificategenerator.h" | 73 #include "webrtc/base/rtccertificategenerator.h" |
| 73 #include "webrtc/base/socketaddress.h" | 74 #include "webrtc/base/socketaddress.h" |
| 74 #include "webrtc/base/sslstreamadapter.h" | 75 #include "webrtc/base/sslstreamadapter.h" |
| 75 #include "webrtc/media/base/mediachannel.h" | 76 #include "webrtc/media/base/mediachannel.h" |
| 76 #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h" | |
| 77 #include "webrtc/p2p/base/portallocator.h" | 77 #include "webrtc/p2p/base/portallocator.h" |
| 78 | 78 |
| 79 namespace rtc { | 79 namespace rtc { |
| 80 class SSLIdentity; | 80 class SSLIdentity; |
| 81 class Thread; | 81 class Thread; |
| 82 } | 82 } |
| 83 | 83 |
| 84 namespace cricket { | 84 namespace cricket { |
| 85 class WebRtcVideoDecoderFactory; | 85 class WebRtcVideoDecoderFactory; |
| 86 class WebRtcVideoEncoderFactory; | 86 class WebRtcVideoEncoderFactory; |
| (...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 940 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 940 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
| 941 cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 941 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
| 942 return CreatePeerConnectionFactory( | 942 return CreatePeerConnectionFactory( |
| 943 worker_and_network_thread, worker_and_network_thread, signaling_thread, | 943 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
| 944 default_adm, encoder_factory, decoder_factory); | 944 default_adm, encoder_factory, decoder_factory); |
| 945 } | 945 } |
| 946 | 946 |
| 947 } // namespace webrtc | 947 } // namespace webrtc |
| 948 | 948 |
| 949 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 949 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| OLD | NEW |