| 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 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 rtc::scoped_refptr<VideoTrackInterface> CreateVideoTrack( | 73 rtc::scoped_refptr<VideoTrackInterface> CreateVideoTrack( |
| 74 const std::string& id, | 74 const std::string& id, |
| 75 VideoTrackSourceInterface* video_source) override; | 75 VideoTrackSourceInterface* video_source) override; |
| 76 | 76 |
| 77 rtc::scoped_refptr<AudioTrackInterface> | 77 rtc::scoped_refptr<AudioTrackInterface> |
| 78 CreateAudioTrack(const std::string& id, | 78 CreateAudioTrack(const std::string& id, |
| 79 AudioSourceInterface* audio_source) override; | 79 AudioSourceInterface* audio_source) override; |
| 80 | 80 |
| 81 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override; | 81 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override; |
| 82 void StopAecDump() override; | 82 void StopAecDump() override; |
| 83 bool StartRtcEventLog(rtc::PlatformFile file) override { | 83 // TODO(ivoc) Remove after Chrome is updated. |
| 84 return StartRtcEventLog(file, -1); | 84 bool StartRtcEventLog(rtc::PlatformFile file) override { return false; } |
| 85 // TODO(ivoc) Remove after Chrome is updated. |
| 86 bool StartRtcEventLog(rtc::PlatformFile file, |
| 87 int64_t max_size_bytes) override { |
| 88 return false; |
| 85 } | 89 } |
| 86 bool StartRtcEventLog(rtc::PlatformFile file, | 90 // TODO(ivoc) Remove after Chrome is updated. |
| 87 int64_t max_size_bytes) override; | 91 void StopRtcEventLog() override {} |
| 88 void StopRtcEventLog() override; | |
| 89 | 92 |
| 90 virtual webrtc::MediaControllerInterface* CreateMediaController( | 93 virtual webrtc::MediaControllerInterface* CreateMediaController( |
| 91 const cricket::MediaConfig& config) const; | 94 const cricket::MediaConfig& config) const; |
| 92 virtual rtc::Thread* signaling_thread(); | 95 virtual rtc::Thread* signaling_thread(); |
| 93 virtual rtc::Thread* worker_thread(); | 96 virtual rtc::Thread* worker_thread(); |
| 94 virtual rtc::Thread* network_thread(); | 97 virtual rtc::Thread* network_thread(); |
| 95 const Options& options() const { return options_; } | 98 const Options& options() const { return options_; } |
| 96 | 99 |
| 97 protected: | 100 protected: |
| 98 PeerConnectionFactory(); | 101 PeerConnectionFactory(); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 126 // External Video decoder factory. This can be NULL if the client has not | 129 // External Video decoder factory. This can be NULL if the client has not |
| 127 // injected any. In that case, video engine will use the internal SW decoder. | 130 // injected any. In that case, video engine will use the internal SW decoder. |
| 128 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; | 131 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; |
| 129 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; | 132 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; |
| 130 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; | 133 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; |
| 131 }; | 134 }; |
| 132 | 135 |
| 133 } // namespace webrtc | 136 } // namespace webrtc |
| 134 | 137 |
| 135 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ | 138 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ |
| OLD | NEW |